diff --git a/.gitignore b/.gitignore
index 59eb444..922d98c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ desktopRuntime/crash-reports/*
 desktopRuntime/options.txt
 desktopRuntime/_eagstorage*
 desktopRuntime/filesystem/*
-desktopRuntime/downloads/*
\ No newline at end of file
+desktopRuntime/downloads/*
+desktopRuntime/screenshots/*
\ No newline at end of file
diff --git a/CODE_STANDARDS.md b/CODE_STANDARDS.md
new file mode 100755
index 0000000..ed30f2a
--- /dev/null
+++ b/CODE_STANDARDS.md
@@ -0,0 +1,306 @@
+# Eaglercraft Code Standards
+
+**These are some basic rules to follow if you would like to write code that is consistent with the Eaglercraft 1.8 codebase. If you are already familiar with Eaglercraft 1.5 or b1.3, please abandon whatever you think is the best practice as a result of reading that code, those clients should be considered as obsolete prototypes.**
+
+## Part A. Coding Style
+
+### 1. Tabs, not spaces
+
+Tabs not spaces, it makes indentation easier to manage and reduces file size. Other popular projects that are also known to use tabs instead of spaces include the linux kernel. We prefer to set tab width to 4 spaces on our editors.
+
+Format code like the eclipse formatter on factory settings
+
+### 2. Avoid redundant hash map lookups
+
+Don't retrieve the same value from a hash map more than once, that includes checking if an entry exists first before retrieving its value. If you do this, you are a horrible person!
+
+**Incorrect:**
+
+```java
+if(hashMap.containsKey("eagler")) {
+    Object val = hashMap.get("eagler");
+    // do something with val
+}
+```
+
+**Correct:**
+
+```java
+Object val = hashMap.get("eagler");
+if(val != null) {
+    // do something with val
+}
+```
+
+### 3. Cache the return value of a function if you plan to use it multiple times
+
+This is somewhat an extension of rule #2, don't repeatedly call the same function multiple times if there's no reason to, even if its a relatively fast function. Everything is slower and less efficient in a browser.
+
+**Incorrect:**
+
+```java
+while(itr.hasNext()) {
+    if(!Minecraft.getMinecraft().getRenderManager().getEntityClassRenderObject(SomeEntity.class).shouldRender(itr.next())) {
+        itr.remove();
+    }
+}
+```
+
+**Correct:**
+
+```java
+Render<SomeEntity> render = Minecraft.getMinecraft().getRenderManager().getEntityClassRenderObject(SomeEntity.class);
+while(itr.hasNext()) {
+    if(!render.shouldRender(itr.next())) {
+        itr.remove();
+    }
+}
+```
+
+### 4. Iterators aren't that great
+
+Avoid using iterators when possible, this includes a `for(Item item : list)` type loop, since this may compile into bytecode that uses an iterator. If the list is a linked list or some other type of data structure that can’t perform random access efficiently, then it is recommended to use an iterator, but if the collection is guaranteed to be something similar to an ArrayList then implement it via a traditional for loop instead.
+
+**Recommended way to iterate an ArrayList:**
+
+```java
+for(int i = 0, l = list.size(); i < l; ++i) {
+    Item item = list.get(i);
+    // do something
+}
+```
+
+### 5. Don't shit on the heap
+
+Avoid creating temporary single-use objects in performance critical code, since the overhead of doing so is larger in a browser where there’s no type safety to predefine object structures. This includes using lambdas or using most of the stuff in the google guava package. Also this is partially why I prefer not using iterators whenever possible.
+
+**Incorrect, creates 5 temporary objects:**
+
+```java
+List<String> list1 = Arrays.asList("eagler", "eagler", "deevis");
+List<String> list2 = Lists.newArrayList(
+    Collections2.transform(
+        Collections2.filter(
+            list1,
+            (e) -> !e.equals("deevis")
+        ),
+        (e) -> (e + "!")
+    )
+);
+```
+
+**Correct, creates no temporary objects:**
+
+```java
+List<String> list1 = Arrays.asList("eagler", "eagler", "deevis");
+List<String> list2 = Lists.newArrayList();
+for(int i = 0, l = list1.size(); i < l; ++i) {
+    String s = list1.get(i);
+    if(!s.equals("deevis")) {
+        list2.add(s + "!");
+    }
+}
+```
+
+(note: we are ignoring the StringBuilder instances that the compiler generates from ` + "!"`)
+
+### 6. Don't base game/render logic off of the system time
+
+Use `EagRuntime.steadyTimeMillis()` instead to access a monotonic clock, as in a clock that is guaranteed to only run forwards, and is not affected by changes in the system time. `System.currentTimeMillis()` should only be used in situations where you want to know the actual wall time or are measuring elapsed time across multiple page refreshes.
+
+### 7. Prefer multiplication over division
+
+If you're always gonna divide a number by some constant, it is better to multiply it by one-over-the-constant instead.
+
+**Incorrect**
+
+```java
+float b = a / 50.0f;
+```
+
+**Correct**
+
+```java
+float b = a * 0.02f;
+```
+
+### 8. Shaders should take advantage of compiler intrinsics
+
+Although you may think these two pieces of code are identical, its more than likely that the "Correct" example will compile to a more efficient shader on almost any hardware. The functions in GLSL are not a library, they are compiler intrinsics that usually compile to inline assembly that can take advantage of different acceleration instructions in the GPU's instruction set. Vector math should be done in ways that promotes the use of SIMD instructions when the code is compiled to a shader.
+
+**Incorrect:**
+
+```glsl
+float dx = pos1.x - pos2.x;
+float dy = pos1.y - pos2.y;
+float dz = pos1.z - pos2.z;
+float distance = sqrt(dx * dx + dy * dy + dz * dz);
+float fogDensity = pow(2.718, -density * distance);
+```
+
+**Correct:**
+
+```glsl
+float fogDensity = exp(-density * length(pos1.xyz - pos2.xyz));
+```
+
+### 9. Flatten the control flow of shaders
+
+Modern GPUs are able to execute multiple instances of a shader on a single core, but if one of those shaders encounters a branch (if statement, or related) that causes it to begin executing different code from the other instances of the shader running on that core, that instance of the shader can no longer be executed at the same time as the other instances, and suddenly you've significantly increased the amount of time this core will now be busy executing shader instructions to account for all of the branches the different shader instances have taken.
+
+**Incorrect:**
+
+```glsl
+float lightValue = dot(lightDirection, normal);
+if(lightValue > 0.0) {
+    color += lightValue * lightColor * diffuseColor;
+}
+```
+
+**Correct:**
+```glsl
+float lightValue = max(dot(lightDirection, normal), 0.0);
+color += lightValue * lightColor * diffuseColor;
+```
+
+### 10. Use textureLod unless mipmapping is necessary
+
+This will prevent the shader from wasting time trying to determine what mipmap levels to read from when the texture is sampled.
+
+**Incorrect:**
+
+```glsl
+float depthValue = texture(depthBuffer, pos).r;
+```
+
+**Correct:**
+
+```glsl
+float depthValue = textureLod(depthBuffer, pos, 0.0).r;
+```
+
+### 11. Divide complex and branch-intensive shaders into multiple draw calls
+
+You can use a variety of different blending modes to mathematically combine the results of shaders. This is done for the same reason as flattening the control flow, to try and keep instruction pointers in sync by periodically resetting their positions, and also to allow for the driver to multitask better on GPUs with insane numbers of cores. It also allows the shader’s execution to be distributed across multiple frames in the case of something that doesn’t need to update often (like clouds).
+
+
+### 12. Don't abuse `@JSBody` in TeaVM code
+
+TeaVM provides lots of ways of interacting with JavaScript, using `@JSBody` is not the only way, consider using an overlay type.
+
+**Incorrect**
+
+```java
+@JSObject(params = { "obj" }, script = "return obj.valueA;")
+public static native JSObject getValueA(JSObject obj);
+
+@JSObject(params = { "obj" }, script = "return obj.valueB;")
+public static native JSObject getValueB(JSObject obj);
+
+@JSObject(params = { "obj" }, script = "return obj.valueC;")
+public static native JSObject getValueC(JSObject obj);
+
+@JSObject(params = { "obj" }, script = "obj.dumbFunction();")
+public static native void callDumbFunction(JSObject obj);
+```
+
+**Correct**
+
+```java
+public interface MyObject extends JSObject {
+
+    @JSProperty
+    JSObject getValueA();
+
+    @JSProperty
+    JSObject getValueB();
+
+    @JSProperty
+    JSObject getValueC();
+
+    void dumbFunction();
+
+}
+```
+
+### 13. Don't fall for TeaVM's threads
+
+It is impossible to have multithreading in JavaScript, only worker objects can be used to execute code concurrently, which can't share javascript variables. Therefore, when you create a thread in TeaVM, you're creating a virtual thread that isn't capable of running at the same time as any other virtual thread in the TeaVM context. This means it's impossible to speed a TeaVM program up through the use of multiple Java threads, instead it is more than likely that it will just slow the program down more to implement multithreading through TeaVM's threads due to the additional time required for synchronization and context switches. Its more efficient to just program the entire application to be single threaded to begin with, just put everything in the main loop and realize that if it was in a different thread it would just periodically interrupt the main loop.
+
+### 14. Always use try-with-resources
+
+For any code that deals with streams to be considered safe, it should either use a try-with-resources or try/finally in order to release resources when complete, since otherwise the stream might not close if an IO error causes the function to return early. This is especially important for plugin code since its supposed to be able to run on a large server for weeks at a time without the underlying JVM being restarted. If hackers discover a bug in the code to cause a function to return early like this without closing a stream, they might exploit it to fatally crash the server by spamming whatever corrupt packet causes the function to leak the stream, so all code must be written so it can fail at any time without leaking resources.
+
+**Incorrect**
+
+```java
+InputStream is = new FileInputStream(new File("phile.txt"));
+is.write(someArray);
+is.close();
+```
+
+**Correct**
+
+```java
+try(InputStream is = new FileInputStream(new File("phile.txt"))) {
+    is.write(someArray);
+}
+```
+
+Notice that the `.close()` can be omitted completely when using a try-with-resources
+
+### 15. Always close compression/decompression streams 
+
+In the desktop runtime, the default oracle JDK uses native code to implement the compression/decompression streams (InflaterInputStream, GZIPInputStream, etc) and therefore if you forget to close the compression/decompression stream it will cause a memory leak when the code isn't running in a browser. This is a common issue when using byte array input/output streams since you might believe when decompressing data from a byte array that there's no reason to close the stream when you're done since its not a file, but that will still cause a memory leak due to the decompression stream not being cleaned up.
+
+## Part B. Project Structure
+
+### 1. Code decompiled from Minecraft goes in `src/game/java`
+
+Don't add any new classes to `src/game/java`, and ideally any significant additions to the game's source (functions, etc) should be done through creating new classes in `src/main/java` instead of adding it directly to the decompiled classes.
+
+### 2. Do not put platform-dependent code in `src/main/java` or `src/game/java`
+
+One of the objectives of Eaglercraft is to make Minecraft Java edition truly cross platform, why stop at just a desktop and JavaScript runtime? There are plans to create an Android runtime and several WebAssembly runtimes, all of which will be compatible with any pre-existing eaglercraft clients that only depend on the EaglercraftX runtime library and don't directly depend on components of TeaVM or LWJGL. Ideally, all core features of the client should be implemented in the `src/main/java` and `src/game/java` and any platform-dependent features should be stubbed out in some abstract platform-independent way in classes in the `src/teavm/java` and `src/lwjgl/java` and any other future runtime you want your client to support. Ideally, every source folder of platform-dependent code should expose an identical API for access to the platform-independent code as all the other platform-dependant code folders currently expose.
+
+### 3. Don't mix JavaScript with Java
+
+Don’t implement features in the JavaScript runtime by requiring additional JavaScript files be included on index.html, if you must access browser APIs then use the TeaVM JSO to write your code in Java instead so it’s baked directly into classes.js. Certain browser APIs may be missing from the default TeaVM JSO-APIs library but it is not difficult to create the overlay types for them manually. Clients that violate this rule may also not possible to automatically import into the EaglercraftX boot menu depending on how fucked up they are. There aren't any limitations to the TeaVM JSO that give you a good enough excuse not to follow this rule.
+
+### 4. Don't access the classes named "Platform\*" directly from your platform-independent code
+
+Much like the Java runtime environment itself, Eaglercraft's runtime library consists of two layers, the internal classes full of platform-dependent code that expose an intermediate API not meant to be used by programmers directly, and the platform-independent API classes that provide a platform-independent wrapper for the platform dependent classes and also provide all the miscellaneous utility functions that don't require platform dependent code to be implemented. Chances are if you are directly using a function on a class that has a name that starts with "Platform\*", that there is a different class in `src/main/java` that you are meant to use in order to access that feature, that may perform additional checks or adjust the values you are passing to the function before calling the function in the Platform class.
+
+## Part C. Compatibility Standards
+
+### 1. Target minimum JDK version is Java 8
+
+Its difficult to find a platform where its not possible to run Java 8 in some capacity, therefore the desktop runtime of EaglercraftX and the BungeeCord plugin should target Java 8. The Velocity plugin is an exception since Velocity itself doesn't support Java 8 either.
+
+### 2. Target minimum supported browser is Google Chrome 38
+
+Released on October 7, 2014, we think its a good target for the JavaScript versions of EaglercraftX. This is the last version of Chrome that supports hardware accelerated WebGL 1.0 on Windows XP. All base features of the underlying Minecraft 1.8 client must be functional, however things such as EaglercraftX's shaders or dynamic lighting are not required to work. The client cannot crash as a result of any missing features on an old browser, you must either implement fallbacks or safely disable the unsupported features.
+
+### 3. Target minimum supported graphics API is OpenGL ES 2.0 (WebGL 1.0)
+
+The most widely supported graphics API in the world is currently OpenGL ES 2.0, so ideally that should be the target for EaglercraftX 1.8. We can guarantee the client will be on an OpenGL ES 3.0 context 99% of the time, however its not that hard to also maintain support for GLES 2.0 (WebGL 1.0) as well with slightly reduced functionality so we might as well make it a feature in case of the 1% of the time that functionality is not available. The client cannot depend on any GL extensions in order to run in GLES 2.0 mode, however its reasonable to assume there will be VAO support via extensions in most GLES 2.0 contexts so the client includes an abstraction layer (via EaglercraftGPU.java) to seamlessly emulate VAO functionality even when the client is running in GLES 2.0 mode with no VAO extensions. The only core feature of Minecraft 1.8 that is completely unavailable in GLES 2.0 mode is mip-mapping for the blocks/items texture atlas due to being unable to limit the max mipmap level.
+
+### 4. Use preprocessor directives to make portable shaders that can be compiled for both OpenGL ES 2.0 and 3.0 contexts
+
+Most of the shaders in the base "glsl" directory of the resources EPK file use a file called "gles2_compat.glsl" to polyfill certain GLSL features (such as input/output declarations) via preprocessor directives to allow them to be compiled on both OpenGL ES 3.0 and 2.0 contexts. This is the preferred way to implement backwards compatibility over creating seprate versions of the same shaders, since future developers don't need to waste time maintaining multiple versions of the same code if they don't really care about backwards compatibility in the first place.
+
+### 5. Target minimum version of the JavaScript syntax is ES5 strict mode
+
+A shim is included to provide certain ES6 functions, however you should always program with syntax compatible with ES5, so the script doesn't crash immediately due to syntax errors even if the functions that use unsupported syntax aren't actually being called. `build.gradle` currently patches out all the ES5 strict mode incompatible syntax in the output of TeaVM 0.9.2, but this will probably break if you try to update TeaVM. Don't worry though because future WASM versions of EaglercraftX will use the latest versions of TeaVM. **Some common incompatible syntax to avoid includes `const`, `let`, `async`, `( ) => `, and using named functions! You can't do any of these things in your JSBody annotations.**
+
+### 6. You cannot depend on any deprecated browser features
+
+The same way we want EaglercraftX to work on browsers from over 10 years ago, we want it to still work in browsers 10 years from today, therefore the client cannot depend on any deprecated browser features in order for all the base Minecraft 1.8 game's features to work properly. However it is okay to use deprecated features as fallback if any modern non-deprecated feature (such as keyboard event handling) that the game needs if the game is running in an old browser.
+
+### 7. Always use addEventListener to register event handlers
+
+Always use addEventListener to register event handlers for browser APIs, never through the use of assigning the legacy "on\*" (onclick, onkeydown, onmessage, etc) variables, the TeaVMUtils class has a universal helper function for accessing addEventListener on any JSO objects that don’t already implement the function.
+
+### 8. JavaScript should be executed in strict mode
+
+Always make sure your JavaScript files start with `"use strict";`, be careful when adding this to your code retroactively because it will probably break hastily written code unless you haven’t made a single typo that’s not forbidden in strict mode. Be aware that in Chrome 38 this means you can't use stuff such as `const` and `let` or named functions in any of your JSBody annotations!
diff --git a/EAGLERCRAFTX_README.md b/EAGLERCRAFTX_README.md
new file mode 100755
index 0000000..7a33236
--- /dev/null
+++ b/EAGLERCRAFTX_README.md
@@ -0,0 +1,246 @@
+
+# EaglercraftX 1.8
+
+### Play Minecraft 1.8 in your browser, supports singleplayer and multiplayer
+
+![EaglercraftX 1.8 Screenshot Main Menu](https://deev.is/eagler/cors/eagler-1.8-u22-titlescreen-480p.png)
+
+### This repository contains:
+
+ - **Utilities to decompile Minecraft 1.8 and apply patch files to it**
+ - **Source code to provide the LWJGL keyboard, mouse, and OpenGL APIs in a browser**
+ - **Patch files to mod the Minecraft 1.8 source code to make it browser compatible**
+ - **Browser-modified portions of Minecraft 1.8's open-source dependencies**
+ - **Plugins for Minecraft servers to allow the eagler client to connect to them**
+
+### This repository does NOT contain:
+
+ - **Any portion of the decompiled Minecraft 1.8 source code or resources**
+ - **Any portion of Mod Coder Pack and it's config files**
+ - **Data that can be used alone to reconstruct portions of the game's source code**
+
+## Getting Started:
+
+### To compile the latest version of the client, on Windows:
+
+1. Make sure you have at least Java 11 installed and added to your PATH, it is recommended to use Java 17
+2. Download (clone) this repository to your computer
+3. Double click `CompileLatestClient.bat`, a GUI resembling a classic windows installer should open
+4. Follow the steps shown to you in the new window to finish compiling
+
+### To compile the latest version of the client, on Linux/macOS:
+
+1. Make sure you have at least Java 11 installed, it is recommended to use Java 17
+2. Download (clone) this repository to your computer
+3. Open a terminal in the folder the repository was cloned to
+4. Type `chmod +x CompileLatestClient.sh` and hit enter
+5. Type `./CompileLatestClient.sh` and hit enter, a GUI resembling a classic windows installer should open
+6. Follow the steps shown to you in the new window to finish compiling
+
+## Browser Compatibility
+
+EaglercraftX 1.8 is currently known to work on browsers as old as Chrome 38 on Windows XP, the game supports both WebGL 1.0 and WebGL 2.0 however features such as dynamic lighting and PBR shaders require WebGL 2.0. The game also supports mobile browsers that don't have a keyboard or mouse, the game will enter touch screen mode automatically when touch input is detected. The game also includes an embedded OGG codec (JOrbis) for loading audio files on iOS where the browsers don't support loading OGG files in an AudioContext.
+
+## Singleplayer
+
+EaglercraftX 1.8 fully supports singleplayer mode through an integrated server. Worlds are saved to your browser's local storage and are available even if your device does not have an internet connection. You can also import and export worlds in EaglercraftX as EPK files to copy them between devices and send them to your friends.
+
+You can also import and export your existing vanilla Minecraft 1.8 worlds into EaglercraftX using ZIP files if you want to try playing all your old 1.8 maps in a modern browser. The glitch that caused some chunks to become corrupt when exporting worlds as vanilla in Eaglercraft 1.5.2 no longer happens in EaglercraftX 1.8, its perfect now. Beware that the inventories of LAN world players are not saved when the world is converted to vanilla, and pets (dogs, cats, horses, etc) might sometimes forget their owners due to the UUID changes.
+
+## Shared Worlds
+
+**This feature used to be known as "LAN Worlds" but has been renamed to "Shared Worlds" to avoid confusion**
+
+If you would like to invite other players to join your singleplayer world and play the game together, use the "Invite" button in the pause menu. You can configure gamemode and cheats for the other players joining your world, you can also decide if you would like to hide your world from other people on your wifi network or advertise your world to them. If hidden is "off" then other people on your same wifi network will see your world listed on their game's "Multiplayer" screen with all of their servers like how sharing LAN worlds behave in vanilla Minecraft 1.8.
+
+Once you press "Start Shared World", EaglercraftX 1.8 will give you a "join code" (usually 5 letters) to share with your friends. On a different device, go the "Multiplayer" screen and press "Direct Connect" and press "Join Shared World", enter the join code given to you when you started the shared world and press "Join World". Given a few seconds, the client should successfully be able to join your shared world from any other device on the internet that also has unrestricted internet access. If it does not work, check the "Network Settings" screen and make sure you and your friends all have the same set of shared world relay URLs configured or your clients will not be able to find each other.
+
+If you would like to host your own relay, the JAR file and instructions can be downloaded from the "Network Settings" screen in the client. EaglercraftX 1.8 uses the same "LAN world" relay server that is used by Eaglercraft 1.5.2, if you would like the relay source code find a random copy of the Eaglercraft 1.5.2 source code and it should be located in the "sp-relay" folder. The relay has not been updated since then, it has only been renamed from "LAN world relay" to "Shared world relay".
+
+## PBR Shaders
+
+EaglercraftX 1.8 includes a deferred physically-based renderer modeled after the GTA V rendering engine with many new improvements and a novel raytracing technique for fast realistic reflections. It can be enabled in the "Shaders" menu in the game's options screen. Shader packs in EaglercraftX are just a component of resource packs, so any custom shaders you install will be in the form of a resource pack. EaglercraftX also comes with a very well optimized built-in PBR shader pack and also a built-in PBR material texture pack to give all blocks and items in the game realistic lighting and materials that looks better than most vanilla Minecraft shader packs. The default shader and texture packs were created from scratch by lax1dude, shaders packs made for vanilla Minecraft will not work in EaglercraftX and no shaders in EaglercraftX were taken from vanilla Minecraft shader packs. The shaders are not available in WebGL 1.0 mode or if floating point HDR render targets are not fully supported.
+
+## Voice Chat
+
+EaglercraftX 1.8 includes an integrated voice-chat service that can be used in shared worlds and also on multiplayer servers when it is enabled by the server owner. This feature also uses WebRTC like shared worlds, so be careful that you don't leak your IP address accidentally by using it on a public server. If you own a website and don't want people to use voice chat on it, edit the `eaglercraftXOpts` variable in your index.html and add `allowVoiceClient: false`.
+
+## Resource Packs
+
+EaglercraftX 1.8 allows you to use any vanilla Minecraft 1.8 resource pack in your browser by importing it as a zip file, resource packs are saved to your browser's local storage and are saved between page refreshes. This can be used to add the original C418 soundtrack back into the game, download and import [this pack](https://bafybeiayojww5jfyzvlmtuk7l5ufkt7nlfto7mhwmzf2vs4bvsjd5ouiuq.ipfs.nftstorage.link/?filename=Music_For_Eaglercraft.zip) to add music back to Eaglercraft. A known bug with the debug desktop runtime is that sound files in resource packs do not play, this may be fixed in the future but is not a high priority issue.
+
+If you are creating a resource pack and want to disable the blur filter on the main menu panorama, create a file called `assets/minecraft/textures/gui/title/background/enable_blur.txt` in your pack and set it's contents to `enable_blur=0`
+
+## Making a Server
+
+To make a server for EaglercraftX 1.8 the recommended software to use is EaglercraftXBungee ("EaglerXBungee") which is included in this repository in the `gateway/EaglercraftXBungee` folder. This is a plugin designed to be used with BungeeCord to allow Eaglercraft players to join your BungeeCord server. It is assumed that the reader already knows what BungeeCord is and has a working server set up that is joinable via java edition. If you don't know what BungeeCord is, please research the topic yourself first before continuing. Waterfall and FlameCord have also been tested, but EaglerXBungee was natively compiled against BungeeCord.
+
+There is an experimental velocity plugin available in `gateway/EaglercraftXVelocity` but it is still in development and not recommended for public servers, so be sure to check for updates regularly if you use it. Configuration files are basically identical to EaglercraftXBungee so its safe to just directy copy in your old EaglercraftXBungee config files to the `plugins/eaglerxvelocity` folder and they should work with a minimal number of edits if you are migrating your network from BungeeCord to Velocity.
+
+### Detailed READMEs
+
+- [**EaglerXBungee README**](README_EAGLERXBUNGEE.md)
+- [**EaglerXVelocity README**](README_EAGLERXVELOCITY.md)
+- [**EaglerXBukkitAPI README**](README_EAGLERXBUKKITAPI.md)
+
+### Installation
+
+Obtain the latest version of the EaglerXBungee JAR file (it can be downloaded in the client from the "Multiplayer" screen) and place it in the "plugins" folder of your BungeeCord server. It's recommended to only join native Minecraft 1.8 servers through an EaglerXBungee server but plugins like ProtocolSupport have allowed some people to join newer servers too.
+
+Configuration files and other plugin data will be written in `plugins/EaglercraftXBungee`
+
+### Online Mode Instructions
+
+1. Enable `online_mode` in BungeeCord's `config.yml` file and make sure it works
+2. Join the BungeeCord server using Minecraft Java Edition while logged into your Microsoft account
+3. Run the `/eagler` command, it will give you a temporary login code
+4. Disconnect from the server, close java edition, launch EaglercraftX 1.8
+5. Set your profile username to the username of your Microsoft account
+6. Go to the "Multiplayer" menu, press "Direct Connect", press "Connect to Server", then enter "ws://localhost:8081/"
+7. If you are using a VPS, replace "localhost" with the IP address of the VPS when you connect
+8. Press "Join Server", a login screen will be displayed, enter the temporary login code into the password field
+9. EaglerXBungee will log you into the server as the Microsoft account you generated the login code with
+
+Players using EaglercraftX will be able to see the vanilla skins of players on the server using vanilla Minecraft, but players on the server using vanilla Minecraft won't be able to see the skins of players using Eaglercraft. Instead they will see the skin of the Minecraft account that was used when the Eaglercraft player originally ran the `/eagler` command.
+
+To disable this vanilla player skin feature and stop the plugin from downloading the textures of any player heads spawned with commands, edit the EaglercraftXBungee `settings.yml` file in the `plugins/EaglercraftXBungee` folder and change `download_vanilla_skins_to_clients` to `false`. Ratelimits configured in `settings.yml` define the maximum number of times per minute a single player is allowed to trigger profile/skin lookups and also define the maximum number of times per minute the entire server is allowed to actually perform profile/skin lookups.
+
+By default, EaglercraftXBungee will use a local SQLite database in the server's working directory to store player skins and authentication codes. SQLite will be downloaded automatically if it is not already present. If you would like to use MySQL or something else instead, EaglercraftXBungee is JDBC-based and supports any database type that you can find a driver for. You can set the path of the database, path of the driver JAR, and the name of the driver class (example: `org.sqlite.JDBC`) for storing player skins in `settings.yml` and for storing login codes and profiles in `authservice.yml`.
+
+### Offline Mode Instructions
+
+By setting `online_mode` to `false` in the BungeeCord `config.yml` the authentication system will be disabled and players will no longer be required to first generate a code to log in. This should only be used for testing or if you can't get the authentication system to work. EaglercraftXBungee's skin system is supposed to be able to display SkinsRestorer skins if you plan to have vanilla players on the server but it's not guaranteed.
+
+### Built-in HTTP server
+
+When configuring the EaglercraftXBungee `listeners.yml` file, every listener includes an `http_server` section that can be used to configure the listener to also behave like a regular HTTP server when the websocket address is entered into a browser. If this is disabled people will get the normal "404 Websocket Upgrade Failure" instead when they accidentally type your server address into their browser. `root` defines the path to the folder containing index.html and the other files you want to host, relative to the `plugins/EaglercraftXBungee` folder. This can be useful for hosting the client if the offline download doesn't work for some reason but might slow your BungeeCord server down if lots of people are loading it all the time.
+
+### Enabling Voice Chat
+
+Voice chat is disabled by default in EaglercraftXBungee because it is not recommended for use on public servers. To enable it, add or change `allow_voice: true` to your EaglercraftXBungee `listeners.yml` file. The main difference between Eaglercraft 1.5.2 and EaglercraftX 1.8's voice chat feature is that the "Global" channel now only includes other players on the same server as you instead of every single player connected to the same bungeecord proxy. If you would like to disable voice chat on certain servers, add the names of the servers to the `disable_voice_chat_on_servers` list in the EaglercraftXBungee `settings.yml` file. You may have to add this property to the YML file manually if you've upgraded your server from an older version of EaglercraftXBungee.
+
+### Disabling FNAW Skins
+
+Players are known to complain about the high-poly Five Nights At Winstons character skins making PVP harder because of the belief that they change a player's hitbox. If you would like to disable those skins in your PVP worlds you can either set `disable_fnaw_skins_everywhere: true` in your EaglercraftXBungee `settings.yml` file to disable them for all players on your whole BungeeCord proxy, or you can disable them on specific servers by adding the names of the servers to the `disable_fnaw_skins_on_servers` list also in `settings.yml` like with disabling voice chat.
+
+## Launch Options
+
+The EaglercraftX 1.8 client is configured primarily through a variable called `window.eaglercraftXOpts` that must be set before the client starts up.
+
+The default eaglercraftXOpts values is this:
+
+    const relayId = Math.floor(Math.random() * 3);
+    window.eaglercraftXOpts = {
+        demoMode: false,
+        container: "game_frame",
+        assetsURI: "assets.epk",
+        localesURI: "lang/",
+        worldsDB: "worlds",
+        servers: [
+            { addr: "ws://localhost:8081/", name: "Local test server" }
+        ],
+        relays: [
+            { addr: "wss://relay.deev.is/", comment: "lax1dude relay #1", primary: relayId == 0 },
+            { addr: "wss://relay.lax1dude.net/", comment: "lax1dude relay #2", primary: relayId == 1 },
+            { addr: "wss://relay.shhnowisnottheti.me/", comment: "ayunami relay #1", primary: relayId == 2 }
+        ]
+    };
+
+### List of available options
+
+- `container:` the ID of the HTML element to create the canvas in **(required)**
+- `assetsURI:` the URL of the assets.epk file **(required)**
+- `localesURI:` the URL where extra .lang files can be found
+- `lang`: the default language to use for the game (like "en_US")
+- `joinServer`: server address to join when the game launches
+- `worldsDB:` the name of the IndexedDB database to store worlds in
+- `resourcePacksDB:` the name of the IndexedDB database to store resource packs in
+- `demoMode:` whether to launch the game in java edition demo mode
+- `servers:` a list of default servers to display on the Multiplayer screen
+- `relays:` the default list of shared world relays to use for invites
+- `checkShaderGLErrors:` enables more verbose opengl error logging for the shaders
+- `enableDownloadOfflineButton:` whether to show a "Download Offline" button on the title screen
+- `downloadOfflineButtonLink:` overrides the download link for the "Download Offline" button
+- `html5CursorSupport:` enables support for showing the CSS "pointer" cursor over buttons
+- `allowUpdateSvc:` enables the certificate-based update system
+- `allowUpdateDL:` allows the client to download new updates it finds
+- `logInvalidCerts:` print update certificates with invalid signatures to console
+- `enableSignatureBadge:` show a badge on the title screen indicating if digital signature is valid
+- `checkRelaysForUpdates:` proprietary feature used in offline downloads
+- `allowVoiceClient:` can be used to disable the voice chat feature
+- `allowFNAWSkins:` can be used to disable the high poly FNAW skins
+- `localStorageNamespace:` can be used to change the prefix of the local storage keys (Default: `"_eaglercraftX"`)
+- `enableMinceraft:` can be used to disable the "Minceraft" title screen
+- `crashOnUncaughtExceptions:` display crash reports when `window.onerror` is fired
+- `openDebugConsoleOnLaunch:` open debug console automatically at launch
+- `fixDebugConsoleUnloadListener:` close debug console beforeunload instead of unload
+- `forceWebViewSupport:` if the server info webview should be allowed even on browsers without the required safety features
+- `enableWebViewCSP:` if the `csp` attibute should be set on the server info webview for extra security
+- `enableServerCookies:` can be used to disable server cookies
+- `allowServerRedirects:` if servers should be allowed to make the client reconnect to a different address
+- `autoFixLegacyStyleAttr:` if the viewport meta tag and style attributes on old offline downloads and websites should be automatically patched
+- `showBootMenuOnLaunch:` if the client should always show the boot menu on every launch
+- `bootMenuBlocksUnsignedClients:` if the boot menu should only be allowed to launch signed clients
+- `allowBootMenu:` can be used to disable the boot menu entirely
+- `forceProfanityFilter:` if the profanity filter should be forced enabled
+- `forceWebGL1:` if the game should force the browser to only use WebGL 1.0 for the canvas
+- `forceWebGL2:` if the game should force the browser to only use WebGL 2.0 for the canvas
+- `allowExperimentalWebGL1:` if the game should be allowed to create an `experimental-webgl` context
+- `useWebGLExt:` can be used to disable all OpenGL ES extensions to test the game on a pure WebGL 1.0/2.0 context
+- `useDelayOnSwap:` if the game should `setTimeout(..., 0)` every frame instead of using MessageChannel hacks
+- `useJOrbisAudioDecoder:` if OGG vorbis files should be decoded using the JOrbis Java OGG decoder instead of using the browser
+- `useXHRFetch:` if the game should use XMLHttpRequest for downloading resources instead of the fetch API
+- `useVisualViewport:` if the game should resize some GUIs relative to `window.visualViewport` (needed on mobile browsers when the keyboard is open)
+- `deobfStackTraces:` can be used to disable the runtime stack-trace deobfuscation, reduces micro stutters if the game is logging errors
+- `disableBlobURLs:` if the game should use `data:` URLs instead of `blob:` URLs for loading certain resources
+- `eaglerNoDelay:` can be used to disable "Vigg's Algorithm", an algorithm that delays and combines multiple EaglercraftX packets together if they are sent in the same tick (does not affect regular Minecraft 1.8 packets)
+- `ramdiskMode:` if worlds and resource packs should be stored in RAM instead of IndexedDB
+- `singleThreadMode:` if the game should run the client and integrated server in the same context instead of creating a worker object
+- `hooks:` can be used to define JavaScript callbacks for certain events
+    * `localStorageSaved:` JavaScript callback to save local storage keys (key, data)
+    * `localStorageLoaded:` JavaScript callback to load local storage keys (key) returns data
+    * `crashReportShow:` JavaScript callback when a crash report is shown (report, customMessageCB)
+    * `screenChanged:` JavaScript callback when the screen changes/resizes (screenName, scaledWidth, scaledHeight, realWidth, realHeight, scaleFactor)
+
+### Using Hooks
+
+You may want to implement some custom logic for loading/saving certain local storage keys. The eaglercraftXOpts hooks section can be used to override the client's local storage load and save functions. Currently, local storage keys are used to save game settings, the user's profile, custom servers, and shared world relays. Worlds and resource packs do not use local storage keys because modern browsers limit local storage keys to only 5 megabytes per domain which is too small for saving entire worlds and resource packs. Worlds and resource packs are saved using [IndexedDB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API).
+
+    window.eaglercraftXOpts = {
+        ...
+        ...
+        ...
+        hooks: {
+            localStorageSaved: function(key, data) {
+                // 'key' is local storage key name as a string
+                // 'data' is base64-encoded byte array as a string
+                // function returns nothing
+            },
+            localStorageLoaded: function(key) {
+                // 'key' is local storage key name as a string
+                // function returns a base64-encoded byte array as a string
+                // function returns null if the key does not exist
+            }
+        }
+    }
+
+Be aware that the client will still save the key to the browser's local storage anyway even if you define a custom save handler, and will just attempt to load the key from the browser's local storage normally if you return null, these are meant to be used like event handlers for creating backups of keys instead of completely replacing the local storage save and load functions.
+
+On a normal client you will only ever need to handle local storage keys called `p` (profile), `g` (game settings), `s` (server list), `r` (shared world relays), in your hooks functions. Feel free to just ignore any other keys. It is guaranteed that the data the client stores will always be valid base64, so it is best practice to decode it to raw binary first if possible to reduce it's size before saving it to something like a MySQL database in your backend if you are trying to implement some kind of profile syncing system for your website. The keys already have GZIP compression applied to them by default so don't bother trying to compress them yourself a second time because it won't reduce their size.
+
+### Crash Report Hook
+
+The `crashReportShow` hook can be used to capture crash reports and append additional text to them. It takes two parameters, the crash report as a string and a callback function for appending text. Do not use the callback function outside the body of the hook.
+
+    hooks: {
+        crashReportShow: function(report, customMessageCB) {
+            // 'report' is crash report as a string
+            customMessageCB("Hello from crashReportShow hook!");
+        }
+    }
+
+## Developing a Client
+
+There is currently no system in place to make forks of 1.8 and merge commits made to the patch files in this repository with the patch files or workspace of the fork, you're on your own if you try to keep a fork of this repo for reasons other than to contribute to it
+
+A javascript-based modding API resembling Minecraft Forge may be implemented someday though for adding custom content to the game.
diff --git a/build.gradle b/build.gradle
index 5c76755..acbf07f 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,31 @@
+import org.teavm.gradle.api.OptimizationLevel
+
+buildscript {
+    dependencies {
+        classpath files("src/teavmc-classpath/resources")
+    }
+}
+
 plugins {
-    id 'java'
-    id 'eclipse'
-    id 'org.teavm' version '0.9.2'
+    id "java"
+    id "eclipse"
+    id "org.teavm" version "0.9.2"
 }
 
 sourceSets {
     main {
         java {
-            srcDir 'src/main/java'
-            srcDir 'src/teavm/java'
+            srcDirs(
+                "src/main/java",
+                "src/game/java",
+               	"src/protocol-game/java",
+                "src/protocol-relay/java",
+                "src/teavm/java",
+                "src/teavm-boot-menu/java"
+            )
         }
     }
+    
 }
 
 repositories {
@@ -20,20 +35,38 @@ repositories {
 dependencies {
     teavm(teavm.libs.jso)
     teavm(teavm.libs.jsoApis)
+    compileOnly "org.teavm:teavm-core:0.9.2" // workaround for a few hacks
 }
 
+def folder = "javascript"
+def name = "classes.js"
+
 teavm.js {
     obfuscated = true
     sourceMap = true
-    targetFileName = "../classes.js"
-    optimization = org.teavm.gradle.api.OptimizationLevel.BALANCED // no fps boost was observed with "AGGRESSIVE"
+    targetFileName = "../" + name
+    optimization = OptimizationLevel.BALANCED // Change to "AGGRESSIVE" for release
     outOfProcess = false
     fastGlobalAnalysis = false
     processMemory = 512
-    entryPointName = 'main'
-    mainClass = 'net.lax1dude.eaglercraft.v1_8.internal.teavm.MainClass'
-    outputDir = file("javascript")
-    properties = null
-    sourceMap = true
+    entryPointName = "main"
+    mainClass = "net.lax1dude.eaglercraft.v1_8.internal.teavm.MainClass"
+    outputDir = file(folder)
+    properties = [ "java.util.TimeZone.autodetect": "true" ]
     debugInformation = false
 }
+
+tasks.named("generateJavaScript") {
+    doLast {
+    
+        // NOTE: This step may break at any time, and is not required for 99% of browsers
+        
+        def phile = file(folder + "/" + name)
+        def dest = phile.getText("UTF-8")
+        def i = dest.substring(0, dest.indexOf("=\$rt_globals.Symbol('jsoClass');")).lastIndexOf("let ")
+        dest = dest.substring(0, i) + "var" + dest.substring(i + 3)
+        def j = dest.indexOf("function(\$rt_globals,\$rt_exports){")
+        dest = dest.substring(0, j + 34) + "\n" + file(folder + "/ES6ShimScript.txt").getText("UTF-8") + "\n" + dest.substring(j + 34)
+        phile.write(dest, "UTF-8")
+    }
+}
\ No newline at end of file
diff --git a/desktopRuntime/RTWebViewClient.html b/desktopRuntime/RTWebViewClient.html
new file mode 100755
index 0000000..eb0454d
--- /dev/null
+++ b/desktopRuntime/RTWebViewClient.html
@@ -0,0 +1,514 @@
+<!DOCTYPE html>
+
+<!--
+Copyright (c) 2024 lax1dude. All Rights Reserved.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<html style="width:100%;height:100%;">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>Eaglercraft Desktop Runtime</title>
+		<link type="image/png" rel="shortcut icon" id="vigg" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
+		<script type="text/javascript">
+			"use strict";
+			(function() {
+				var webSocketURI = "${client_websocket_uri}";
+				if(webSocketURI === ("$" + "{client_websocket_uri}")) {
+					alert("Don't open this file in your browser");
+					window.addEventListener("load", function() {
+						document.body.innerHTML = "<p style=\"text-align:center;\">cunt</p>";
+					});
+					return;
+				}
+				var eaglercraftXOpts = {eaglercraftXOpts};
+				var cspAttrSupport = false;
+				var checkSupport = function() {
+					if(eaglercraftXOpts.forceWebViewSupport) {
+						cspAttrSupport = true;
+						return true;
+					}else {
+						var tempIFrameElement = document.createElement("iframe");
+						cspAttrSupport = eaglercraftXOpts.enableWebViewCSP && (typeof tempIFrameElement.csp === "string");
+						return (typeof tempIFrameElement.allow === "string") && (typeof tempIFrameElement.sandbox === "object");
+					}
+				};
+				var supported = false;
+				try {
+					supported = checkSupport();
+				}catch(ex) {
+					supported = false;
+				}
+				console.log("CSP attribute support detected as " + cspAttrSupport);
+				if(!supported) {
+					console.error("Required IFrame safety features are not supported!");
+					window.addEventListener("load", function() {
+						document.getElementById("view_loading").style.display = "none";
+						document.getElementById("view_safety_error").style.display = "block";
+					});
+					return;
+				}
+				var websocketInstance = null;
+				var hasOpened = false;
+				var webviewOptions = null;
+				var webviewResetSerial = 0;
+				var hasErrored = false;
+				var hasRegisteredOnMsgHandler = false;
+				var currentMessageHandler = null;
+				var currentIFrame = null;
+				var currentMessageChannelName = null;
+				var elements = {};
+				var loadElements = function() {
+					var jsel = document.getElementsByClassName("__jsel");
+					for(var i = 0; i < jsel.length; ++i) {
+						var el = jsel[i];
+						if(el.id.length > 0) {
+							elements[el.id] = el;
+						}
+					}
+				};
+				function loadEagtekIcon() {
+					var faviconSrc = document.getElementById("vigg").href;
+					var imgElements = document.getElementsByClassName("eagtek_icon");
+					for(var i = 0; i < imgElements.length; ++i) {
+						imgElements[i].src = faviconSrc;
+					}
+				}
+				function setupElementListeners() {
+					elements.button_allow.addEventListener("click", function() {
+						if(websocketInstance !== null) {
+							if(elements.chkbox_remember.checked) {
+								websocketInstance.send(JSON.stringify({$:7,perm:"ALLOW"}));
+							}
+							beginShowingDirect();
+						}
+					});
+					elements.button_block.addEventListener("click", function() {
+						if(websocketInstance !== null) {
+							if(elements.chkbox_remember.checked) {
+								websocketInstance.send(JSON.stringify({$:7,perm:"BLOCK"}));
+							}
+							beginShowingContentBlocked();
+						}
+					});
+					elements.button_re_evaluate.addEventListener("click", function() {
+						if(websocketInstance !== null) {
+							websocketInstance.send(JSON.stringify({$:7,perm:"NOT_SET"}));
+							beginShowingEnableJavaScript();
+						}
+					});
+				}
+				window.specialHack = function() {
+					if(websocketInstance !== null) {
+						websocketInstance.send(JSON.stringify({$:7,perm:"NOT_SET"}));
+					}
+				};
+				var handleHandshake = function(pkt) {
+					webviewOptions = {};
+					webviewOptions.contentMode = pkt.contentMode || "BLOB_BASED";
+					webviewOptions.fallbackTitle = pkt.fallbackTitle || "Server Info";
+					document.title = webviewOptions.fallbackTitle + " - Eaglercraft Desktop Runtime";
+					webviewOptions.scriptEnabled = !!pkt.scriptEnabled;
+					webviewOptions.strictCSPEnable = !!pkt.strictCSPEnable || false;
+					webviewOptions.serverMessageAPIEnabled = !!pkt.serverMessageAPIEnabled;
+					webviewOptions.url = pkt.url;
+					webviewOptions.blob = pkt.blob;
+					webviewOptions.hasApprovedJS = pkt.hasApprovedJS || "NOT_SET";
+					if(webviewOptions.scriptEnabled) {
+						if(webviewOptions.hasApprovedJS === "NOT_SET") {
+							beginShowingEnableJavaScript();
+						}else if(webviewOptions.hasApprovedJS === "ALLOW") {
+							beginShowingDirect();
+						}else if(webviewOptions.hasApprovedJS === "BLOCK") {
+							beginShowingContentBlocked();
+						}else {
+							setErrored("Unknown JS permission state: " + webviewOptions.hasApprovedJS);
+						}
+					}else {
+						beginShowingDirect();
+					}
+				};
+				var handleServerError = function(pkt) {
+					console.error("Recieved error from server: " + pkt.msg);
+					setErrored(pkt.msg);
+				};
+				var handleServerWebViewStrMsg = function(pkt) {
+					var w;
+					if(currentMessageChannelName !== null && currentIFrame !== null && (w = currentIFrame.contentWindow) !== null) {
+						w.postMessage({ver:1,channel:currentMessageChannelName,type:"string",data:pkt.msg}, "*");
+					}else {
+						console.error("Server tried to send the WebView a message, but the message channel is not open!");
+					}
+				};
+				var handleServerWebViewBinMsg = function(arr) {
+					var w;
+					if(currentMessageChannelName !== null && currentIFrame !== null && (w = currentIFrame.contentWindow) !== null) {
+						w.postMessage({ver:1,channel:currentMessageChannelName,type:"binary",data:arr}, "*");
+					}else {
+						console.error("Server tried to send the WebView a message, but the message channel is not open!");
+					}
+				};
+				var hideAllViews = function() {
+					if(currentIFrame !== null) {
+						++webviewResetSerial;
+						if(currentIFrame.parentNode) currentIFrame.parentNode.removeChild(currentIFrame);
+						currentIFrame = null;
+					}
+					elements.view_loading.style.display = "none";
+					elements.view_iframe.style.display = "none";
+					elements.view_allow_javascript.style.display = "none";
+					elements.view_javascript_blocked.style.display = "none";
+					elements.view_safety_error.style.display = "none";
+				};
+				var setErrored = function(str) {
+					if(hasErrored) return;
+					hasErrored = true;
+					hideAllViews();
+					elements.loading_text.style.color = "#CC0000";
+					elements.loading_text.innerText = str;
+					elements.view_loading.style.display = "block";
+					if(websocketInstance !== null) {
+						websocketInstance.close();
+						websocketInstance = null;
+					}
+				};
+				var registerMessageHandler = function() {
+					if(!hasRegisteredOnMsgHandler) {
+						hasRegisteredOnMsgHandler = true;
+						window.addEventListener("message", function(evt) {
+							if(currentIFrame !== null && currentMessageHandler !== null && evt.source === currentIFrame.contentWindow) {
+								currentMessageHandler(evt);
+							}
+						});
+					}
+				};
+				var beginShowingDirect = function() {
+					if(hasErrored) return;
+					hideAllViews();
+					if(!eaglercraftXOpts.forceWebViewSupport) {
+						try {
+							currentIFrame = document.createElement("iframe");
+							currentIFrame.allow = "";
+							if(currentIFrame.allow != "") throw "Failed to set allow to \"\"";
+							currentIFrame.referrerPolicy = "strict-origin";
+							var requiredSandboxTokens = [ "allow-downloads" ];
+							if(webviewOptions.scriptEnabled) {
+								requiredSandboxTokens.push("allow-scripts");
+								requiredSandboxTokens.push("allow-pointer-lock");
+							}
+							currentIFrame.sandbox = requiredSandboxTokens.join(" ");
+							for(var i = 0; i < requiredSandboxTokens.length; ++i) {
+								if(!currentIFrame.sandbox.contains(requiredSandboxTokens[i])) {
+									throw ("Failed to set sandbox attribute: " + requiredSandboxTokens[i]);
+								}
+							}
+							var sbox = currentIFrame.sandbox;
+							for(var i = 0; i < sbox.length; ++i) {
+								if(!requiredSandboxTokens.includes(sbox.item(i))) {
+									throw ("Unknown sandbox attribute detected: " + sbox.item(i));
+								}
+							}
+						}catch(ex) {
+							if(typeof ex === "string") {
+								console.error("Caught safety error: " + ex);
+								beginShowingSafetyError();
+							}else {webviewOptions
+								console.error("Fatal error while creating iframe!");
+								console.error(ex);
+								setErrored("Fatal error while creating iframe!");
+							}
+							return;
+						}
+					}else {
+						currentIFrame = document.createElement("iframe");
+						try {
+							currentIFrame.allow = "";
+						}catch(ex) {
+						}
+						try {
+							currentIFrame.referrerPolicy = "strict-origin";
+						}catch(ex) {
+						}
+						try {
+							var sandboxTokens = [ "allow-downloads", "allow-same-origin" ];
+							if(webviewOptions.scriptEnabled) {
+								sandboxTokens.push("allow-scripts");
+								sandboxTokens.push("allow-pointer-lock");
+							}
+							currentIFrame.sandbox = sandboxTokens.join(" ");
+						}catch(ex) {
+						}
+					}
+					currentIFrame.credentialless = true;
+					currentIFrame.loading = "lazy";
+					var cspWarn = false;
+					if(webviewOptions.contentMode === "BLOB_BASED") {
+						if(cspAttrSupport && eaglercraftXOpts.enableWebViewCSP) {
+							if(typeof currentIFrame.csp === "string") {
+								var csp = "default-src 'none';";
+								var protos = (webviewOptions.strictCSPEnable ? "" : " http: https:");
+								if(webviewOptions.scriptEnabled) {
+									csp += (" script-src 'unsafe-eval' 'unsafe-inline' data: blob:" + protos + ";");
+									csp += (" style-src 'unsafe-eval' 'unsafe-inline' data: blob:" + protos + ";");
+									csp += (" img-src data: blob:" + protos + ";");
+									csp += (" font-src data: blob:" + protos + ";");
+									csp += (" child-src data: blob:" + protos + ";");
+									csp += (" frame-src data: blob:;");
+									csp += (" media-src data: mediastream: blob:" + protos + ";");
+									csp += (" connect-src data: blob:" + protos + ";");
+									csp += (" worker-src data: blob:" + protos + ";");
+								}else {
+									csp += (" style-src data: 'unsafe-inline'" + protos + ";");
+									csp += (" img-src data:" + protos + ";");
+									csp += (" font-src data:" + protos + ";");
+									csp += (" media-src data:" + protos + ";");
+								}
+								currentIFrame.csp = csp;
+							}else {
+								console.error("This browser does not support CSP attribute on iframes! (try Chrome)");
+								cspWarn = true;
+							}
+						}else {
+							cspWarn = true;
+						}
+						if(cspWarn && webviewOptions.strictCSPEnable) {
+							console.error("Strict CSP was requested for this webview, but that feature is not available!");
+						}
+					}else {
+						cspWarn = true;
+					}
+					currentIFrame.style.border = "none";
+					currentIFrame.style.backgroundColor = "white";
+					currentIFrame.style.width = "100%";
+					currentIFrame.style.height = "100%";
+					elements.view_iframe.appendChild(currentIFrame);
+					elements.view_iframe.style.display = "block";
+					if(webviewOptions.contentMode === "BLOB_BASED") {
+						currentIFrame.srcdoc = webviewOptions.blob;
+					}else {
+						currentIFrame.src = webviewOptions.url;
+					}
+					currentIFrame.focus();
+					if(webviewOptions.scriptEnabled && webviewOptions.serverMessageAPIEnabled) {
+						var resetSer = webviewResetSerial;
+						var curIFrame = currentIFrame;
+						registerMessageHandler();
+						currentMessageHandler = function(evt) {
+							if(resetSer === webviewResetSerial && curIFrame === currentIFrame) {
+								handleMessageRawFromFrame(evt.data);
+							}
+						};
+					}
+				};
+				var handleMessageRawFromFrame = function(obj) {
+					if(hasErrored) return;
+					if((typeof obj === "object") && (obj.ver === 1) && ((typeof obj.channel === "string") && obj.channel.length > 0)) {
+						if(typeof obj.open === "boolean") {
+							sendMessageEnToServer(obj.open, obj.channel);
+							return;
+						}else if(typeof obj.data === "string") {
+							sendMessageToServerStr(obj.channel, obj.data);
+							return;
+						}else if(obj.data instanceof ArrayBuffer) {
+							sendMessageToServerBin(obj.channel, obj.data);
+							return;
+						}
+					}
+					console.error("WebView sent an invalid message!");	
+				};
+				var sendMessageEnToServer = function(messageChannelOpen, channelName) {
+					if(channelName.length > 255) {
+						console.error("WebView tried to " + (messageChannelOpen ? "open" : "close") + " a channel, but channel name is too long, max is 255 characters!");
+						return;
+					}
+					if(messageChannelOpen && currentMessageChannelName !== null) {
+						console.error("WebView tried to open channel, but a channel is already open!");
+						sendMessageEnToServer(false, currentMessageChannelName);
+					}
+					if(!messageChannelOpen && currentMessageChannelName !== null && currentMessageChannelName === channelName) {
+						console.error("WebView tried to close the wrong channel!");
+					}
+					if(!messageChannelOpen && currentMessageChannelName === null) {
+						console.error("WebView tried to close channel, but the channel is not open!");
+						return;
+					}
+					if(websocketInstance !== null) {
+						if(messageChannelOpen) {
+							websocketInstance.send(JSON.stringify({$:3,channel:channelName}));
+							console.log("WebView opened message channel to server: \"" + channelName + "\"");
+							currentMessageChannelName = channelName;
+						}else {
+							websocketInstance.send(JSON.stringify({$:4}));
+							console.log("WebView closed message channel to server: \"" + currentMessageChannelName + "\"");
+							currentMessageChannelName = null;
+						}
+					}else {
+						console.error("WebView tried to send a message, but no websocket is open!");
+					}
+				};
+				var sendMessageToServerStr = function(channelName, msg) {
+					if(channelName.length > 255) {
+						console.error("WebView tried to send a message packet, but channel name is too long, max is 255 characters!");
+						return;
+					}
+					if(channelName !== currentMessageChannelName) {
+						console.error("WebView tried to send a message packet, but the channel is not open!");
+						return;
+					}
+					if(websocketInstance !== null) {	
+						websocketInstance.send(JSON.stringify({$:5,msg:msg}));
+					}else {
+						console.error("WebView tried to send a message, but no callback for sending packets is set!");
+					}
+				};
+				var sendMessageToServerBin = function(channelName, msg) {
+					if(channelName.length > 255) {
+						console.error("WebView tried to send a message packet, but channel name is too long, max is 255 characters!");
+						return;
+					}
+					if(channelName !== currentMessageChannelName) {
+						console.error("WebView tried to send a message packet, but the channel is not open!");
+						return;
+					}
+					if(websocketInstance !== null) {
+						websocketInstance.send(msg);
+					}else {
+						console.error("WebView tried to send a message, but no callback for sending packets is set!");
+					}
+				};
+				var beginShowingEnableJavaScript = function() {
+					if(hasErrored) return;
+					hideAllViews();
+					if(webviewOptions.contentMode !== "BLOB_BASED") {
+						elements.strict_csp_value.innerText = "Impossible";
+						elements.strict_csp_value.style.color = "red";
+					}else if(!cspAttrSupport || !eaglercraftXOpts.enableWebViewCSP) {
+						elements.strict_csp_value.innerText = "Unsupported";
+						elements.strict_csp_value.style.color = "red";
+					}else if(webviewOptions.strictCSPEnable) {
+						elements.strict_csp_value.innerText = "Enabled";
+						elements.strict_csp_value.style.color = "green";
+					}else {
+						elements.strict_csp_value.innerText = "Disabled";
+						elements.strict_csp_value.style.color = "red";
+					}
+					if(webviewOptions.serverMessageAPIEnabled) {
+						elements.message_api_value.innerText = "Enabled";
+						elements.message_api_value.style.color = "red";
+					}else {
+						elements.message_api_value.innerText = "Disabled";
+						elements.message_api_value.style.color = "green";
+					}
+					elements.view_allow_javascript.style.display = "block";
+				};
+				var beginShowingContentBlocked = function() {
+					if(hasErrored) return;
+					hideAllViews();
+					elements.view_javascript_blocked.style.display = "block";
+				};
+				var beginShowingSafetyError = function() {
+					if(hasErrored) return;
+					hasErrored = true;
+					hideAllViews();
+					elements.view_safety_error.style.display = "block";
+				};
+				window.addEventListener("load", function() {
+					loadElements();
+					loadEagtekIcon();
+					setupElementListeners();
+					websocketInstance = new WebSocket(webSocketURI);
+					websocketInstance.binaryType = "arraybuffer";
+					websocketInstance.addEventListener("open", function(evt) {
+						console.log("Connection to server opened");
+						hasOpened = true;
+						websocketInstance.send(JSON.stringify({$:0,cspSupport:cspAttrSupport}));
+					});
+					websocketInstance.addEventListener("message", function(evt) {
+						try {
+							if(typeof evt.data === "string") {
+								var pkt = JSON.parse(evt.data);
+								if(typeof pkt.$ !== "number") {
+									throw "Packet type is invalid";
+								}
+								if(webviewOptions === null) {
+									if(pkt.$ === 1) {
+										handleHandshake(pkt);
+									}else if(pkt.$ === 2) {
+										handleServerError(pkt);
+									}else {
+										throw "Unknown packet type " + pkt.$ + " for state handshake!"
+									}
+								}else {
+									if(pkt.$ === 2) {
+										handleServerError(pkt);
+									}else if(pkt.$ === 6) {
+										handleServerWebViewStrMsg(pkt);
+									}else {
+										throw "Unknown packet type " + pkt.$ + " for state open!"
+									}
+								}
+							}else {
+								handleServerWebViewBinMsg(evt.data);
+							}
+						}catch(ex) {
+							console.error("Caught exception processing message from server!");
+							console.error(ex);
+						}
+					});
+					websocketInstance.addEventListener("close", function(evt) {
+						websocketInstance = null;
+						setErrored("Connection to EaglercraftX client lost!");
+					});
+					websocketInstance.addEventListener("error", function(evt) {
+						console.error("WebSocket error: " + evt);
+					});
+				});
+			})();
+		</script>
+	</head>
+	<body style="margin:0px;width:100%;height:100%;overflow:hidden;font-family:sans-serif;user-select:none;">
+		<div id="view_loading" style="width:100%;height:100%;display:block;" class="__jsel">
+			<div style="padding-top:13vh;">
+				<h2 style="text-align:center;" id="loading_text" class="__jsel">Please Wait...</h2>
+			</div>
+		</div>
+		<div id="view_iframe" style="width:100%;height:100%;display:none;" class="__jsel">
+		</div>
+		<div id="view_allow_javascript" style="width:100%;height:100%;display:none;" class="__jsel">
+			<div style="padding-top:13vh;">
+				<div style="margin:auto;max-width:450px;border:6px double black;text-align:center;padding:20px;">
+					<h2><img width="32" height="32" style="vertical-align:middle;" class="eagtek_icon">&emsp;Allow JavaScript</h2>
+					<p style="font-family:monospace;text-decoration:underline;word-wrap:break-word;" id="target_url"></p>
+					<h4 style="line-height:1.4em;">Strict CSP: <span id="strict_csp_value" class="__jsel"></span>&ensp;|&ensp;Message API: <span id="message_api_value" class="__jsel"></span></h4>
+					<p><input id="chkbox_remember" type="checkbox" class="__jsel" checked> Remember my choice</p>
+					<p><button style="font-size:1.5em;" id="button_allow" class="__jsel">Allow</button>&emsp;<button style="font-size:1.5em;" id="button_block" class="__jsel">Block</button></p>
+				</div>
+			</div>
+		</div>
+		<div id="view_javascript_blocked" style="width:100%;height:100%;display:none;" class="__jsel">
+			<div style="padding-top:13vh;">
+				<h1 style="text-align:center;"><img width="48" height="48" style="vertical-align:middle;" class="eagtek_icon">&emsp;Content Blocked</h1>
+				<h4 style="text-align:center;">You chose to block JavaScript execution for this embed</h4>
+				<p style="text-align:center;"><button style="font-size:1.0em;" id="button_re_evaluate" class="__jsel">Re-evaluate</button></p>
+			</div>
+		</div>
+		<div id="view_safety_error" style="width:100%;height:100%;display:none;" class="__jsel">
+			<div style="padding-top:13vh;">
+				<h1 style="text-align:center;"><img width="48" height="48" style="vertical-align:middle;" class="eagtek_icon">&emsp;IFrame Safety Error</h1>
+				<h4 style="text-align:center;">The content cannot be displayed safely!</h4>
+				<h4 style="text-align:center;">Check console for more details</h4>
+			</div>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/desktopRuntime/eclipseProject/.classpath b/desktopRuntime/eclipseProject/.classpath
index 7ed6dda..6300425 100755
--- a/desktopRuntime/eclipseProject/.classpath
+++ b/desktopRuntime/eclipseProject/.classpath
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src_main_java"/>
+	<classpathentry kind="src" path="src_game_java"/>
+	<classpathentry kind="src" path="src_protocol-game_java"/>
+	<classpathentry kind="src" path="src_protocol-relay_java"/>
 	<classpathentry kind="src" path="src_lwjgl_java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
diff --git a/desktopRuntime/eclipseProject/.project b/desktopRuntime/eclipseProject/.project
index 482815d..65e5fa0 100755
--- a/desktopRuntime/eclipseProject/.project
+++ b/desktopRuntime/eclipseProject/.project
@@ -15,15 +15,30 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 	<linkedResources>
-		<link>
-			<name>src_lwjgl_java</name>
-			<type>2</type>
-			<locationURI>PARENT-2-PROJECT_LOC../src/lwjgl/java</locationURI>
-		</link>
 		<link>
 			<name>src_main_java</name>
 			<type>2</type>
 			<locationURI>PARENT-2-PROJECT_LOC../src/main/java</locationURI>
 		</link>
+		<link>
+			<name>src_game_java</name>
+			<type>2</type>
+			<locationURI>PARENT-2-PROJECT_LOC../src/game/java</locationURI>
+		</link>
+		<link>
+			<name>src_protocol-game_java</name>
+			<type>2</type>
+			<locationURI>PARENT-2-PROJECT_LOC../src/protocol-game/java</locationURI>
+		</link>
+		<link>
+			<name>src_protocol-relay_java</name>
+			<type>2</type>
+			<locationURI>PARENT-2-PROJECT_LOC../src/protocol-relay/java</locationURI>
+		</link>
+		<link>
+			<name>src_lwjgl_java</name>
+			<type>2</type>
+			<locationURI>PARENT-2-PROJECT_LOC../src/lwjgl/java</locationURI>
+		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/desktopRuntime/libGLESv2.so b/desktopRuntime/libGLESv2.so.2
similarity index 100%
rename from desktopRuntime/libGLESv2.so
rename to desktopRuntime/libGLESv2.so.2
diff --git a/desktopRuntime/resources/SignedClientTemplate.txt b/desktopRuntime/resources/SignedClientTemplate.txt
index 876e1ce..6753b51 100755
--- a/desktopRuntime/resources/SignedClientTemplate.txt
+++ b/desktopRuntime/resources/SignedClientTemplate.txt
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
-<html>
+<html style="width:100%;height:100%;background-color:black;">
 <head>
 <meta charset="UTF-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
 <meta name="description" content="EaglercraftX 1.8 Offline" />
 <meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
 <title>EaglercraftX 1.8</title>
@@ -12,7 +12,7 @@
 <meta property="og:description" content="Play minecraft 1.8 in your browser" />
 <script type="text/javascript">
 "use strict";
-const relayId = Math.floor(Math.random() * 3);
+var relayId = Math.floor(Math.random() * 3);
 
 // %%%%%%%%% launch options %%%%%%%%%%%%
 
@@ -36,7 +36,7 @@ window.eaglercraftXOptsHints = {
 <script type="text/javascript">
 "use strict";
 (function(){
-	function eaglerBundleUnwrap(tagIn) { const e = document.getElementById(tagIn); const ret = e.innerText; e.remove(); return ret;  }
+	function eaglerBundleUnwrap(tagIn) { var e = document.getElementById(tagIn); var ret = e.innerText; document.head.removeChild(e); return ret;  }
 	window.eaglercraftXClientSignature = eaglerBundleUnwrap("eaglercraftXClientSignature");
 	window.eaglercraftXClientBundle = eaglerBundleUnwrap("eaglercraftXClientBundle");
 })();
@@ -44,42 +44,161 @@ window.eaglercraftXOptsHints = {
 <script type="text/javascript">
 "use strict";
 (function(){
-	function fetchB64PayloadSafe() {
-		const dataURL = window.eaglercraftXClientBundle;
-		if(!dataURL.startsWith("data:application/octet-stream;base64,")) {
-			return fetch(dataURL, { cache: "force-cache" }).then((response) => response.blob());
-		}
-		return new Promise((resolve) => {
-			fetch(dataURL)
-				.then((response) => response.blob())
-				.then((blob) => { resolve(blob); })
-				.catch((err) => {
-					console.error("Caught an error decoding base64 via fetch, doing it the slow way instead...");
-					// MIT License - https://github.com/beatgammit/base64-js
-					const base64js = (function(){return function(){function b(d,e,g){function a(j,i){if(!e[j]){if(!d[j]){var f="function"==typeof require&&require;if(!i&&f)return f(j,!0);if(h)return h(j,!0);var c=new Error("Cannot find module '"+j+"'");throw c.code="MODULE_NOT_FOUND",c}var k=e[j]={exports:{}};d[j][0].call(k.exports,function(b){var c=d[j][1][b];return a(c||b)},k,k.exports,b,d,e,g)}return e[j].exports}for(var h="function"==typeof require&&require,c=0;c<g.length;c++)a(g[c]);return a}return b}()({"/":[function(a,b,c){"use strict";function d(a){var b=a.length;if(0<b%4)throw new Error("Invalid string. Length must be a multiple of 4");var c=a.indexOf("=");-1===c&&(c=b);var d=c===b?0:4-c%4;return[c,d]}function e(a,b,c){return 3*(b+c)/4-c}function f(a){var b,c,f=d(a),g=f[0],j=f[1],k=new Uint8Array(e(a,g,j)),l=0,m=0<j?g-4:g;for(c=0;c<m;c+=4)b=h[a.charCodeAt(c)]<<18|h[a.charCodeAt(c+1)]<<12|h[a.charCodeAt(c+2)]<<6|h[a.charCodeAt(c+3)],k[l++]=255&b>>16,k[l++]=255&b>>8,k[l++]=255&b;return 2===j&&(b=h[a.charCodeAt(c)]<<2|h[a.charCodeAt(c+1)]>>4,k[l++]=255&b),1===j&&(b=h[a.charCodeAt(c)]<<10|h[a.charCodeAt(c+1)]<<4|h[a.charCodeAt(c+2)]>>2,k[l++]=255&b>>8,k[l++]=255&b),k}c.byteLength=function b(a){var c=d(a),e=c[0],f=c[1];return 3*(e+f)/4-f},c.toByteArray=f;for(var g=[],h=[],j="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",k=0,l=j.length;k<l;++k)g[k]=j[k],h[j.charCodeAt(k)]=k;h[45]=62,h[95]=63},{}]},{},[])("/")})();
-					const bytesDec = base64js.toByteArray(dataURL.substring(37)).buffer;
-					const bytesBlob = new Blob([bytesDec], { type: "application/octet-stream" });
-					window.eaglercraftXClientBundle = URL.createObjectURL(bytesBlob);
-					console.error("Created " + bytesDec.byteLength + " byte object URL: " + window.eaglercraftXClientBundle);
-					resolve(bytesBlob);
+	(function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;b="undefined"==typeof window?"undefined"==typeof global?"undefined"==typeof self?this:self:global:window,b.base64js=a()}})(function(){return function(){function b(d,e,g){function a(j,i){if(!e[j]){if(!d[j]){var f="function"==typeof require&&require;if(!i&&f)return f(j,!0);if(h)return h(j,!0);var c=new Error("Cannot find module '"+j+"'");throw c.code="MODULE_NOT_FOUND",c}var k=e[j]={exports:{}};d[j][0].call(k.exports,function(b){var c=d[j][1][b];return a(c||b)},k,k.exports,b,d,e,g)}return e[j].exports}for(var h="function"==typeof require&&require,c=0;c<g.length;c++)a(g[c]);return a}return b}()({"/":[function(a,b,c){'use strict';function d(a){var b=a.length;if(0<b%4)throw new Error("Invalid string. Length must be a multiple of 4");var c=a.indexOf("=");-1===c&&(c=b);var d=c===b?0:4-c%4;return[c,d]}function e(a,b,c){return 3*(b+c)/4-c}function f(a){var b,c,f=d(a),g=f[0],h=f[1],j=new m(e(a,g,h)),k=0,n=0<h?g-4:g;for(c=0;c<n;c+=4)b=l[a.charCodeAt(c)]<<18|l[a.charCodeAt(c+1)]<<12|l[a.charCodeAt(c+2)]<<6|l[a.charCodeAt(c+3)],j[k++]=255&b>>16,j[k++]=255&b>>8,j[k++]=255&b;return 2===h&&(b=l[a.charCodeAt(c)]<<2|l[a.charCodeAt(c+1)]>>4,j[k++]=255&b),1===h&&(b=l[a.charCodeAt(c)]<<10|l[a.charCodeAt(c+1)]<<4|l[a.charCodeAt(c+2)]>>2,j[k++]=255&b>>8,j[k++]=255&b),j}function g(a){return k[63&a>>18]+k[63&a>>12]+k[63&a>>6]+k[63&a]}function h(a,b,c){for(var d,e=[],f=b;f<c;f+=3)d=(16711680&a[f]<<16)+(65280&a[f+1]<<8)+(255&a[f+2]),e.push(g(d));return e.join("")}function j(a){for(var b,c=a.length,d=c%3,e=[],f=16383,g=0,j=c-d;g<j;g+=f)e.push(h(a,g,g+f>j?j:g+f));return 1===d?(b=a[c-1],e.push(k[b>>2]+k[63&b<<4]+"==")):2===d&&(b=(a[c-2]<<8)+a[c-1],e.push(k[b>>10]+k[63&b>>4]+k[63&b<<2]+"=")),e.join("")}c.byteLength=function(a){var b=d(a),c=b[0],e=b[1];return 3*(c+e)/4-e},c.toByteArray=f,c.fromByteArray=j;for(var k=[],l=[],m="undefined"==typeof Uint8Array?Array:Uint8Array,n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",o=0,p=n.length;o<p;++o)k[o]=n[o],l[n.charCodeAt(o)]=o;l[45]=62,l[95]=63},{}]},{},[])("/")});
+	var sameOriginSupport = -1;
+	var checkSameOriginSupport = function(callback0) {
+		if(sameOriginSupport == -1) {
+			try {
+				(function(callback) {
+					if((typeof URL === "undefined") || (typeof URL.createObjectURL !== "function")) {
+						sameOriginSupport = 1;
+						callback(false);
+					}else {
+						var theObjURL = URL.createObjectURL(new Blob([new Uint8Array([69, 69, 69, 69])]));
+						if(!theObjURL) {
+							sameOriginSupport = 1;
+							callback(false);
+						}
+						doXHR(theObjURL, function(dataRet) {
+							if(dataRet) {
+								var typedArr = new Uint8Array(dataRet);
+								if(typedArr.length === 4 && typedArr[0] === 69 && typedArr[1] === 69 && typedArr[2] === 69 && typedArr[3] === 69) {
+									sameOriginSupport = 0;
+									callback(true);
+								}else {
+									sameOriginSupport = 1;
+									callback(false);
+								}
+							}else {
+								sameOriginSupport = 1;
+								callback(false);
+							}
+						});
+					}
+				})(function(valRet) {
+					if(!valRet) {
+						console.error("Same origin XHR support detected as false, using data: url...");
+					}
+					callback0(valRet);
 				});
-		});
-	}
-	var ds = new DecompressionStream("gzip");
-	var result = [];
-	function fetchStream(reader) {
-		reader.read().then(function processData({ done, value }) {
-			if (done) {
-				window.clientScriptSrcURL = URL.createObjectURL(new Blob(result, { type: "text/javascript;charset=utf-8" }));
-				result = [];
-				ds = null;
-				return;
+			}catch(ex) {
+				console.error("Same origin XHR support detection failed, using data: url...");
+				callback0(false);
+			}
+		}else {
+			callback0(!sameOriginSupport);
+		}
+	};
+	var blobToArrayBuffer = function(blobIn, callback) {
+		if(typeof blobIn.arrayBuffer === "undefined") {
+			blobIn.arrayBuffer().then(callback);
+		}else {
+			(function(phileReader) {
+				phileReader.addEventListener("load", function(evt) {
+					callback(phileReader.result);
+				});
+				phileReader.readAsArrayBuffer(blobIn);
+			})(new FileReader());
+		}
+	};
+	var completeXHR = function(callback, arg) {
+		if(!callback.comp) {
+			callback.comp = true;
+			callback.cb(arg);
+		}
+	};
+	var doXHR = function(urlIn, callback) {
+		(function(theXHRObj, callbackStruct){
+			theXHRObj.responseType = "arraybuffer";
+			theXHRObj.addEventListener("load", function(evt) { var stat = theXHRObj.status; if(stat === 0 || (stat >= 200 && stat < 400)) { completeXHR(callbackStruct, theXHRObj.response); } else { completeXHR(callbackStruct, null); } });
+			theXHRObj.addEventListener("error", function(evt) {  completeXHR(callbackStruct, null); });
+			theXHRObj.open("GET", urlIn, true);
+			theXHRObj.send();
+		})(new XMLHttpRequest(), { cb: callback, comp: false });
+	};
+	var decodeBase64URL = function(urlIn, callbackOut) {
+		doXHR(urlIn, function(data) {
+			if(!data) {
+				try {
+					console.error("Caught an error decoding base64 via fetch, doing it the slow way instead...");
+					callbackOut(base64js.toByteArray(urlIn.substring(37)).buffer);
+				}catch(ex) {
+					console.error("Failed to decode base64!");
+					console.error(ex);
+					callbackOut(null);
+				}
+			}else {
+				callbackOut(data);
+			}
+		});
+	};
+	if(typeof window.DecompressionStream === "undefined") {
+		checkSameOriginSupport(function(soSupported) {
+			var theWorkerObj;
+			var workerSrc = ""use strict";
/*! pako 2.1.0 https://github.com/nodeca/pako @license (MIT AND Zlib) */
!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).pako={})}(this,(function(e){"use strict";var t=function(e,t,i,n){for(var a=65535&e|0,r=e>>>16&65535|0,o=0;0!==i;){i-=o=i>2e3?2e3:i;do{r=r+(a=a+t[n++]|0)|0}while(--o);a%=65521,r%=65521}return a|r<<16|0},i=new Uint32Array(function(){for(var e,t=[],i=0;i<256;i++){e=i;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[i]=e}return t}()),n=function(e,t,n,a){var r=i,o=a+n;e^=-1;for(var s=a;s<o;s++)e=e>>>8^r[255&(e^t[s])];return-1^e},a=16209,r=function(e,t){var i,n,r,o,s,l,f,d,h,c,u,w,b,m,k,_,v,g,p,y,x,E,R,A,Z=e.state;i=e.next_in,R=e.input,n=i+(e.avail_in-5),r=e.next_out,A=e.output,o=r-(t-e.avail_out),s=r+(e.avail_out-257),l=Z.dmax,f=Z.wsize,d=Z.whave,h=Z.wnext,c=Z.window,u=Z.hold,w=Z.bits,b=Z.lencode,m=Z.distcode,k=(1<<Z.lenbits)-1,_=(1<<Z.distbits)-1;e:do{w<15&&(u+=R[i++]<<w,w+=8,u+=R[i++]<<w,w+=8),v=b[u&k];t:for(;;){if(u>>>=g=v>>>24,w-=g,0===(g=v>>>16&255))A[r++]=65535&v;else{if(!(16&g)){if(0==(64&g)){v=b[(65535&v)+(u&(1<<g)-1)];continue t}if(32&g){Z.mode=16191;break e}e.msg="invalid literal/length code",Z.mode=a;break e}p=65535&v,(g&=15)&&(w<g&&(u+=R[i++]<<w,w+=8),p+=u&(1<<g)-1,u>>>=g,w-=g),w<15&&(u+=R[i++]<<w,w+=8,u+=R[i++]<<w,w+=8),v=m[u&_];i:for(;;){if(u>>>=g=v>>>24,w-=g,!(16&(g=v>>>16&255))){if(0==(64&g)){v=m[(65535&v)+(u&(1<<g)-1)];continue i}e.msg="invalid distance code",Z.mode=a;break e}if(y=65535&v,w<(g&=15)&&(u+=R[i++]<<w,(w+=8)<g&&(u+=R[i++]<<w,w+=8)),(y+=u&(1<<g)-1)>l){e.msg="invalid distance too far back",Z.mode=a;break e}if(u>>>=g,w-=g,y>(g=r-o)){if((g=y-g)>d&&Z.sane){e.msg="invalid distance too far back",Z.mode=a;break e}if(x=0,E=c,0===h){if(x+=f-g,g<p){p-=g;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}}else if(h<g){if(x+=f+h-g,(g-=h)<p){p-=g;do{A[r++]=c[x++]}while(--g);if(x=0,h<p){p-=g=h;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}}}else if(x+=h-g,g<p){p-=g;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}for(;p>2;)A[r++]=E[x++],A[r++]=E[x++],A[r++]=E[x++],p-=3;p&&(A[r++]=E[x++],p>1&&(A[r++]=E[x++]))}else{x=r-y;do{A[r++]=A[x++],A[r++]=A[x++],A[r++]=A[x++],p-=3}while(p>2);p&&(A[r++]=A[x++],p>1&&(A[r++]=A[x++]))}break}}break}}while(i<n&&r<s);i-=p=w>>3,u&=(1<<(w-=p<<3))-1,e.next_in=i,e.next_out=r,e.avail_in=i<n?n-i+5:5-(i-n),e.avail_out=r<s?s-r+257:257-(r-s),Z.hold=u,Z.bits=w},o=15,s=new Uint16Array([3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0]),l=new Uint8Array([16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78]),f=new Uint16Array([1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0]),d=new Uint8Array([16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64]),h=function(e,t,i,n,a,r,h,c){var u,w,b,m,k,_,v,g,p,y=c.bits,x=0,E=0,R=0,A=0,Z=0,S=0,T=0,O=0,U=0,D=0,I=null,B=new Uint16Array(16),N=new Uint16Array(16),C=null;for(x=0;x<=o;x++)B[x]=0;for(E=0;E<n;E++)B[t[i+E]]++;for(Z=y,A=o;A>=1&&0===B[A];A--);if(Z>A&&(Z=A),0===A)return a[r++]=20971520,a[r++]=20971520,c.bits=1,0;for(R=1;R<A&&0===B[R];R++);for(Z<R&&(Z=R),O=1,x=1;x<=o;x++)if(O<<=1,(O-=B[x])<0)return-1;if(O>0&&(0===e||1!==A))return-1;for(N[1]=0,x=1;x<o;x++)N[x+1]=N[x]+B[x];for(E=0;E<n;E++)0!==t[i+E]&&(h[N[t[i+E]]++]=E);if(0===e?(I=C=h,_=20):1===e?(I=s,C=l,_=257):(I=f,C=d,_=0),D=0,E=0,x=R,k=r,S=Z,T=0,b=-1,m=(U=1<<Z)-1,1===e&&U>852||2===e&&U>592)return 1;for(;;){v=x-T,h[E]+1<_?(g=0,p=h[E]):h[E]>=_?(g=C[h[E]-_],p=I[h[E]-_]):(g=96,p=0),u=1<<x-T,R=w=1<<S;do{a[k+(D>>T)+(w-=u)]=v<<24|g<<16|p|0}while(0!==w);for(u=1<<x-1;D&u;)u>>=1;if(0!==u?(D&=u-1,D+=u):D=0,E++,0==--B[x]){if(x===A)break;x=t[i+h[E]]}if(x>Z&&(D&m)!==b){for(0===T&&(T=Z),k+=R,O=1<<(S=x-T);S+T<A&&!((O-=B[S+T])<=0);)S++,O<<=1;if(U+=1<<S,1===e&&U>852||2===e&&U>592)return 1;a[b=D&m]=Z<<24|S<<16|k-r|0}}return 0!==D&&(a[k+D]=x-T<<24|64<<16|0),c.bits=Z,0},c={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_MEM_ERROR:-4,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8},u=c.Z_FINISH,w=c.Z_BLOCK,b=c.Z_TREES,m=c.Z_OK,k=c.Z_STREAM_END,_=c.Z_NEED_DICT,v=c.Z_STREAM_ERROR,g=c.Z_DATA_ERROR,p=c.Z_MEM_ERROR,y=c.Z_BUF_ERROR,x=c.Z_DEFLATED,E=16180,R=16190,A=16191,Z=16192,S=16194,T=16199,O=16200,U=16206,D=16209,I=function(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)};function B(){this.strm=null,this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new Uint16Array(320),this.work=new Uint16Array(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}var N,C,z=function(e){if(!e)return 1;var t=e.state;return!t||t.strm!==e||t.mode<E||t.mode>16211?1:0},F=function(e){if(z(e))return v;var t=e.state;return e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=E,t.last=0,t.havedict=0,t.flags=-1,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new Int32Array(852),t.distcode=t.distdyn=new Int32Array(592),t.sane=1,t.back=-1,m},L=function(e){if(z(e))return v;var t=e.state;return t.wsize=0,t.whave=0,t.wnext=0,F(e)},M=function(e,t){var i;if(z(e))return v;var n=e.state;return t<0?(i=0,t=-t):(i=5+(t>>4),t<48&&(t&=15)),t&&(t<8||t>15)?v:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=i,n.wbits=t,L(e))},H=function(e,t){if(!e)return v;var i=new B;e.state=i,i.strm=e,i.window=null,i.mode=E;var n=M(e,t);return n!==m&&(e.state=null),n},j=!0,K=function(e){if(j){N=new Int32Array(512),C=new Int32Array(32);for(var t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(h(1,e.lens,0,288,N,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;h(2,e.lens,0,32,C,0,e.work,{bits:5}),j=!1}e.lencode=N,e.lenbits=9,e.distcode=C,e.distbits=5},P=function(e,t,i,n){var a,r=e.state;return null===r.window&&(r.wsize=1<<r.wbits,r.wnext=0,r.whave=0,r.window=new Uint8Array(r.wsize)),n>=r.wsize?(r.window.set(t.subarray(i-r.wsize,i),0),r.wnext=0,r.whave=r.wsize):((a=r.wsize-r.wnext)>n&&(a=n),r.window.set(t.subarray(i-n,i-n+a),r.wnext),(n-=a)?(r.window.set(t.subarray(i-n,i),0),r.wnext=n,r.whave=r.wsize):(r.wnext+=a,r.wnext===r.wsize&&(r.wnext=0),r.whave<r.wsize&&(r.whave+=a))),0},Y={inflateReset:L,inflateReset2:M,inflateResetKeep:F,inflateInit:function(e){return H(e,15)},inflateInit2:H,inflate:function(e,i){var a,o,s,l,f,d,c,B,N,C,F,L,M,H,j,Y,G,X,W,q,J,Q,V,$,ee=0,te=new Uint8Array(4),ie=new Uint8Array([16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15]);if(z(e)||!e.output||!e.input&&0!==e.avail_in)return v;(a=e.state).mode===A&&(a.mode=Z),f=e.next_out,s=e.output,c=e.avail_out,l=e.next_in,o=e.input,d=e.avail_in,B=a.hold,N=a.bits,C=d,F=c,Q=m;e:for(;;)switch(a.mode){case E:if(0===a.wrap){a.mode=Z;break}for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(2&a.wrap&&35615===B){0===a.wbits&&(a.wbits=15),a.check=0,te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0),B=0,N=0,a.mode=16181;break}if(a.head&&(a.head.done=!1),!(1&a.wrap)||(((255&B)<<8)+(B>>8))%31){e.msg="incorrect header check",a.mode=D;break}if((15&B)!==x){e.msg="unknown compression method",a.mode=D;break}if(N-=4,J=8+(15&(B>>>=4)),0===a.wbits&&(a.wbits=J),J>15||J>a.wbits){e.msg="invalid window size",a.mode=D;break}a.dmax=1<<a.wbits,a.flags=0,e.adler=a.check=1,a.mode=512&B?16189:A,B=0,N=0;break;case 16181:for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(a.flags=B,(255&a.flags)!==x){e.msg="unknown compression method",a.mode=D;break}if(57344&a.flags){e.msg="unknown header flags set",a.mode=D;break}a.head&&(a.head.text=B>>8&1),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0,a.mode=16182;case 16182:for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.head&&(a.head.time=B),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,te[2]=B>>>16&255,te[3]=B>>>24&255,a.check=n(a.check,te,4,0)),B=0,N=0,a.mode=16183;case 16183:for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.head&&(a.head.xflags=255&B,a.head.os=B>>8),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0,a.mode=16184;case 16184:if(1024&a.flags){for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.length=B,a.head&&(a.head.extra_len=B),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0}else a.head&&(a.head.extra=null);a.mode=16185;case 16185:if(1024&a.flags&&((L=a.length)>d&&(L=d),L&&(a.head&&(J=a.head.extra_len-a.length,a.head.extra||(a.head.extra=new Uint8Array(a.head.extra_len)),a.head.extra.set(o.subarray(l,l+L),J)),512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,a.length-=L),a.length))break e;a.length=0,a.mode=16186;case 16186:if(2048&a.flags){if(0===d)break e;L=0;do{J=o[l+L++],a.head&&J&&a.length<65536&&(a.head.name+=String.fromCharCode(J))}while(J&&L<d);if(512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,J)break e}else a.head&&(a.head.name=null);a.length=0,a.mode=16187;case 16187:if(4096&a.flags){if(0===d)break e;L=0;do{J=o[l+L++],a.head&&J&&a.length<65536&&(a.head.comment+=String.fromCharCode(J))}while(J&&L<d);if(512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,J)break e}else a.head&&(a.head.comment=null);a.mode=16188;case 16188:if(512&a.flags){for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(4&a.wrap&&B!==(65535&a.check)){e.msg="header crc mismatch",a.mode=D;break}B=0,N=0}a.head&&(a.head.hcrc=a.flags>>9&1,a.head.done=!0),e.adler=a.check=0,a.mode=A;break;case 16189:for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}e.adler=a.check=I(B),B=0,N=0,a.mode=R;case R:if(0===a.havedict)return e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,_;e.adler=a.check=1,a.mode=A;case A:if(i===w||i===b)break e;case Z:if(a.last){B>>>=7&N,N-=7&N,a.mode=U;break}for(;N<3;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}switch(a.last=1&B,N-=1,3&(B>>>=1)){case 0:a.mode=16193;break;case 1:if(K(a),a.mode=T,i===b){B>>>=2,N-=2;break e}break;case 2:a.mode=16196;break;case 3:e.msg="invalid block type",a.mode=D}B>>>=2,N-=2;break;case 16193:for(B>>>=7&N,N-=7&N;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if((65535&B)!=(B>>>16^65535)){e.msg="invalid stored block lengths",a.mode=D;break}if(a.length=65535&B,B=0,N=0,a.mode=S,i===b)break e;case S:a.mode=16195;case 16195:if(L=a.length){if(L>d&&(L=d),L>c&&(L=c),0===L)break e;s.set(o.subarray(l,l+L),f),d-=L,l+=L,c-=L,f+=L,a.length-=L;break}a.mode=A;break;case 16196:for(;N<14;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(a.nlen=257+(31&B),B>>>=5,N-=5,a.ndist=1+(31&B),B>>>=5,N-=5,a.ncode=4+(15&B),B>>>=4,N-=4,a.nlen>286||a.ndist>30){e.msg="too many length or distance symbols",a.mode=D;break}a.have=0,a.mode=16197;case 16197:for(;a.have<a.ncode;){for(;N<3;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.lens[ie[a.have++]]=7&B,B>>>=3,N-=3}for(;a.have<19;)a.lens[ie[a.have++]]=0;if(a.lencode=a.lendyn,a.lenbits=7,V={bits:a.lenbits},Q=h(0,a.lens,0,19,a.lencode,0,a.work,V),a.lenbits=V.bits,Q){e.msg="invalid code lengths set",a.mode=D;break}a.have=0,a.mode=16198;case 16198:for(;a.have<a.nlen+a.ndist;){for(;Y=(ee=a.lencode[B&(1<<a.lenbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(G<16)B>>>=j,N-=j,a.lens[a.have++]=G;else{if(16===G){for($=j+2;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(B>>>=j,N-=j,0===a.have){e.msg="invalid bit length repeat",a.mode=D;break}J=a.lens[a.have-1],L=3+(3&B),B>>>=2,N-=2}else if(17===G){for($=j+3;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}N-=j,J=0,L=3+(7&(B>>>=j)),B>>>=3,N-=3}else{for($=j+7;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}N-=j,J=0,L=11+(127&(B>>>=j)),B>>>=7,N-=7}if(a.have+L>a.nlen+a.ndist){e.msg="invalid bit length repeat",a.mode=D;break}for(;L--;)a.lens[a.have++]=J}}if(a.mode===D)break;if(0===a.lens[256]){e.msg="invalid code -- missing end-of-block",a.mode=D;break}if(a.lenbits=9,V={bits:a.lenbits},Q=h(1,a.lens,0,a.nlen,a.lencode,0,a.work,V),a.lenbits=V.bits,Q){e.msg="invalid literal/lengths set",a.mode=D;break}if(a.distbits=6,a.distcode=a.distdyn,V={bits:a.distbits},Q=h(2,a.lens,a.nlen,a.ndist,a.distcode,0,a.work,V),a.distbits=V.bits,Q){e.msg="invalid distances set",a.mode=D;break}if(a.mode=T,i===b)break e;case T:a.mode=O;case O:if(d>=6&&c>=258){e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,r(e,F),f=e.next_out,s=e.output,c=e.avail_out,l=e.next_in,o=e.input,d=e.avail_in,B=a.hold,N=a.bits,a.mode===A&&(a.back=-1);break}for(a.back=0;Y=(ee=a.lencode[B&(1<<a.lenbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(Y&&0==(240&Y)){for(X=j,W=Y,q=G;Y=(ee=a.lencode[q+((B&(1<<X+W)-1)>>X)])>>>16&255,G=65535&ee,!(X+(j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}B>>>=X,N-=X,a.back+=X}if(B>>>=j,N-=j,a.back+=j,a.length=G,0===Y){a.mode=16205;break}if(32&Y){a.back=-1,a.mode=A;break}if(64&Y){e.msg="invalid literal/length code",a.mode=D;break}a.extra=15&Y,a.mode=16201;case 16201:if(a.extra){for($=a.extra;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.length+=B&(1<<a.extra)-1,B>>>=a.extra,N-=a.extra,a.back+=a.extra}a.was=a.length,a.mode=16202;case 16202:for(;Y=(ee=a.distcode[B&(1<<a.distbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(0==(240&Y)){for(X=j,W=Y,q=G;Y=(ee=a.distcode[q+((B&(1<<X+W)-1)>>X)])>>>16&255,G=65535&ee,!(X+(j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}B>>>=X,N-=X,a.back+=X}if(B>>>=j,N-=j,a.back+=j,64&Y){e.msg="invalid distance code",a.mode=D;break}a.offset=G,a.extra=15&Y,a.mode=16203;case 16203:if(a.extra){for($=a.extra;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.offset+=B&(1<<a.extra)-1,B>>>=a.extra,N-=a.extra,a.back+=a.extra}if(a.offset>a.dmax){e.msg="invalid distance too far back",a.mode=D;break}a.mode=16204;case 16204:if(0===c)break e;if(L=F-c,a.offset>L){if((L=a.offset-L)>a.whave&&a.sane){e.msg="invalid distance too far back",a.mode=D;break}L>a.wnext?(L-=a.wnext,M=a.wsize-L):M=a.wnext-L,L>a.length&&(L=a.length),H=a.window}else H=s,M=f-a.offset,L=a.length;L>c&&(L=c),c-=L,a.length-=L;do{s[f++]=H[M++]}while(--L);0===a.length&&(a.mode=O);break;case 16205:if(0===c)break e;s[f++]=a.length,c--,a.mode=O;break;case U:if(a.wrap){for(;N<32;){if(0===d)break e;d--,B|=o[l++]<<N,N+=8}if(F-=c,e.total_out+=F,a.total+=F,4&a.wrap&&F&&(e.adler=a.check=a.flags?n(a.check,s,F,f-F):t(a.check,s,F,f-F)),F=c,4&a.wrap&&(a.flags?B:I(B))!==a.check){e.msg="incorrect data check",a.mode=D;break}B=0,N=0}a.mode=16207;case 16207:if(a.wrap&&a.flags){for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(4&a.wrap&&B!==(4294967295&a.total)){e.msg="incorrect length check",a.mode=D;break}B=0,N=0}a.mode=16208;case 16208:Q=k;break e;case D:Q=g;break e;case 16210:return p;default:return v}return e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,(a.wsize||F!==e.avail_out&&a.mode<D&&(a.mode<U||i!==u))&&P(e,e.output,e.next_out,F-e.avail_out),C-=e.avail_in,F-=e.avail_out,e.total_in+=C,e.total_out+=F,a.total+=F,4&a.wrap&&F&&(e.adler=a.check=a.flags?n(a.check,s,F,e.next_out-F):t(a.check,s,F,e.next_out-F)),e.data_type=a.bits+(a.last?64:0)+(a.mode===A?128:0)+(a.mode===T||a.mode===S?256:0),(0===C&&0===F||i===u)&&Q===m&&(Q=y),Q},inflateEnd:function(e){if(z(e))return v;var t=e.state;return t.window&&(t.window=null),e.state=null,m},inflateGetHeader:function(e,t){if(z(e))return v;var i=e.state;return 0==(2&i.wrap)?v:(i.head=t,t.done=!1,m)},inflateSetDictionary:function(e,i){var n,a=i.length;return z(e)||0!==(n=e.state).wrap&&n.mode!==R?v:n.mode===R&&t(1,i,a,0)!==n.check?g:P(e,i,a,a)?(n.mode=16210,p):(n.havedict=1,m)},inflateInfo:"pako inflate (from Nodeca project)"};function G(e){return G="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},G(e)}var X=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},W=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var i=t.shift();if(i){if("object"!==G(i))throw new TypeError(i+"must be non-object");for(var n in i)X(i,n)&&(e[n]=i[n])}}return e},q=function(e){for(var t=0,i=0,n=e.length;i<n;i++)t+=e[i].length;for(var a=new Uint8Array(t),r=0,o=0,s=e.length;r<s;r++){var l=e[r];a.set(l,o),o+=l.length}return a},J=!0;try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){J=!1}for(var Q=new Uint8Array(256),V=0;V<256;V++)Q[V]=V>=252?6:V>=248?5:V>=240?4:V>=224?3:V>=192?2:1;Q[254]=Q[254]=1;var $=function(e){if("function"==typeof TextEncoder&&TextEncoder.prototype.encode)return(new TextEncoder).encode(e);var t,i,n,a,r,o=e.length,s=0;for(a=0;a<o;a++)55296==(64512&(i=e.charCodeAt(a)))&&a+1<o&&56320==(64512&(n=e.charCodeAt(a+1)))&&(i=65536+(i-55296<<10)+(n-56320),a++),s+=i<128?1:i<2048?2:i<65536?3:4;for(t=new Uint8Array(s),r=0,a=0;r<s;a++)55296==(64512&(i=e.charCodeAt(a)))&&a+1<o&&56320==(64512&(n=e.charCodeAt(a+1)))&&(i=65536+(i-55296<<10)+(n-56320),a++),i<128?t[r++]=i:i<2048?(t[r++]=192|i>>>6,t[r++]=128|63&i):i<65536?(t[r++]=224|i>>>12,t[r++]=128|i>>>6&63,t[r++]=128|63&i):(t[r++]=240|i>>>18,t[r++]=128|i>>>12&63,t[r++]=128|i>>>6&63,t[r++]=128|63&i);return t},ee=function(e,t){var i,n,a=t||e.length;if("function"==typeof TextDecoder&&TextDecoder.prototype.decode)return(new TextDecoder).decode(e.subarray(0,t));var r=new Array(2*a);for(n=0,i=0;i<a;){var o=e[i++];if(o<128)r[n++]=o;else{var s=Q[o];if(s>4)r[n++]=65533,i+=s-1;else{for(o&=2===s?31:3===s?15:7;s>1&&i<a;)o=o<<6|63&e[i++],s--;s>1?r[n++]=65533:o<65536?r[n++]=o:(o-=65536,r[n++]=55296|o>>10&1023,r[n++]=56320|1023&o)}}}return function(e,t){if(t<65534&&e.subarray&&J)return String.fromCharCode.apply(null,e.length===t?e:e.subarray(0,t));for(var i="",n=0;n<t;n++)i+=String.fromCharCode(e[n]);return i}(r,n)},te=function(e,t){(t=t||e.length)>e.length&&(t=e.length);for(var i=t-1;i>=0&&128==(192&e[i]);)i--;return i<0||0===i?t:i+Q[e[i]]>t?i:t},ie={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"};var ne=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0};var ae=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1},re=Object.prototype.toString,oe=c.Z_NO_FLUSH,se=c.Z_FINISH,le=c.Z_OK,fe=c.Z_STREAM_END,de=c.Z_NEED_DICT,he=c.Z_STREAM_ERROR,ce=c.Z_DATA_ERROR,ue=c.Z_MEM_ERROR;function we(e){this.options=W({chunkSize:65536,windowBits:15,to:""},e||{});var t=this.options;t.raw&&t.windowBits>=0&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(t.windowBits>=0&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),t.windowBits>15&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new ne,this.strm.avail_out=0;var i=Y.inflateInit2(this.strm,t.windowBits);if(i!==le)throw new Error(ie[i]);if(this.header=new ae,Y.inflateGetHeader(this.strm,this.header),t.dictionary&&("string"==typeof t.dictionary?t.dictionary=$(t.dictionary):"[object ArrayBuffer]"===re.call(t.dictionary)&&(t.dictionary=new Uint8Array(t.dictionary)),t.raw&&(i=Y.inflateSetDictionary(this.strm,t.dictionary))!==le))throw new Error(ie[i])}function be(e,t){var i=new we(t);if(i.push(e),i.err)throw i.msg||ie[i.err];return i.result}we.prototype.push=function(e,t){var i,n,a,r=this.strm,o=this.options.chunkSize,s=this.options.dictionary;if(this.ended)return!1;for(n=t===~~t?t:!0===t?se:oe,"[object ArrayBuffer]"===re.call(e)?r.input=new Uint8Array(e):r.input=e,r.next_in=0,r.avail_in=r.input.length;;){for(0===r.avail_out&&(r.output=new Uint8Array(o),r.next_out=0,r.avail_out=o),(i=Y.inflate(r,n))===de&&s&&((i=Y.inflateSetDictionary(r,s))===le?i=Y.inflate(r,n):i===ce&&(i=de));r.avail_in>0&&i===fe&&r.state.wrap>0&&0!==e[r.next_in];)Y.inflateReset(r),i=Y.inflate(r,n);switch(i){case he:case ce:case de:case ue:return this.onEnd(i),this.ended=!0,!1}if(a=r.avail_out,r.next_out&&(0===r.avail_out||i===fe))if("string"===this.options.to){var l=te(r.output,r.next_out),f=r.next_out-l,d=ee(r.output,l);r.next_out=f,r.avail_out=o-f,f&&r.output.set(r.output.subarray(l,l+f),0),this.onData(d)}else this.onData(r.output.length===r.next_out?r.output:r.output.subarray(0,r.next_out));if(i!==le||0!==a){if(i===fe)return i=Y.inflateEnd(this.strm),this.onEnd(i),this.ended=!0,!0;if(0===r.avail_in)break}}return!0},we.prototype.onData=function(e){this.chunks.push(e)},we.prototype.onEnd=function(e){e===le&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=q(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg};var me=we,ke=be,_e=function(e,t){return(t=t||{}).raw=!0,be(e,t)},ve=be,ge=c,pe={Inflate:me,inflate:ke,inflateRaw:_e,ungzip:ve,constants:ge};e.Inflate=me,e.constants=ge,e.default=pe,e.inflate=ke,e.inflateRaw=_e,e.ungzip=ve,Object.defineProperty(e,"__esModule",{value:!0})}));
addEventListener("message", function(o) { try { postMessage({ status: "success", data: pako.inflate(o.data, { to: "arraybuffer" }) }); } catch(ex) { logger.error(ex); postMessage({ status: "error" }); } });
postMessage({ status: "ready" });";
+			if(soSupported) {
+				theWorkerObj = new Worker(URL.createObjectURL(new Blob([base64js.toByteArray(workerSrc).buffer], { type: "text/javascript" })));
+			}else {
+				theWorkerObj = new Worker("data:text/javascript;base64," + workerSrc);
+			}
+			theWorkerObj.addEventListener("message", function(evt) {
+				if(evt.data.status === "ready") {
+					decodeBase64URL(window.eaglercraftXClientBundle, function(cbData) {
+						if(cbData) {
+							theWorkerObj.postMessage(cbData);
+						}else {
+							alert("Failed to decode eaglercraftXClientBundle base64!");
+						}
+					});
+				}else if(evt.data.status === "success") {
+					if(soSupported) {
+						window.clientScriptSrcURL = URL.createObjectURL(new Blob([evt.data.data.buffer], { type: "text/javascript;charset=utf-8" }));
+					}else {
+						window.clientScriptSrcURL = "data:text/javascript;charset=utf-8;base64," + base64js.fromByteArray(evt.data.data);
+					}
+				}else {
+					alert("Failed to decompress classes.js via legacy javascript implementation!");
+				}
+			});
+			theWorkerObj.addEventListener("error", function(evt) {
+				console.error(evt.error);
+			});
+		});
+	}else {
+		var ds = new window.DecompressionStream("gzip");
+		var result = [];
+		var fetchStream = function(reader) {
+			var processData;
+			reader.read().then(processData = function(evt) {
+				if (evt.done) {
+					(function(blobObj){
+						checkSameOriginSupport(function(supported) {
+							if(supported) {
+								window.clientScriptSrcURL = URL.createObjectURL(blobObj);
+							}else {
+								blobToArrayBuffer(blobObj, function(arr) {
+									console.log(arr);
+									window.clientScriptSrcURL = "data:text/javascript;charset=utf-8;base64," + base64js.fromByteArray(new Uint8Array(arr));
+								});
+							}
+						});
+					})(new Blob(result, { type: "text/javascript;charset=utf-8" }));
+					result = [];
+					ds = null;
+					return;
+				}
+				result.push(evt.value);
+				return reader.read().then(processData);
+			});
+		};
+		decodeBase64URL(window.eaglercraftXClientBundle, function(cbData) {
+			if(cbData) {
+				fetchStream((new Blob([cbData])).stream().pipeThrough(ds).getReader());
+			}else {
+				alert("Failed to decode eaglercraftXClientBundle base64!");
 			}
-			result.push(value);
-			return reader.read().then(processData);
 		});
 	}
-	fetchB64PayloadSafe().then((blob) => fetchStream(blob.stream().pipeThrough(ds).getReader()));
 })();
 </script>
 <script type="text/javascript">
@@ -89,13 +208,15 @@ window.eaglercraftXOptsHints = {
 	var launchCounter = 1;
 	var launchCountdownNumberElement = null;
 	var launchCountdownProgressElement = null;
-	function launchTick() {
-		if(launchCounter > 100) {
+	var launchSkipCountdown = false;
+	var launchTick = function() {
+		if(launchCounter > 100 || launchSkipCountdown) {
 			if(window.clientScriptSrcURL) {
 				clearInterval(launchInterval);
-				setTimeout(() => {
-					document.getElementById("launch_countdown_screen").remove();
-					const script = document.createElement("script");
+				setTimeout(function() {
+					document.body.removeChild(document.getElementById("launch_countdown_screen"));
+					document.body.style.backgroundColor = "black";
+					var script = document.createElement("script");
 					script.type = "text/javascript";
 					script.src = window.clientScriptSrcURL;
 					window.clientScriptSrcURL = null;
@@ -104,25 +225,39 @@ window.eaglercraftXOptsHints = {
 			}
 			return;
 		}
-		launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
+		if(launchCounter === 100) {
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+		}else {
+			launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
+		}
 		launchCountdownProgressElement.style.width = "" + launchCounter + "%";
 		++launchCounter;
-	}
-	window.addEventListener("load", () => {
+	};
+	window.addEventListener("load", function() {
 		launchCountdownNumberElement = document.getElementById("launchCountdownNumber");
 		launchCountdownProgressElement = document.getElementById("launchCountdownProgress");
 		launchInterval = setInterval(launchTick, 50);
+		document.getElementById("skipCountdown").addEventListener("click", function() {
+			launchSkipCountdown = true;
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+		});
+		document.getElementById("bootMenu").addEventListener("click", function() {
+			launchSkipCountdown = true;
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+			window.eaglercraftXOptsHints.showBootMenuOnLaunch = true;
+		});
 	});
 })();
 </script>
 <link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
 </head>
-<body style="margin:0px;width:100vw;height:100vh;overflow:hidden;" id="game_frame">
+<body style="margin:0px;width:100%;height:100%;overflow:hidden;background-color:white;" id="game_frame">
 <div style="margin:0px;width:100%;height:100%;font-family:sans-serif;display:flex;align-items:center;user-select:none;" id="launch_countdown_screen">
 <div style="margin:auto;text-align:center;">
 <h1>This file is from <span style="color:#AA0000;">${date}</span></h1>
-<h2>Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
-<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div></div>
+<h2 id="gameWillLaunchIn">Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
+<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div>
+<p style="margin-top:30px;"><button id="skipCountdown" autofocus>Skip Countdown</button>&emsp;<button id="bootMenu">Enter Boot Menu</button></p></div>
 </div>
 </div>
 </body>
diff --git a/desktopRuntime/resources/assets/eagler/CREDITS.txt b/desktopRuntime/resources/assets/eagler/CREDITS.txt
index b118f61..943a638 100755
--- a/desktopRuntime/resources/assets/eagler/CREDITS.txt
+++ b/desktopRuntime/resources/assets/eagler/CREDITS.txt
@@ -3,24 +3,26 @@
  ~~~~~~~~~~~~~~~~~~~~~~~
 
  lax1dude:
- 
+
   - Creator of Eaglercraft
   - Ported the Minecraft 1.8 src to TeaVM
   - Wrote HW accelerated OpenGL 1.3 emulator
   - Wrote the default shader pack
   - Made the integrated PBR resource pack
+  - Added touch and mobile device support
   - Wrote all desktop emulation code
   - Wrote EaglercraftXBungee
   - Wrote EaglercraftXVelocity
   - Wrote WebRTC relay server
   - Wrote voice chat server
   - Wrote the patch and build system
- 
+
  ayunami2000:
- 
+
   - Many bug fixes
   - WebRTC LAN worlds
   - WebRTC voice chat
+  - Worked on touch support
   - Made velocity plugin work
   - Added resource packs
   - Added screen recording
@@ -410,7 +412,7 @@
  Project Author: The Legion of the Bouncy Castle
  Project URL: https://www.bouncycastle.org/java.html
  
- Used For: MD5, SHA-1, SHA-256 implementations
+ Used For: MD5, SHA-1, SHA-256, and AES implementations
  
  * Copyright (c) 2000-2021 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
  *
@@ -668,23 +670,23 @@
  Project Author: ymnk, JCraft Inc.
  Project URL: http://www.jcraft.com/jorbis/
  
- Used For: Audio in desktop runtime
+ Used For: Audio in desktop runtime and browsers that don't support OGG
  
  * JOrbis
  * Copyright (C) 2000 ymnk, JCraft,Inc.
- *  
+ * 
  * Written by: 2000 ymnk<ymnk@jcraft.com>
  *   
  * Many thanks to 
  *   Monty <monty@xiph.org> and 
  *   The XIPHOPHORUS Company http://www.xiph.org/ .
  * JOrbis has been based on their awesome works, Vorbis codec.
- *   
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public License
  * as published by the Free Software Foundation; either version 2 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
@@ -696,6 +698,44 @@
  
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
+ Project Name: NanoHTTPD
+ Project Author: NanoHTTPD 
+ Project URL: http://nanohttpd.org/
+ 
+ Used For: HTTP server in the desktop runtime
+ 
+ * Copyright (c) 2012-2013 by Paul S. Hawke,
+ * 2001,2005-2013 by Jarno Elonen,
+ * 2010 by Konstantinos Togias All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the NanoHttpd organization nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
  Project Name: sqlite-jdbc
  Project Author: Taro L. Saito (xerial)
  Project URL: https://github.com/xerial/sqlite-jdbc
diff --git a/desktopRuntime/resources/assets/eagler/audioctx_test_ogg.dat b/desktopRuntime/resources/assets/eagler/audioctx_test_ogg.dat
new file mode 100755
index 0000000..ff379a7
Binary files /dev/null and b/desktopRuntime/resources/assets/eagler/audioctx_test_ogg.dat differ
diff --git a/desktopRuntime/resources/assets/eagler/audioctx_test_wav16.dat b/desktopRuntime/resources/assets/eagler/audioctx_test_wav16.dat
new file mode 100755
index 0000000..cfa8ce9
Binary files /dev/null and b/desktopRuntime/resources/assets/eagler/audioctx_test_wav16.dat differ
diff --git a/desktopRuntime/resources/assets/eagler/audioctx_test_wav32f.dat b/desktopRuntime/resources/assets/eagler/audioctx_test_wav32f.dat
new file mode 100755
index 0000000..13ed4a8
Binary files /dev/null and b/desktopRuntime/resources/assets/eagler/audioctx_test_wav32f.dat differ
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/boot_menu_markup.html b/desktopRuntime/resources/assets/eagler/boot_menu/boot_menu_markup.html
new file mode 100755
index 0000000..3d386a1
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/boot_menu_markup.html
@@ -0,0 +1,88 @@
+<style type="text/css" style="display:none !important;">{% embed eval `boot_menu_style.css` %}</style>
+<div class="_eaglercraftX_boot_menu {% global `root_class_gen` %}">
+	<div class="_eaglercraftX_boot_menu_inner">
+		<div class="_eaglercraftX_boot_menu_header">
+			<p class="_eaglercraftX_boot_menu_header_title">EaglercraftX 1.8 Boot Manager</p>
+		</div>
+		<div class="_eaglercraftX_boot_menu_content">
+			<div class="_eaglercraftX_boot_menu_content_inner">
+				<div class="_eaglercraftX_boot_menu_content_view_selection" style="display:none;">
+					<div class="_eaglercraftX_boot_menu_content_selection"></div>
+				</div>
+				<div class="_eaglercraftX_boot_menu_content_view_editor" style="display:none;">
+					<div class="_eaglercraftX_boot_menu_launch_conf">
+						<div class="_eaglercraftX_boot_menu_launch_conf_inner">
+							<div class="_eaglercraftX_boot_menu_launch_conf_item_wide" style="padding: 20px;">
+								<p>Profile Name: <input type="text" class="_eaglercraftX_boot_menu_launch_conf_val_profile_name"></p>
+							</div>
+							<div class="_eaglercraftX_boot_menu_launch_conf_item_wide">
+								<div class="_eaglercraftX_boot_menu_launch_conf_item _eaglercraftX_boot_menu_launch_conf_data_format">
+									<p>Data Format: <span class="_eaglercraftX_boot_menu_launch_conf_val_data_format">Standard Offline</span></p>
+								</div>
+								<div class="_eaglercraftX_boot_menu_launch_conf_item _eaglercraftX_boot_menu_launch_conf_launch_type">
+									<p>Launch Type:
+										<select class="_eaglercraftX_boot_menu_launch_conf_val_launch_type">
+											<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="EAGLERX_SIGNED_V1">EaglercraftX Signed Client</option>
+											<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="EAGLERX_V1">EaglercraftX Standard Offline</option>
+											<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="EAGLER_1_5_V2">Eaglercraft 1.5 (post-22w34a)</option>
+											<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="EAGLER_1_5_V1">Eaglercraft 1.5 (pre-22w34a)</option>
+											<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="EAGLER_BETA_V1">Eaglercraft Beta 1.3</option>
+											<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="PEYTON_V1">PeytonPlayz585 Indev</option>
+											<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="PEYTON_V2">PeytonPlayz585 Alpha/Beta</option>
+											<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="STANDARD_OFFLINE_V1">Standard Offline</option>
+											<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="IFRAME_SANDBOX_V1">IFrame HTML File</option>
+										</select>
+									</p>
+								</div>
+								<div class="_eaglercraftX_boot_menu_launch_conf_item _eaglercraftX_boot_menu_launch_conf_join_server" style="display:none;">
+									<p>Join Server: <input type="text" class="_eaglercraftX_boot_menu_launch_conf_val_join_server"></p>
+								</div>
+								<div class="_eaglercraftX_boot_menu_launch_conf_item _eaglercraftX_boot_menu_launch_conf_opts_name" style="display:none;">
+									<p>Opt Variable Name: <input type="text" class="_eaglercraftX_boot_menu_launch_conf_val_opts_name"></p>
+								</div>
+								<div class="_eaglercraftX_boot_menu_launch_conf_item _eaglercraftX_boot_menu_launch_conf_assetsURI" style="display:none;">
+									<p>Assets URI Opt: <input type="text" class="_eaglercraftX_boot_menu_launch_conf_val_assetsURI"></p>
+								</div>
+								<div class="_eaglercraftX_boot_menu_launch_conf_item _eaglercraftX_boot_menu_launch_conf_container" style="display:none;">
+									<p>Container ID Opt: <input type="text" class="_eaglercraftX_boot_menu_launch_conf_val_container"></p>
+								</div>
+								<div class="_eaglercraftX_boot_menu_launch_conf_item _eaglercraftX_boot_menu_launch_conf_main_func" style="display:none;">
+									<p>Main function: <input type="text" class="_eaglercraftX_boot_menu_launch_conf_val_main_func"></p>
+								</div>
+								<div class="_eaglercraftX_boot_menu_launch_conf_item _eaglercraftX_boot_menu_launch_conf_clear_cookies">
+									<p>Clear Cookies Before Launch: <input type="checkbox" class="_eaglercraftX_boot_menu_launch_conf_val_clear_cookies"></p>
+								</div>
+							</div>
+						</div>
+					</div>
+					<textarea class="_eaglercraftX_boot_menu_launch_opt_editor" spellcheck="false"></textarea>
+				</div>
+				<div class="_eaglercraftX_boot_menu_popup" style="display:none;">
+					<div class="_eaglercraftX_boot_menu_popup_inner">
+						<div class="_eaglercraftX_boot_menu_popup_view_confirm" style="display:none;">
+							<p class="_eaglercraftX_boot_menu_popup_confirm_title"></p>
+							<p class="_eaglercraftX_boot_menu_popup_confirm_opts"></p>
+						</div>
+						<div class="_eaglercraftX_boot_menu_popup_view_selection" style="display:none;">
+							<p class="_eaglercraftX_boot_menu_popup_selection_title"></p>
+							<div class="_eaglercraftX_boot_menu_popup_selection"></div>
+						</div>
+						<div class="_eaglercraftX_boot_menu_popup_view_input" style="display:none;">
+							<p class="_eaglercraftX_boot_menu_popup_input_title"></p>
+							<p class="_eaglercraftX_boot_menu_popup_input_val_container"><input class="_eaglercraftX_boot_menu_popup_input_val" type="text"></p>
+							<p class="_eaglercraftX_boot_menu_popup_input_opts"><span class="_eaglercraftX_boot_menu_popup_input_opt _eaglercraftX_boot_menu_popup_input_opt_cancel">&nbsp;&lt;&nbsp;Cancel&nbsp;&gt;&nbsp;</span> &emsp; <span class="_eaglercraftX_boot_menu_popup_input_opt _eaglercraftX_boot_menu_popup_input_opt_done _eaglercraftX_boot_menu_popup_input_opt_selected">&nbsp;&lt;&nbsp;Done&nbsp;&gt;&nbsp;</span></p>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="_eaglercraftX_boot_menu_footer">
+			<p class="_eaglercraftX_boot_menu_footer_text _eaglercraftX_boot_menu_footer_text_boot_select" style="display:none;">Use the &uarr; and &darr; keys to select which entry is highlighted.<br>Press enter to boot the selected client, `e' to edit eaglercraft opts before booting, or ESC to exit and boot normally.</p>
+			<p class="_eaglercraftX_boot_menu_footer_text _eaglercraftX_boot_menu_footer_text_boot_select_count" style="display:none;">Use the &uarr; and &darr; keys to select which entry is highlighted.<br>Press enter to boot the selected client, `e' to edit eaglercraft opts before booting.<br>The first option will be executed in <span class="_eaglercraftX_boot_menu_footer_text_boot_countdown">0</span> seconds. Press any key to cancel.</p>
+			<p class="_eaglercraftX_boot_menu_footer_text _eaglercraftX_boot_menu_footer_text_menu_select" style="display:none;">Use the &uarr; and &darr; keys to select which entry is highlighted.<br>Press enter to select, or ESC return to the previous screen.</p>
+			<p class="_eaglercraftX_boot_menu_footer_text _eaglercraftX_boot_menu_footer_text_opts_editor" style="display:none;">Press CTRL+SHIFT to open editor menu.<br>Press CTRL+ENTER to boot, or ESC return to the previous menu.</p>
+			<p class="_eaglercraftX_boot_menu_footer_text _eaglercraftX_boot_menu_footer_text_opts_editor_alt" style="display:none;">Press CTRL+SHIFT to open editor menu.<br>Press CTRL+ENTER to save, or ESC return to the previous menu.</p>
+			<p class="_eaglercraftX_boot_menu_footer_text _eaglercraftX_boot_menu_footer_text_boot_order" style="display:none;">Use the &uarr; and &darr; keys to select which entry is highlighted.<br>Press CTRL+&uarr; and CTRL+&darr; to adjust item order, or ESC to cancel.</p>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/boot_menu_style.css b/desktopRuntime/resources/assets/eagler/boot_menu/boot_menu_style.css
new file mode 100755
index 0000000..edac9eb
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/boot_menu_style.css
@@ -0,0 +1,328 @@
+@font-face {
+	font-family: "{% global `root_class_gen` %}_font0";
+	src: url("data:font/woff;base64,{% embed base64 `web_cl_eagleiii_8x16.woff` %}") format("woff");
+}
+.{% global `root_class_gen` %} {
+	font: 24px "{% global `root_class_gen` %}_font0";
+	color: #CCCCCC;
+	background-color: #000000;
+	user-select: none;
+	width: 100%;
+	height: 100%;
+	overflow-y: auto;
+}
+.{% global `root_class_gen` %}::-moz-selection {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %}::selection {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %}::-webkit-scrollbar {
+	width: 12px;
+}
+.{% global `root_class_gen` %} ::-webkit-scrollbar {
+	width: 12px;
+}
+.{% global `root_class_gen` %}::-webkit-scrollbar-track, .{% global `root_class_gen` %} ::-webkit-scrollbar-track {
+	background-color: #000000;
+}
+.{% global `root_class_gen` %}::-webkit-scrollbar-thumb, .{% global `root_class_gen` %} ::-webkit-scrollbar-thumb {
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %}::-webkit-scrollbar-button, .{% global `root_class_gen` %} ::-webkit-scrollbar-button {
+	display: none;
+}
+.{% global `root_class_gen` %}::-webkit-scrollbar-corner, .{% global `root_class_gen` %} ::-webkit-scrollbar-corner {
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_inner {
+	width: 100%;
+	height: 100%;
+	min-height: 480px;
+	display: flex;
+	flex-flow: column;
+}
+.{% global `root_class_gen` %} p {
+	margin-block-start: 0px;
+	margin-block-end: 0px;
+	-webkit-margin-before:0px;
+	-webkit-margin-after:0px;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_header {
+	flex: 0 1 auto;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_header_title {
+	text-align: center;
+	padding: 32px 0px 0px 0px;
+	color: #CCCCCC;
+	white-space: pre-wrap;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_content {
+	flex: 1 1 auto;
+	position: relative;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_content_inner {
+	position: absolute;
+	top: 32px;
+	left: 32px;
+	bottom: 32px;
+	right: 32px;
+	border: 2px solid white;
+	z-index: 1;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup {
+	position: absolute;
+	top: 128px;
+	left: 64px;
+	bottom: 64px;
+	right: 64px;
+	z-index: 10;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_inner {
+	width: 50%;
+	min-width: min(calc(100% - 20px), 400px);
+	max-width: 800px;
+	max-height: calc(100% - 20px);
+	margin-left: auto;
+	margin-right: auto;
+	border: 2px solid white;
+	background-color: #000000;
+	padding: 10px;
+	overflow-y: auto;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_confirm_title {
+	text-align: center;
+	padding: 16px;
+	color: #CCCCCC;
+	white-space: pre-wrap;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_confirm_opts {
+	text-align: center;
+	padding: 16px;
+	color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_confirm_opt {
+	cursor: pointer;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_confirm_opt_selected {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_confirm_opt_disabled {
+	color: #888888;
+	cursor: default;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_selection_title {
+	text-align: center;
+	padding: 16px;
+	color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_selection {
+	width: calc(100% - 8px);
+	padding: 8px 4px;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_input_title {
+	text-align: center;
+	padding: 16px;
+	color: #CCCCCC;
+	white-space: pre-wrap;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_input_opts {
+	text-align: center;
+	padding: 16px;
+	color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_input_opt {
+	cursor: pointer;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_input_opt_selected {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_input_opt_disabled {
+	color: #888888;
+	cursor: default;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_input_val_container {
+	text-align: center;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_input_val {
+	min-width: 15em;
+	width: calc(90% - 50px);
+	font: 24px "{% global `root_class_gen` %}_font0";
+	outline: none;
+	resize: none;
+	background-color: #000000;
+	color: #CCCCCC;
+	border: 2px solid white;
+	padding: 2px 4px;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_input_val:disabled {
+	color: #888888;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_input_val::-moz-selection {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_popup_input_val::selection {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_content_view_selection {
+	width: 100%;
+	height: 100%;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_content_selection {
+	width: calc(100% - 8px);
+	height: calc(100% - 16px);
+	padding: 8px 4px;
+	overflow-y: auto;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_content_item {
+	width: 100%;
+	overflow-y: auto;
+	cursor: pointer;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_content_item::before {
+	content: "\00a0";
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_content_item_selected {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_content_item_selected::before {
+	content: "*";
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_content_item_disabled {
+	color: #888888;
+	cursor: default;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_content_view_editor {
+	width: 100%;
+	height: 100%;
+	position: relative;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf {
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	height: calc(25% - 20px);
+	padding: 10px;
+	overflow-x: hidden;
+	overflow-y: auto;
+	color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_item_wide {
+	width: 100%;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_item {
+	display: inline-block;
+	padding: 20px;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_item input[type=text] {
+	min-width: 15em;
+	font: 24px "{% global `root_class_gen` %}_font0";
+	outline: none;
+	resize: none;
+	background-color: #000000;
+	color: #CCCCCC;
+	border: 2px solid white;
+	padding: 2px 4px;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_item input[type=text]:disabled {
+	color: #888888;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_item input[type=checkbox] {
+	zoom: 2;
+	padding: 2px 4px;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_item select {
+	font: 24px "{% global `root_class_gen` %}_font0";
+	outline: none;
+	resize: none;
+	background-color: #000000;
+	color: #CCCCCC;
+	border: 2px solid white;
+	padding: 2px 4px;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_item option:checked {
+	background-color: #CCCCCC;
+	color: #000000;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_item option:disabled {
+	color: #888888;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_item input::-moz-selection {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_item input::selection {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_val_profile_name {
+	width: calc(100% - 10em);
+	font: 24px "{% global `root_class_gen` %}_font0";
+	outline: none;
+	resize: none;
+	background-color: #000000;
+	color: #CCCCCC;
+	border: 2px solid white;
+	padding: 2px 4px;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_val_profile_name::-moz-selection {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_val_profile_name::selection {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_val_profile_name:disabled {
+	color: #888888;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_conf_val_data_format {
+	padding: 2px 4px;
+	border: 2px solid white;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_opt_editor {
+	position: absolute;
+	bottom: 0px;
+	left: 0px;
+	right: 0px;
+	height: calc(75% - 22px);
+	width: calc(100% - 20px);
+	margin: 0px;
+	padding: 10px;
+	font: 24px "{% global `root_class_gen` %}_font0";
+	border: none;
+	border-top: 2px solid white;
+	outline: none;
+	resize: none;
+	background-color: #000000;
+	color: #CCCCCC;
+	overflow: auto;
+	tab-size: 4;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_opt_editor:disabled {
+	color: #888888;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_opt_editor::-moz-selection {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_launch_opt_editor::selection {
+	color: #000000;
+	background-color: #CCCCCC;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_footer {
+	flex: 0 1 auto;
+}
+.{% global `root_class_gen` %} ._eaglercraftX_boot_menu_footer_text {
+	text-align: left;
+	padding: 0px 0px 32px 64px;
+	color: #CCCCCC;
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraftX_1_8.json b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraftX_1_8.json
new file mode 100755
index 0000000..43c867c
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraftX_1_8.json
@@ -0,0 +1,4 @@
+{
+	"client_launch_type": "EAGLERX_V1",
+	"clear_cookies_before_launch": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraftX_1_8_signed.json b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraftX_1_8_signed.json
new file mode 100755
index 0000000..c7d4046
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraftX_1_8_signed.json
@@ -0,0 +1,4 @@
+{
+	"client_launch_type": "EAGLERX_SIGNED_V1",
+	"clear_cookies_before_launch": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraft_1_5.json b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraft_1_5.json
new file mode 100755
index 0000000..a579c7b
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraft_1_5.json
@@ -0,0 +1,4 @@
+{
+	"client_launch_type": "EAGLER_1_5_V2",
+	"clear_cookies_before_launch": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraft_1_5_legacy.json b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraft_1_5_legacy.json
new file mode 100755
index 0000000..551d0fd
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraft_1_5_legacy.json
@@ -0,0 +1,5 @@
+{
+	"client_launch_type": "EAGLER_1_5_V1",
+	"join_server": "",
+	"clear_cookies_before_launch": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraft_b1_3.json b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraft_b1_3.json
new file mode 100755
index 0000000..57ec0c8
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_eaglercraft_b1_3.json
@@ -0,0 +1,5 @@
+{
+	"client_launch_type": "EAGLER_BETA_V1",
+	"join_server": "",
+	"clear_cookies_before_launch": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_peytonplayz585_a1_2_6.json b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_peytonplayz585_a1_2_6.json
new file mode 100755
index 0000000..b3e0531
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_peytonplayz585_a1_2_6.json
@@ -0,0 +1,4 @@
+{
+	"client_launch_type": "PEYTON_V2",
+	"clear_cookies_before_launch": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_peytonplayz585_b1_7_3.json b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_peytonplayz585_b1_7_3.json
new file mode 100755
index 0000000..b3e0531
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_peytonplayz585_b1_7_3.json
@@ -0,0 +1,4 @@
+{
+	"client_launch_type": "PEYTON_V2",
+	"clear_cookies_before_launch": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_peytonplayz585_indev.json b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_peytonplayz585_indev.json
new file mode 100755
index 0000000..53ee5e5
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_peytonplayz585_indev.json
@@ -0,0 +1,4 @@
+{
+	"client_launch_type": "PEYTON_V1",
+	"clear_cookies_before_launch": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_standard_offline.json b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_standard_offline.json
new file mode 100755
index 0000000..ad974b0
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/conf_template_standard_offline.json
@@ -0,0 +1,8 @@
+{
+	"client_launch_type": "STANDARD_OFFLINE_V1",
+	"client_launch_opts_var": "eaglercraftXOpts",
+	"client_launch_opts_assetsURI_var": "assetsURI",
+	"client_launch_opts_container_var": "container",
+	"client_launch_main_func": "main",
+	"clear_cookies_before_launch": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/meta_opts_templates.json b/desktopRuntime/resources/assets/eagler/boot_menu/meta_opts_templates.json
new file mode 100755
index 0000000..6b13e26
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/meta_opts_templates.json
@@ -0,0 +1,192 @@
+{
+	"defaults": {
+		"EAGLERX_SIGNED_V1": {
+			"conf": "conf_template_eaglercraftX_1_8_signed.json",
+			"opts": "opts_template_eaglercraftX_1_8.txt"
+		},
+		"EAGLERX_V1": {
+			"conf": "conf_template_eaglercraftX_1_8.json",
+			"opts": "opts_template_eaglercraftX_1_8.txt"
+		},
+		"EAGLER_BETA_V1": {
+			"conf": "conf_template_eaglercraft_b1_3.json",
+			"opts": null
+		},
+		"EAGLER_1_5_V1": {
+			"conf": "conf_template_eaglercraft_1_5_legacy.json",
+			"opts": "opts_template_eaglercraft_1_5_legacy.txt"
+		},
+		"EAGLER_1_5_V2": {
+			"conf": "conf_template_eaglercraft_1_5.json",
+			"opts": "opts_template_eaglercraft_1_5.txt"
+		},
+		"PEYTON_V1": {
+			"conf": "conf_template_peytonplayz585_indev.json",
+			"opts": null
+		},
+		"PEYTON_V2": {
+			"conf": "conf_template_peytonplayz585_a1_2_6.json",
+			"opts": "opts_template_peytonplayz585_a1_2_6.txt"
+		},
+		"STANDARD_OFFLINE_V1": {
+			"conf": "conf_template_standard_offline.json",
+			"opts": null
+		}
+	},
+	"templates": [
+		{
+			"name": "EaglercraftX 1.8",
+			"conf": "conf_template_eaglercraftX_1_8.json",
+			"opts": "opts_template_eaglercraftX_1_8.txt",
+			"allow": [
+				"EAGLER_STANDARD_OFFLINE"
+			],
+			"parseTypes": [
+				"EAGLERCRAFTX_1_8_OFFLINE"
+			]
+		},
+		{
+			"name": "EaglercraftX 1.8 Demo",
+			"conf": "conf_template_eaglercraftX_1_8.json",
+			"opts": "opts_template_eaglercraftX_1_8_demo.txt",
+			"allow": [
+				"EAGLER_STANDARD_OFFLINE"
+			],
+			"parseTypes": [
+				"EAGLERCRAFTX_1_8_OFFLINE"
+			]
+		},
+		{
+			"name": "EaglercraftX 1.8 HTML5 Cursors",
+			"conf": "conf_template_eaglercraftX_1_8.json",
+			"opts": "opts_template_eaglercraftX_1_8_html5Cursors.txt",
+			"allow": [
+				"EAGLER_STANDARD_OFFLINE"
+			],
+			"parseTypes": [
+				"EAGLERCRAFTX_1_8_OFFLINE"
+			]
+		},
+		{
+			"name": "EaglercraftX 1.8 Signed",
+			"conf": "conf_template_eaglercraftX_1_8_signed.json",
+			"opts": "opts_template_eaglercraftX_1_8.txt",
+			"allow": [
+				"EAGLER_SIGNED_OFFLINE"
+			],
+			"parseTypes": [
+				"EAGLERCRAFTX_1_8_SIGNED"
+			]
+		},
+		{
+			"name": "EaglercraftX 1.8 Signed Demo",
+			"conf": "conf_template_eaglercraftX_1_8_signed.json",
+			"opts": "opts_template_eaglercraftX_1_8_demo.txt",
+			"allow": [
+				"EAGLER_SIGNED_OFFLINE"
+			],
+			"parseTypes": [
+				"EAGLERCRAFTX_1_8_SIGNED"
+			]
+		},
+		{
+			"name": "EaglercraftX 1.8 Signed HTML5 Cursors",
+			"conf": "conf_template_eaglercraftX_1_8_signed.json",
+			"opts": "opts_template_eaglercraftX_1_8_html5Cursors.txt",
+			"allow": [
+				"EAGLER_SIGNED_OFFLINE"
+			],
+			"parseTypes": [
+				"EAGLERCRAFTX_1_8_SIGNED"
+			]
+		},
+		{
+			"name": "Eaglercraft 1.5.2 (post-22w34a)",
+			"conf": "conf_template_eaglercraft_1_5.json",
+			"opts": "opts_template_eaglercraft_1_5.txt",
+			"allow": [
+				"EAGLER_STANDARD_1_5_OFFLINE"
+			],
+			"parseTypes": [
+				"EAGLERCRAFT_1_5_NEW_OFFLINE"
+			]
+		},
+		{
+			"name": "Eaglercraft 1.5.2 Live Music (post-22w34a)",
+			"conf": "conf_template_eaglercraft_1_5.json",
+			"opts": "opts_template_eaglercraft_1_5_livestream.txt",
+			"allow": [
+				"EAGLER_STANDARD_1_5_OFFLINE"
+			],
+			"parseTypes": [
+				"EAGLERCRAFT_1_5_NEW_OFFLINE"
+			]
+		},
+		{
+			"name": "Eaglercraft 1.5.2 (pre-22w34a)",
+			"conf": "conf_template_eaglercraft_1_5_legacy.json",
+			"opts": "opts_template_eaglercraft_1_5_legacy.txt",
+			"allow": [
+				"EAGLER_STANDARD_OFFLINE"
+			],
+			"parseTypes": [
+				"EAGLERCRAFT_1_5_OLD_OFFLINE"
+			]
+		},
+		{
+			"name": "Eaglercraft Beta 1.3",
+			"conf": "conf_template_eaglercraft_b1_3.json",
+			"opts": null,
+			"allow": [
+				"EAGLER_STANDARD_OFFLINE"
+			],
+			"parseTypes": [
+				"EAGLERCRAFT_BETA_B1_3_OFFLINE"
+			]
+		},
+		{
+			"name": "PeytonPlayz585 Beta 1.7.3",
+			"conf": "conf_template_peytonplayz585_b1_7_3.json",
+			"opts": "opts_template_peytonplayz585_b1_7_3.txt",
+			"allow": [
+				"EAGLER_STANDARD_OFFLINE"
+			],
+			"parseTypes": [
+				"PEYTONPLAYZ585_ALPHA_BETA"
+			]
+		},
+		{
+			"name": "PeytonPlayz585 Alpha 1.2.6",
+			"conf": "conf_template_peytonplayz585_a1_2_6.json",
+			"opts": "opts_template_peytonplayz585_a1_2_6.txt",
+			"allow": [
+				"EAGLER_STANDARD_OFFLINE"
+			],
+			"parseTypes": [
+				"PEYTONPLAYZ585_ALPHA_BETA"
+			]
+		},
+		{
+			"name": "PeytonPlayz585 Indev",
+			"conf": "conf_template_peytonplayz585_indev.json",
+			"opts": null,
+			"allow": [
+				"EAGLER_STANDARD_OFFLINE"
+			],
+			"parseTypes": [
+				"PEYTONPLAYZ585_INDEV"
+			]
+		},
+		{
+			"name": "Standard Offline Download",
+			"conf": "conf_template_standard_offline.json",
+			"opts": null,
+			"allow": [
+				"EAGLER_STANDARD_OFFLINE"
+			],
+			"parseTypes": [
+				"EXPORTED_STANDARD_OFFLINE"
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8.html b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8.html
new file mode 100755
index 0000000..b8f4d58
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+
+<!--
+
+This file is from ${date}, it was generated using EaglercraftX 1.8 boot manager
+
+-->
+
+<html style="width:100%;height:100%;background-color:black;">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
+<meta name="description" content="${client_name}" />
+<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
+<title>${client_name}</title>
+<meta property="og:locale" content="en-US" />
+<meta property="og:type" content="website" />
+<meta property="og:title" content="${client_name}" />
+<meta property="og:description" content="this file is not a website, whoever uploaded it to this URL is a dumbass" />
+<style type="eaglercraftOfflineParseHint">{"type":"EAGLERCRAFTX_1_8_OFFLINE","launchConf":${launch_conf_json}}</style>
+<script type="text/javascript">
+"use strict";
+var relayIdMax = ${relayId_max};
+var relayId = relayIdMax > 1 ? Math.floor(Math.random() * relayIdMax) : 0;
+
+// %%%%%%%%% launch options %%%%%%%%%%%%
+
+window.eaglercraftXOpts = ${launch_opts};
+
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+</script>
+<script type="text/javascript">
+"use strict";
+if(typeof window !== "undefined") window.eaglercraftXClientScriptElement = document.currentScript;
+
+${classes_js}
+</script>
+<script type="text/javascript">
+"use strict";
+(function(){
+	window.eaglercraftXOpts.container = "game_frame";
+	window.eaglercraftXOpts.assetsURI = ${assets_epk};
+
+	var launchInterval = -1;
+	var launchCounter = 1;
+	var launchCountdownNumberElement = null;
+	var launchCountdownProgressElement = null;
+	var launchSkipCountdown = false;
+
+	var launchTick = function() {
+		launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
+		launchCountdownProgressElement.style.width = "" + launchCounter + "%";
+		if(++launchCounter > 100 || launchSkipCountdown) {
+			clearInterval(launchInterval);
+			setTimeout(function() { document.body.removeChild(document.getElementById("launch_countdown_screen")); document.body.style.backgroundColor = "black"; main(); }, 50);
+		}
+	};
+
+	window.addEventListener("load", function() {
+		launchCountdownNumberElement = document.getElementById("launchCountdownNumber");
+		launchCountdownProgressElement = document.getElementById("launchCountdownProgress");
+		launchInterval = setInterval(launchTick, 50);
+		document.getElementById("skipCountdown").addEventListener("click", function() {
+			launchSkipCountdown = true;
+		});
+		document.getElementById("bootMenu").addEventListener("click", function() {
+			launchSkipCountdown = true;
+			window.eaglercraftXOpts.showBootMenuOnLaunch = true;
+		});
+	});
+})();
+</script>
+<link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
+</head>
+<body style="margin:0px;width:100%;height:100%;overflow:hidden;background-color:white;" id="game_frame">
+<div style="margin:0px;width:100%;height:100%;font-family:sans-serif;display:flex;align-items:center;user-select:none;" id="launch_countdown_screen">
+<div style="margin:auto;text-align:center;">
+<h1>${client_name}</h1>
+<h2>Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
+<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div>
+<p style="margin-top:30px;"><button id="skipCountdown" autofocus>Skip Countdown</button>&emsp;<button id="bootMenu">Enter Boot Menu</button></p></div>
+</div>
+</div>
+</body>
+</html>
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8_fat_offline.html b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8_fat_offline.html
new file mode 100755
index 0000000..b073012
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8_fat_offline.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+
+<!--
+
+This file is from ${date}, it was generated using EaglercraftX 1.8 boot manager
+
+-->
+
+<html style="width:100%;height:100%;background-color:black;">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
+<meta name="description" content="EaglercraftX 1.8" />
+<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
+<title>EaglercraftX 1.8</title>
+<meta property="og:locale" content="en-US" />
+<meta property="og:type" content="website" />
+<meta property="og:title" content="EaglercraftX 1.8" />
+<meta property="og:description" content="this file is not a website, whoever uploaded it to this URL is a dumbass" />
+<style type="eaglercraftOfflineParseHint">{"type":"EAGLERCRAFTX_1_8_FAT_OFFLINE","launchConf":${launch_conf_json}}</style>
+<script type="text/javascript">
+"use strict";
+var relayIdMax = ${relayId_max};
+var relayId = relayIdMax > 1 ? Math.floor(Math.random() * relayIdMax) : 0;
+
+// %%%%%%%%% launch options %%%%%%%%%%%%
+
+window.eaglercraftXOpts = ${launch_opts};
+
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+</script>
+<script type="text/javascript">
+"use strict";
+if(typeof window !== "undefined") window.eaglercraftXClientScriptElement = document.currentScript;
+
+${classes_js}
+</script>
+<script type="text/javascript">
+"use strict";
+(function(){
+	window.eaglercraftXOpts.container = "game_frame";
+	window.eaglercraftXOpts.assetsURI = ${assets_epk};
+	window.eaglercraftXOpts.showBootMenuOnLaunch = true;
+
+	var launchInterval = -1;
+	var launchCounter = 1;
+	var launchCountdownNumberElement = null;
+	var launchCountdownProgressElement = null;
+	var launchSkipCountdown = false;
+
+	var launchTick = function() {
+		launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
+		launchCountdownProgressElement.style.width = "" + launchCounter + "%";
+		if(++launchCounter > 100 || launchSkipCountdown) {
+			clearInterval(launchInterval);
+			setTimeout(function() { document.body.removeChild(document.getElementById("launch_countdown_screen")); document.body.style.backgroundColor = "black"; main(); }, 50);
+		}
+	};
+
+	window.addEventListener("load", function() {
+		launchCountdownNumberElement = document.getElementById("launchCountdownNumber");
+		launchCountdownProgressElement = document.getElementById("launchCountdownProgress");
+		launchInterval = setInterval(launchTick, 50);
+		document.getElementById("skipCountdown").addEventListener("click", function() {
+			launchSkipCountdown = true;
+		});
+	});
+})();
+</script>
+<link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
+${fat_offline_data}
+</head>
+<body style="margin:0px;width:100%;height:100%;overflow:hidden;background-color:white;" id="game_frame">
+<div style="margin:0px;width:100%;height:100%;font-family:sans-serif;display:flex;align-items:center;user-select:none;" id="launch_countdown_screen">
+<div style="margin:auto;text-align:center;">
+<h1>EaglercraftX 1.8 "Fat Offline"</h1>
+<h3>Contains: ${num_clients} Client(s)</h3>
+<h2>Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
+<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div>
+<p style="margin-top:30px;"><button id="skipCountdown" autofocus>Skip Countdown</button></p></div>
+</div>
+</div>
+</body>
+</html>
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8_fat_signed.html b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8_fat_signed.html
new file mode 100755
index 0000000..00bc1b7
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8_fat_signed.html
@@ -0,0 +1,268 @@
+<!DOCTYPE html>
+
+<!--
+
+This file is from ${date}, it was generated using EaglercraftX 1.8 boot manager
+
+-->
+
+<html style="width:100%;height:100%;background-color:black;">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
+<meta name="description" content="EaglercraftX 1.8" />
+<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
+<title>EaglercraftX 1.8</title>
+<meta property="og:locale" content="en-US" />
+<meta property="og:type" content="website" />
+<meta property="og:title" content="EaglercraftX 1.8" />
+<meta property="og:description" content="Play minecraft 1.8 in your browser" />
+<style type="eaglercraftOfflineParseHint">{"type":"EAGLERCRAFTX_1_8_FAT_SIGNED","launchConf":${launch_conf_json}}</style>
+<script type="text/javascript">
+"use strict";
+var relayIdMax = ${relayId_max};
+var relayId = relayIdMax > 1 ? Math.floor(Math.random() * relayIdMax) : 0;
+
+// %%%%%%%%% launch options %%%%%%%%%%%%
+
+window.eaglercraftXOptsHints = ${launch_opts};
+window.eaglercraftXOptsHints.hintsVersion = 1;
+window.eaglercraftXOptsHints.container = "game_frame";
+window.eaglercraftXOptsHints.showBootMenuOnLaunch = true;
+
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+</script>
+<style type="eaglercraft" id="eaglercraftXClientSignature">data:application/octet-stream;base64,${client_signature}</style>
+<style type="eaglercraft" id="eaglercraftXClientBundle">data:application/octet-stream;base64,${client_bundle}</style>
+<script type="text/javascript">
+"use strict";
+(function(){
+	function eaglerBundleUnwrap(tagIn) { var e = document.getElementById(tagIn); var ret = e.innerText; document.head.removeChild(e); return ret;  }
+	window.eaglercraftXClientSignature = eaglerBundleUnwrap("eaglercraftXClientSignature");
+	window.eaglercraftXClientBundle = eaglerBundleUnwrap("eaglercraftXClientBundle");
+})();
+</script>
+<script type="text/javascript">
+"use strict";
+(function(){
+	(function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;b="undefined"==typeof window?"undefined"==typeof global?"undefined"==typeof self?this:self:global:window,b.base64js=a()}})(function(){return function(){function b(d,e,g){function a(j,i){if(!e[j]){if(!d[j]){var f="function"==typeof require&&require;if(!i&&f)return f(j,!0);if(h)return h(j,!0);var c=new Error("Cannot find module '"+j+"'");throw c.code="MODULE_NOT_FOUND",c}var k=e[j]={exports:{}};d[j][0].call(k.exports,function(b){var c=d[j][1][b];return a(c||b)},k,k.exports,b,d,e,g)}return e[j].exports}for(var h="function"==typeof require&&require,c=0;c<g.length;c++)a(g[c]);return a}return b}()({"/":[function(a,b,c){'use strict';function d(a){var b=a.length;if(0<b%4)throw new Error("Invalid string. Length must be a multiple of 4");var c=a.indexOf("=");-1===c&&(c=b);var d=c===b?0:4-c%4;return[c,d]}function e(a,b,c){return 3*(b+c)/4-c}function f(a){var b,c,f=d(a),g=f[0],h=f[1],j=new m(e(a,g,h)),k=0,n=0<h?g-4:g;for(c=0;c<n;c+=4)b=l[a.charCodeAt(c)]<<18|l[a.charCodeAt(c+1)]<<12|l[a.charCodeAt(c+2)]<<6|l[a.charCodeAt(c+3)],j[k++]=255&b>>16,j[k++]=255&b>>8,j[k++]=255&b;return 2===h&&(b=l[a.charCodeAt(c)]<<2|l[a.charCodeAt(c+1)]>>4,j[k++]=255&b),1===h&&(b=l[a.charCodeAt(c)]<<10|l[a.charCodeAt(c+1)]<<4|l[a.charCodeAt(c+2)]>>2,j[k++]=255&b>>8,j[k++]=255&b),j}function g(a){return k[63&a>>18]+k[63&a>>12]+k[63&a>>6]+k[63&a]}function h(a,b,c){for(var d,e=[],f=b;f<c;f+=3)d=(16711680&a[f]<<16)+(65280&a[f+1]<<8)+(255&a[f+2]),e.push(g(d));return e.join("")}function j(a){for(var b,c=a.length,d=c%3,e=[],f=16383,g=0,j=c-d;g<j;g+=f)e.push(h(a,g,g+f>j?j:g+f));return 1===d?(b=a[c-1],e.push(k[b>>2]+k[63&b<<4]+"==")):2===d&&(b=(a[c-2]<<8)+a[c-1],e.push(k[b>>10]+k[63&b>>4]+k[63&b<<2]+"=")),e.join("")}c.byteLength=function(a){var b=d(a),c=b[0],e=b[1];return 3*(c+e)/4-e},c.toByteArray=f,c.fromByteArray=j;for(var k=[],l=[],m="undefined"==typeof Uint8Array?Array:Uint8Array,n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",o=0,p=n.length;o<p;++o)k[o]=n[o],l[n.charCodeAt(o)]=o;l[45]=62,l[95]=63},{}]},{},[])("/")});
+	var sameOriginSupport = -1;
+	var checkSameOriginSupport = function(callback0) {
+		if(sameOriginSupport == -1) {
+			try {
+				(function(callback) {
+					if((typeof URL === "undefined") || (typeof URL.createObjectURL !== "function")) {
+						sameOriginSupport = 1;
+						callback(false);
+					}else {
+						var theObjURL = URL.createObjectURL(new Blob([new Uint8Array([69, 69, 69, 69])]));
+						if(!theObjURL) {
+							sameOriginSupport = 1;
+							callback(false);
+						}
+						doXHR(theObjURL, function(dataRet) {
+							if(dataRet) {
+								var typedArr = new Uint8Array(dataRet);
+								if(typedArr.length === 4 && typedArr[0] === 69 && typedArr[1] === 69 && typedArr[2] === 69 && typedArr[3] === 69) {
+									sameOriginSupport = 0;
+									callback(true);
+								}else {
+									sameOriginSupport = 1;
+									callback(false);
+								}
+							}else {
+								sameOriginSupport = 1;
+								callback(false);
+							}
+						});
+					}
+				})(function(valRet) {
+					if(!valRet) {
+						console.error("Same origin XHR support detected as false, using data: url...");
+					}
+					callback0(valRet);
+				});
+			}catch(ex) {
+				console.error("Same origin XHR support detection failed, using data: url...");
+				callback0(false);
+			}
+		}else {
+			callback0(!sameOriginSupport);
+		}
+	};
+	var blobToArrayBuffer = function(blobIn, callback) {
+		if(typeof blobIn.arrayBuffer === "undefined") {
+			blobIn.arrayBuffer().then(callback);
+		}else {
+			(function(phileReader) {
+				phileReader.addEventListener("load", function(evt) {
+					callback(phileReader.result);
+				});
+				phileReader.readAsArrayBuffer(blobIn);
+			})(new FileReader());
+		}
+	};
+	var completeXHR = function(callback, arg) {
+		if(!callback.comp) {
+			callback.comp = true;
+			callback.cb(arg);
+		}
+	};
+	var doXHR = function(urlIn, callback) {
+		(function(theXHRObj, callbackStruct){
+			theXHRObj.responseType = "arraybuffer";
+			theXHRObj.addEventListener("load", function(evt) { var stat = theXHRObj.status; if(stat === 0 || (stat >= 200 && stat < 400)) { completeXHR(callbackStruct, theXHRObj.response); } else { completeXHR(callbackStruct, null); } });
+			theXHRObj.addEventListener("error", function(evt) {  completeXHR(callbackStruct, null); });
+			theXHRObj.open("GET", urlIn, true);
+			theXHRObj.send();
+		})(new XMLHttpRequest(), { cb: callback, comp: false });
+	};
+	var decodeBase64URL = function(urlIn, callbackOut) {
+		doXHR(urlIn, function(data) {
+			if(!data) {
+				try {
+					console.error("Caught an error decoding base64 via fetch, doing it the slow way instead...");
+					callbackOut(base64js.toByteArray(urlIn.substring(37)).buffer);
+				}catch(ex) {
+					console.error("Failed to decode base64!");
+					console.error(ex);
+					callbackOut(null);
+				}
+			}else {
+				callbackOut(data);
+			}
+		});
+	};
+	if(typeof window.DecompressionStream === "undefined") {
+		checkSameOriginSupport(function(soSupported) {
+			var theWorkerObj;
+			var workerSrc = ""use strict";
/*! pako 2.1.0 https://github.com/nodeca/pako @license (MIT AND Zlib) */
!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).pako={})}(this,(function(e){"use strict";var t=function(e,t,i,n){for(var a=65535&e|0,r=e>>>16&65535|0,o=0;0!==i;){i-=o=i>2e3?2e3:i;do{r=r+(a=a+t[n++]|0)|0}while(--o);a%=65521,r%=65521}return a|r<<16|0},i=new Uint32Array(function(){for(var e,t=[],i=0;i<256;i++){e=i;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[i]=e}return t}()),n=function(e,t,n,a){var r=i,o=a+n;e^=-1;for(var s=a;s<o;s++)e=e>>>8^r[255&(e^t[s])];return-1^e},a=16209,r=function(e,t){var i,n,r,o,s,l,f,d,h,c,u,w,b,m,k,_,v,g,p,y,x,E,R,A,Z=e.state;i=e.next_in,R=e.input,n=i+(e.avail_in-5),r=e.next_out,A=e.output,o=r-(t-e.avail_out),s=r+(e.avail_out-257),l=Z.dmax,f=Z.wsize,d=Z.whave,h=Z.wnext,c=Z.window,u=Z.hold,w=Z.bits,b=Z.lencode,m=Z.distcode,k=(1<<Z.lenbits)-1,_=(1<<Z.distbits)-1;e:do{w<15&&(u+=R[i++]<<w,w+=8,u+=R[i++]<<w,w+=8),v=b[u&k];t:for(;;){if(u>>>=g=v>>>24,w-=g,0===(g=v>>>16&255))A[r++]=65535&v;else{if(!(16&g)){if(0==(64&g)){v=b[(65535&v)+(u&(1<<g)-1)];continue t}if(32&g){Z.mode=16191;break e}e.msg="invalid literal/length code",Z.mode=a;break e}p=65535&v,(g&=15)&&(w<g&&(u+=R[i++]<<w,w+=8),p+=u&(1<<g)-1,u>>>=g,w-=g),w<15&&(u+=R[i++]<<w,w+=8,u+=R[i++]<<w,w+=8),v=m[u&_];i:for(;;){if(u>>>=g=v>>>24,w-=g,!(16&(g=v>>>16&255))){if(0==(64&g)){v=m[(65535&v)+(u&(1<<g)-1)];continue i}e.msg="invalid distance code",Z.mode=a;break e}if(y=65535&v,w<(g&=15)&&(u+=R[i++]<<w,(w+=8)<g&&(u+=R[i++]<<w,w+=8)),(y+=u&(1<<g)-1)>l){e.msg="invalid distance too far back",Z.mode=a;break e}if(u>>>=g,w-=g,y>(g=r-o)){if((g=y-g)>d&&Z.sane){e.msg="invalid distance too far back",Z.mode=a;break e}if(x=0,E=c,0===h){if(x+=f-g,g<p){p-=g;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}}else if(h<g){if(x+=f+h-g,(g-=h)<p){p-=g;do{A[r++]=c[x++]}while(--g);if(x=0,h<p){p-=g=h;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}}}else if(x+=h-g,g<p){p-=g;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}for(;p>2;)A[r++]=E[x++],A[r++]=E[x++],A[r++]=E[x++],p-=3;p&&(A[r++]=E[x++],p>1&&(A[r++]=E[x++]))}else{x=r-y;do{A[r++]=A[x++],A[r++]=A[x++],A[r++]=A[x++],p-=3}while(p>2);p&&(A[r++]=A[x++],p>1&&(A[r++]=A[x++]))}break}}break}}while(i<n&&r<s);i-=p=w>>3,u&=(1<<(w-=p<<3))-1,e.next_in=i,e.next_out=r,e.avail_in=i<n?n-i+5:5-(i-n),e.avail_out=r<s?s-r+257:257-(r-s),Z.hold=u,Z.bits=w},o=15,s=new Uint16Array([3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0]),l=new Uint8Array([16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78]),f=new Uint16Array([1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0]),d=new Uint8Array([16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64]),h=function(e,t,i,n,a,r,h,c){var u,w,b,m,k,_,v,g,p,y=c.bits,x=0,E=0,R=0,A=0,Z=0,S=0,T=0,O=0,U=0,D=0,I=null,B=new Uint16Array(16),N=new Uint16Array(16),C=null;for(x=0;x<=o;x++)B[x]=0;for(E=0;E<n;E++)B[t[i+E]]++;for(Z=y,A=o;A>=1&&0===B[A];A--);if(Z>A&&(Z=A),0===A)return a[r++]=20971520,a[r++]=20971520,c.bits=1,0;for(R=1;R<A&&0===B[R];R++);for(Z<R&&(Z=R),O=1,x=1;x<=o;x++)if(O<<=1,(O-=B[x])<0)return-1;if(O>0&&(0===e||1!==A))return-1;for(N[1]=0,x=1;x<o;x++)N[x+1]=N[x]+B[x];for(E=0;E<n;E++)0!==t[i+E]&&(h[N[t[i+E]]++]=E);if(0===e?(I=C=h,_=20):1===e?(I=s,C=l,_=257):(I=f,C=d,_=0),D=0,E=0,x=R,k=r,S=Z,T=0,b=-1,m=(U=1<<Z)-1,1===e&&U>852||2===e&&U>592)return 1;for(;;){v=x-T,h[E]+1<_?(g=0,p=h[E]):h[E]>=_?(g=C[h[E]-_],p=I[h[E]-_]):(g=96,p=0),u=1<<x-T,R=w=1<<S;do{a[k+(D>>T)+(w-=u)]=v<<24|g<<16|p|0}while(0!==w);for(u=1<<x-1;D&u;)u>>=1;if(0!==u?(D&=u-1,D+=u):D=0,E++,0==--B[x]){if(x===A)break;x=t[i+h[E]]}if(x>Z&&(D&m)!==b){for(0===T&&(T=Z),k+=R,O=1<<(S=x-T);S+T<A&&!((O-=B[S+T])<=0);)S++,O<<=1;if(U+=1<<S,1===e&&U>852||2===e&&U>592)return 1;a[b=D&m]=Z<<24|S<<16|k-r|0}}return 0!==D&&(a[k+D]=x-T<<24|64<<16|0),c.bits=Z,0},c={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_MEM_ERROR:-4,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8},u=c.Z_FINISH,w=c.Z_BLOCK,b=c.Z_TREES,m=c.Z_OK,k=c.Z_STREAM_END,_=c.Z_NEED_DICT,v=c.Z_STREAM_ERROR,g=c.Z_DATA_ERROR,p=c.Z_MEM_ERROR,y=c.Z_BUF_ERROR,x=c.Z_DEFLATED,E=16180,R=16190,A=16191,Z=16192,S=16194,T=16199,O=16200,U=16206,D=16209,I=function(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)};function B(){this.strm=null,this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new Uint16Array(320),this.work=new Uint16Array(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}var N,C,z=function(e){if(!e)return 1;var t=e.state;return!t||t.strm!==e||t.mode<E||t.mode>16211?1:0},F=function(e){if(z(e))return v;var t=e.state;return e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=E,t.last=0,t.havedict=0,t.flags=-1,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new Int32Array(852),t.distcode=t.distdyn=new Int32Array(592),t.sane=1,t.back=-1,m},L=function(e){if(z(e))return v;var t=e.state;return t.wsize=0,t.whave=0,t.wnext=0,F(e)},M=function(e,t){var i;if(z(e))return v;var n=e.state;return t<0?(i=0,t=-t):(i=5+(t>>4),t<48&&(t&=15)),t&&(t<8||t>15)?v:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=i,n.wbits=t,L(e))},H=function(e,t){if(!e)return v;var i=new B;e.state=i,i.strm=e,i.window=null,i.mode=E;var n=M(e,t);return n!==m&&(e.state=null),n},j=!0,K=function(e){if(j){N=new Int32Array(512),C=new Int32Array(32);for(var t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(h(1,e.lens,0,288,N,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;h(2,e.lens,0,32,C,0,e.work,{bits:5}),j=!1}e.lencode=N,e.lenbits=9,e.distcode=C,e.distbits=5},P=function(e,t,i,n){var a,r=e.state;return null===r.window&&(r.wsize=1<<r.wbits,r.wnext=0,r.whave=0,r.window=new Uint8Array(r.wsize)),n>=r.wsize?(r.window.set(t.subarray(i-r.wsize,i),0),r.wnext=0,r.whave=r.wsize):((a=r.wsize-r.wnext)>n&&(a=n),r.window.set(t.subarray(i-n,i-n+a),r.wnext),(n-=a)?(r.window.set(t.subarray(i-n,i),0),r.wnext=n,r.whave=r.wsize):(r.wnext+=a,r.wnext===r.wsize&&(r.wnext=0),r.whave<r.wsize&&(r.whave+=a))),0},Y={inflateReset:L,inflateReset2:M,inflateResetKeep:F,inflateInit:function(e){return H(e,15)},inflateInit2:H,inflate:function(e,i){var a,o,s,l,f,d,c,B,N,C,F,L,M,H,j,Y,G,X,W,q,J,Q,V,$,ee=0,te=new Uint8Array(4),ie=new Uint8Array([16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15]);if(z(e)||!e.output||!e.input&&0!==e.avail_in)return v;(a=e.state).mode===A&&(a.mode=Z),f=e.next_out,s=e.output,c=e.avail_out,l=e.next_in,o=e.input,d=e.avail_in,B=a.hold,N=a.bits,C=d,F=c,Q=m;e:for(;;)switch(a.mode){case E:if(0===a.wrap){a.mode=Z;break}for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(2&a.wrap&&35615===B){0===a.wbits&&(a.wbits=15),a.check=0,te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0),B=0,N=0,a.mode=16181;break}if(a.head&&(a.head.done=!1),!(1&a.wrap)||(((255&B)<<8)+(B>>8))%31){e.msg="incorrect header check",a.mode=D;break}if((15&B)!==x){e.msg="unknown compression method",a.mode=D;break}if(N-=4,J=8+(15&(B>>>=4)),0===a.wbits&&(a.wbits=J),J>15||J>a.wbits){e.msg="invalid window size",a.mode=D;break}a.dmax=1<<a.wbits,a.flags=0,e.adler=a.check=1,a.mode=512&B?16189:A,B=0,N=0;break;case 16181:for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(a.flags=B,(255&a.flags)!==x){e.msg="unknown compression method",a.mode=D;break}if(57344&a.flags){e.msg="unknown header flags set",a.mode=D;break}a.head&&(a.head.text=B>>8&1),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0,a.mode=16182;case 16182:for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.head&&(a.head.time=B),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,te[2]=B>>>16&255,te[3]=B>>>24&255,a.check=n(a.check,te,4,0)),B=0,N=0,a.mode=16183;case 16183:for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.head&&(a.head.xflags=255&B,a.head.os=B>>8),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0,a.mode=16184;case 16184:if(1024&a.flags){for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.length=B,a.head&&(a.head.extra_len=B),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0}else a.head&&(a.head.extra=null);a.mode=16185;case 16185:if(1024&a.flags&&((L=a.length)>d&&(L=d),L&&(a.head&&(J=a.head.extra_len-a.length,a.head.extra||(a.head.extra=new Uint8Array(a.head.extra_len)),a.head.extra.set(o.subarray(l,l+L),J)),512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,a.length-=L),a.length))break e;a.length=0,a.mode=16186;case 16186:if(2048&a.flags){if(0===d)break e;L=0;do{J=o[l+L++],a.head&&J&&a.length<65536&&(a.head.name+=String.fromCharCode(J))}while(J&&L<d);if(512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,J)break e}else a.head&&(a.head.name=null);a.length=0,a.mode=16187;case 16187:if(4096&a.flags){if(0===d)break e;L=0;do{J=o[l+L++],a.head&&J&&a.length<65536&&(a.head.comment+=String.fromCharCode(J))}while(J&&L<d);if(512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,J)break e}else a.head&&(a.head.comment=null);a.mode=16188;case 16188:if(512&a.flags){for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(4&a.wrap&&B!==(65535&a.check)){e.msg="header crc mismatch",a.mode=D;break}B=0,N=0}a.head&&(a.head.hcrc=a.flags>>9&1,a.head.done=!0),e.adler=a.check=0,a.mode=A;break;case 16189:for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}e.adler=a.check=I(B),B=0,N=0,a.mode=R;case R:if(0===a.havedict)return e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,_;e.adler=a.check=1,a.mode=A;case A:if(i===w||i===b)break e;case Z:if(a.last){B>>>=7&N,N-=7&N,a.mode=U;break}for(;N<3;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}switch(a.last=1&B,N-=1,3&(B>>>=1)){case 0:a.mode=16193;break;case 1:if(K(a),a.mode=T,i===b){B>>>=2,N-=2;break e}break;case 2:a.mode=16196;break;case 3:e.msg="invalid block type",a.mode=D}B>>>=2,N-=2;break;case 16193:for(B>>>=7&N,N-=7&N;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if((65535&B)!=(B>>>16^65535)){e.msg="invalid stored block lengths",a.mode=D;break}if(a.length=65535&B,B=0,N=0,a.mode=S,i===b)break e;case S:a.mode=16195;case 16195:if(L=a.length){if(L>d&&(L=d),L>c&&(L=c),0===L)break e;s.set(o.subarray(l,l+L),f),d-=L,l+=L,c-=L,f+=L,a.length-=L;break}a.mode=A;break;case 16196:for(;N<14;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(a.nlen=257+(31&B),B>>>=5,N-=5,a.ndist=1+(31&B),B>>>=5,N-=5,a.ncode=4+(15&B),B>>>=4,N-=4,a.nlen>286||a.ndist>30){e.msg="too many length or distance symbols",a.mode=D;break}a.have=0,a.mode=16197;case 16197:for(;a.have<a.ncode;){for(;N<3;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.lens[ie[a.have++]]=7&B,B>>>=3,N-=3}for(;a.have<19;)a.lens[ie[a.have++]]=0;if(a.lencode=a.lendyn,a.lenbits=7,V={bits:a.lenbits},Q=h(0,a.lens,0,19,a.lencode,0,a.work,V),a.lenbits=V.bits,Q){e.msg="invalid code lengths set",a.mode=D;break}a.have=0,a.mode=16198;case 16198:for(;a.have<a.nlen+a.ndist;){for(;Y=(ee=a.lencode[B&(1<<a.lenbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(G<16)B>>>=j,N-=j,a.lens[a.have++]=G;else{if(16===G){for($=j+2;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(B>>>=j,N-=j,0===a.have){e.msg="invalid bit length repeat",a.mode=D;break}J=a.lens[a.have-1],L=3+(3&B),B>>>=2,N-=2}else if(17===G){for($=j+3;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}N-=j,J=0,L=3+(7&(B>>>=j)),B>>>=3,N-=3}else{for($=j+7;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}N-=j,J=0,L=11+(127&(B>>>=j)),B>>>=7,N-=7}if(a.have+L>a.nlen+a.ndist){e.msg="invalid bit length repeat",a.mode=D;break}for(;L--;)a.lens[a.have++]=J}}if(a.mode===D)break;if(0===a.lens[256]){e.msg="invalid code -- missing end-of-block",a.mode=D;break}if(a.lenbits=9,V={bits:a.lenbits},Q=h(1,a.lens,0,a.nlen,a.lencode,0,a.work,V),a.lenbits=V.bits,Q){e.msg="invalid literal/lengths set",a.mode=D;break}if(a.distbits=6,a.distcode=a.distdyn,V={bits:a.distbits},Q=h(2,a.lens,a.nlen,a.ndist,a.distcode,0,a.work,V),a.distbits=V.bits,Q){e.msg="invalid distances set",a.mode=D;break}if(a.mode=T,i===b)break e;case T:a.mode=O;case O:if(d>=6&&c>=258){e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,r(e,F),f=e.next_out,s=e.output,c=e.avail_out,l=e.next_in,o=e.input,d=e.avail_in,B=a.hold,N=a.bits,a.mode===A&&(a.back=-1);break}for(a.back=0;Y=(ee=a.lencode[B&(1<<a.lenbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(Y&&0==(240&Y)){for(X=j,W=Y,q=G;Y=(ee=a.lencode[q+((B&(1<<X+W)-1)>>X)])>>>16&255,G=65535&ee,!(X+(j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}B>>>=X,N-=X,a.back+=X}if(B>>>=j,N-=j,a.back+=j,a.length=G,0===Y){a.mode=16205;break}if(32&Y){a.back=-1,a.mode=A;break}if(64&Y){e.msg="invalid literal/length code",a.mode=D;break}a.extra=15&Y,a.mode=16201;case 16201:if(a.extra){for($=a.extra;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.length+=B&(1<<a.extra)-1,B>>>=a.extra,N-=a.extra,a.back+=a.extra}a.was=a.length,a.mode=16202;case 16202:for(;Y=(ee=a.distcode[B&(1<<a.distbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(0==(240&Y)){for(X=j,W=Y,q=G;Y=(ee=a.distcode[q+((B&(1<<X+W)-1)>>X)])>>>16&255,G=65535&ee,!(X+(j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}B>>>=X,N-=X,a.back+=X}if(B>>>=j,N-=j,a.back+=j,64&Y){e.msg="invalid distance code",a.mode=D;break}a.offset=G,a.extra=15&Y,a.mode=16203;case 16203:if(a.extra){for($=a.extra;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.offset+=B&(1<<a.extra)-1,B>>>=a.extra,N-=a.extra,a.back+=a.extra}if(a.offset>a.dmax){e.msg="invalid distance too far back",a.mode=D;break}a.mode=16204;case 16204:if(0===c)break e;if(L=F-c,a.offset>L){if((L=a.offset-L)>a.whave&&a.sane){e.msg="invalid distance too far back",a.mode=D;break}L>a.wnext?(L-=a.wnext,M=a.wsize-L):M=a.wnext-L,L>a.length&&(L=a.length),H=a.window}else H=s,M=f-a.offset,L=a.length;L>c&&(L=c),c-=L,a.length-=L;do{s[f++]=H[M++]}while(--L);0===a.length&&(a.mode=O);break;case 16205:if(0===c)break e;s[f++]=a.length,c--,a.mode=O;break;case U:if(a.wrap){for(;N<32;){if(0===d)break e;d--,B|=o[l++]<<N,N+=8}if(F-=c,e.total_out+=F,a.total+=F,4&a.wrap&&F&&(e.adler=a.check=a.flags?n(a.check,s,F,f-F):t(a.check,s,F,f-F)),F=c,4&a.wrap&&(a.flags?B:I(B))!==a.check){e.msg="incorrect data check",a.mode=D;break}B=0,N=0}a.mode=16207;case 16207:if(a.wrap&&a.flags){for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(4&a.wrap&&B!==(4294967295&a.total)){e.msg="incorrect length check",a.mode=D;break}B=0,N=0}a.mode=16208;case 16208:Q=k;break e;case D:Q=g;break e;case 16210:return p;default:return v}return e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,(a.wsize||F!==e.avail_out&&a.mode<D&&(a.mode<U||i!==u))&&P(e,e.output,e.next_out,F-e.avail_out),C-=e.avail_in,F-=e.avail_out,e.total_in+=C,e.total_out+=F,a.total+=F,4&a.wrap&&F&&(e.adler=a.check=a.flags?n(a.check,s,F,e.next_out-F):t(a.check,s,F,e.next_out-F)),e.data_type=a.bits+(a.last?64:0)+(a.mode===A?128:0)+(a.mode===T||a.mode===S?256:0),(0===C&&0===F||i===u)&&Q===m&&(Q=y),Q},inflateEnd:function(e){if(z(e))return v;var t=e.state;return t.window&&(t.window=null),e.state=null,m},inflateGetHeader:function(e,t){if(z(e))return v;var i=e.state;return 0==(2&i.wrap)?v:(i.head=t,t.done=!1,m)},inflateSetDictionary:function(e,i){var n,a=i.length;return z(e)||0!==(n=e.state).wrap&&n.mode!==R?v:n.mode===R&&t(1,i,a,0)!==n.check?g:P(e,i,a,a)?(n.mode=16210,p):(n.havedict=1,m)},inflateInfo:"pako inflate (from Nodeca project)"};function G(e){return G="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},G(e)}var X=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},W=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var i=t.shift();if(i){if("object"!==G(i))throw new TypeError(i+"must be non-object");for(var n in i)X(i,n)&&(e[n]=i[n])}}return e},q=function(e){for(var t=0,i=0,n=e.length;i<n;i++)t+=e[i].length;for(var a=new Uint8Array(t),r=0,o=0,s=e.length;r<s;r++){var l=e[r];a.set(l,o),o+=l.length}return a},J=!0;try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){J=!1}for(var Q=new Uint8Array(256),V=0;V<256;V++)Q[V]=V>=252?6:V>=248?5:V>=240?4:V>=224?3:V>=192?2:1;Q[254]=Q[254]=1;var $=function(e){if("function"==typeof TextEncoder&&TextEncoder.prototype.encode)return(new TextEncoder).encode(e);var t,i,n,a,r,o=e.length,s=0;for(a=0;a<o;a++)55296==(64512&(i=e.charCodeAt(a)))&&a+1<o&&56320==(64512&(n=e.charCodeAt(a+1)))&&(i=65536+(i-55296<<10)+(n-56320),a++),s+=i<128?1:i<2048?2:i<65536?3:4;for(t=new Uint8Array(s),r=0,a=0;r<s;a++)55296==(64512&(i=e.charCodeAt(a)))&&a+1<o&&56320==(64512&(n=e.charCodeAt(a+1)))&&(i=65536+(i-55296<<10)+(n-56320),a++),i<128?t[r++]=i:i<2048?(t[r++]=192|i>>>6,t[r++]=128|63&i):i<65536?(t[r++]=224|i>>>12,t[r++]=128|i>>>6&63,t[r++]=128|63&i):(t[r++]=240|i>>>18,t[r++]=128|i>>>12&63,t[r++]=128|i>>>6&63,t[r++]=128|63&i);return t},ee=function(e,t){var i,n,a=t||e.length;if("function"==typeof TextDecoder&&TextDecoder.prototype.decode)return(new TextDecoder).decode(e.subarray(0,t));var r=new Array(2*a);for(n=0,i=0;i<a;){var o=e[i++];if(o<128)r[n++]=o;else{var s=Q[o];if(s>4)r[n++]=65533,i+=s-1;else{for(o&=2===s?31:3===s?15:7;s>1&&i<a;)o=o<<6|63&e[i++],s--;s>1?r[n++]=65533:o<65536?r[n++]=o:(o-=65536,r[n++]=55296|o>>10&1023,r[n++]=56320|1023&o)}}}return function(e,t){if(t<65534&&e.subarray&&J)return String.fromCharCode.apply(null,e.length===t?e:e.subarray(0,t));for(var i="",n=0;n<t;n++)i+=String.fromCharCode(e[n]);return i}(r,n)},te=function(e,t){(t=t||e.length)>e.length&&(t=e.length);for(var i=t-1;i>=0&&128==(192&e[i]);)i--;return i<0||0===i?t:i+Q[e[i]]>t?i:t},ie={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"};var ne=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0};var ae=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1},re=Object.prototype.toString,oe=c.Z_NO_FLUSH,se=c.Z_FINISH,le=c.Z_OK,fe=c.Z_STREAM_END,de=c.Z_NEED_DICT,he=c.Z_STREAM_ERROR,ce=c.Z_DATA_ERROR,ue=c.Z_MEM_ERROR;function we(e){this.options=W({chunkSize:65536,windowBits:15,to:""},e||{});var t=this.options;t.raw&&t.windowBits>=0&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(t.windowBits>=0&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),t.windowBits>15&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new ne,this.strm.avail_out=0;var i=Y.inflateInit2(this.strm,t.windowBits);if(i!==le)throw new Error(ie[i]);if(this.header=new ae,Y.inflateGetHeader(this.strm,this.header),t.dictionary&&("string"==typeof t.dictionary?t.dictionary=$(t.dictionary):"[object ArrayBuffer]"===re.call(t.dictionary)&&(t.dictionary=new Uint8Array(t.dictionary)),t.raw&&(i=Y.inflateSetDictionary(this.strm,t.dictionary))!==le))throw new Error(ie[i])}function be(e,t){var i=new we(t);if(i.push(e),i.err)throw i.msg||ie[i.err];return i.result}we.prototype.push=function(e,t){var i,n,a,r=this.strm,o=this.options.chunkSize,s=this.options.dictionary;if(this.ended)return!1;for(n=t===~~t?t:!0===t?se:oe,"[object ArrayBuffer]"===re.call(e)?r.input=new Uint8Array(e):r.input=e,r.next_in=0,r.avail_in=r.input.length;;){for(0===r.avail_out&&(r.output=new Uint8Array(o),r.next_out=0,r.avail_out=o),(i=Y.inflate(r,n))===de&&s&&((i=Y.inflateSetDictionary(r,s))===le?i=Y.inflate(r,n):i===ce&&(i=de));r.avail_in>0&&i===fe&&r.state.wrap>0&&0!==e[r.next_in];)Y.inflateReset(r),i=Y.inflate(r,n);switch(i){case he:case ce:case de:case ue:return this.onEnd(i),this.ended=!0,!1}if(a=r.avail_out,r.next_out&&(0===r.avail_out||i===fe))if("string"===this.options.to){var l=te(r.output,r.next_out),f=r.next_out-l,d=ee(r.output,l);r.next_out=f,r.avail_out=o-f,f&&r.output.set(r.output.subarray(l,l+f),0),this.onData(d)}else this.onData(r.output.length===r.next_out?r.output:r.output.subarray(0,r.next_out));if(i!==le||0!==a){if(i===fe)return i=Y.inflateEnd(this.strm),this.onEnd(i),this.ended=!0,!0;if(0===r.avail_in)break}}return!0},we.prototype.onData=function(e){this.chunks.push(e)},we.prototype.onEnd=function(e){e===le&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=q(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg};var me=we,ke=be,_e=function(e,t){return(t=t||{}).raw=!0,be(e,t)},ve=be,ge=c,pe={Inflate:me,inflate:ke,inflateRaw:_e,ungzip:ve,constants:ge};e.Inflate=me,e.constants=ge,e.default=pe,e.inflate=ke,e.inflateRaw=_e,e.ungzip=ve,Object.defineProperty(e,"__esModule",{value:!0})}));
addEventListener("message", function(o) { try { postMessage({ status: "success", data: pako.inflate(o.data, { to: "arraybuffer" }) }); } catch(ex) { logger.error(ex); postMessage({ status: "error" }); } });
postMessage({ status: "ready" });";
+			if(soSupported) {
+				theWorkerObj = new Worker(URL.createObjectURL(new Blob([base64js.toByteArray(workerSrc).buffer], { type: "text/javascript" })));
+			}else {
+				theWorkerObj = new Worker("data:text/javascript;base64," + workerSrc);
+			}
+			theWorkerObj.addEventListener("message", function(evt) {
+				if(evt.data.status === "ready") {
+					decodeBase64URL(window.eaglercraftXClientBundle, function(cbData) {
+						if(cbData) {
+							theWorkerObj.postMessage(cbData);
+						}else {
+							alert("Failed to decode eaglercraftXClientBundle base64!");
+						}
+					});
+				}else if(evt.data.status === "success") {
+					if(soSupported) {
+						window.clientScriptSrcURL = URL.createObjectURL(new Blob([evt.data.data.buffer], { type: "text/javascript;charset=utf-8" }));
+					}else {
+						window.clientScriptSrcURL = "data:text/javascript;charset=utf-8;base64," + base64js.fromByteArray(evt.data.data);
+					}
+				}else {
+					alert("Failed to decompress classes.js via legacy javascript implementation!");
+				}
+			});
+			theWorkerObj.addEventListener("error", function(evt) {
+				console.error(evt.error);
+			});
+		});
+	}else {
+		var ds = new window.DecompressionStream("gzip");
+		var result = [];
+		var fetchStream = function(reader) {
+			var processData;
+			reader.read().then(processData = function(evt) {
+				if (evt.done) {
+					(function(blobObj){
+						checkSameOriginSupport(function(supported) {
+							if(supported) {
+								window.clientScriptSrcURL = URL.createObjectURL(blobObj);
+							}else {
+								blobToArrayBuffer(blobObj, function(arr) {
+									console.log(arr);
+									window.clientScriptSrcURL = "data:text/javascript;charset=utf-8;base64," + base64js.fromByteArray(new Uint8Array(arr));
+								});
+							}
+						});
+					})(new Blob(result, { type: "text/javascript;charset=utf-8" }));
+					result = [];
+					ds = null;
+					return;
+				}
+				result.push(evt.value);
+				return reader.read().then(processData);
+			});
+		};
+		decodeBase64URL(window.eaglercraftXClientBundle, function(cbData) {
+			if(cbData) {
+				fetchStream((new Blob([cbData])).stream().pipeThrough(ds).getReader());
+			}else {
+				alert("Failed to decode eaglercraftXClientBundle base64!");
+			}
+		});
+	}
+})();
+</script>
+<script type="text/javascript">
+"use strict";
+(function(){
+	var launchInterval = -1;
+	var launchCounter = 1;
+	var launchCountdownNumberElement = null;
+	var launchCountdownProgressElement = null;
+	var launchSkipCountdown = false;
+	var launchTick = function() {
+		if(launchCounter > 100 || launchSkipCountdown) {
+			if(window.clientScriptSrcURL) {
+				clearInterval(launchInterval);
+				setTimeout(function() {
+					document.body.removeChild(document.getElementById("launch_countdown_screen"));
+					document.body.style.backgroundColor = "black";
+					var script = document.createElement("script");
+					script.type = "text/javascript";
+					script.src = window.clientScriptSrcURL;
+					window.clientScriptSrcURL = null;
+					document.head.appendChild(script);
+				}, 50);
+			}
+			return;
+		}
+		if(launchCounter === 100) {
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+		}else {
+			launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
+		}
+		launchCountdownProgressElement.style.width = "" + launchCounter + "%";
+		++launchCounter;
+	};
+	window.addEventListener("load", function() {
+		launchCountdownNumberElement = document.getElementById("launchCountdownNumber");
+		launchCountdownProgressElement = document.getElementById("launchCountdownProgress");
+		launchInterval = setInterval(launchTick, 50);
+		document.getElementById("skipCountdown").addEventListener("click", function() {
+			launchSkipCountdown = true;
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+		});
+		document.getElementById("bootMenu").addEventListener("click", function() {
+			launchSkipCountdown = true;
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+			window.eaglercraftXOptsHints.showBootMenuOnLaunch = true;
+		});
+	});
+})();
+</script>
+<link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
+${fat_offline_data}
+</head>
+<body style="margin:0px;width:100%;height:100%;overflow:hidden;background-color:white;" id="game_frame">
+<div style="margin:0px;width:100%;height:100%;font-family:sans-serif;display:flex;align-items:center;user-select:none;" id="launch_countdown_screen">
+<div style="margin:auto;text-align:center;">
+<h1>EaglercraftX 1.8 "Fat Offline"</h1>
+<h3>Contains: ${num_clients} Client(s)</h3>
+<h2 id="gameWillLaunchIn">Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
+<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div>
+<p style="margin-top:30px;"><button id="skipCountdown" autofocus>Skip Countdown</button></p></div>
+</div>
+</div>
+</body>
+</html>
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8_signed.html b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8_signed.html
new file mode 100755
index 0000000..989e513
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraftX_1_8_signed.html
@@ -0,0 +1,267 @@
+<!DOCTYPE html>
+
+<!--
+
+This file is from ${date}, it was generated using EaglercraftX 1.8 boot manager
+
+Signature: ${signature_details}
+
+-->
+
+<html style="width:100%;height:100%;background-color:black;">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
+<meta name="description" content="${client_name}" />
+<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
+<title>${client_name}</title>
+<meta property="og:locale" content="en-US" />
+<meta property="og:type" content="website" />
+<meta property="og:title" content="${client_name}" />
+<meta property="og:description" content="Play minecraft 1.8 in your browser" />
+<style type="eaglercraftOfflineParseHint">{"type":"EAGLERCRAFTX_1_8_SIGNED","launchConf":${launch_conf_json}}</style>
+<script type="text/javascript">
+"use strict";
+var relayIdMax = ${relayId_max};
+var relayId = relayIdMax > 1 ? Math.floor(Math.random() * relayIdMax) : 0;
+
+// %%%%%%%%% launch options %%%%%%%%%%%%
+
+window.eaglercraftXOptsHints = ${launch_opts};
+window.eaglercraftXOptsHints.hintsVersion = 1;
+window.eaglercraftXOptsHints.container = "game_frame";
+
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+</script>
+<style type="eaglercraft" id="eaglercraftXClientSignature">data:application/octet-stream;base64,${client_signature}</style>
+<style type="eaglercraft" id="eaglercraftXClientBundle">data:application/octet-stream;base64,${client_bundle}</style>
+<script type="text/javascript">
+"use strict";
+(function(){
+	function eaglerBundleUnwrap(tagIn) { var e = document.getElementById(tagIn); var ret = e.innerText; document.head.removeChild(e); return ret;  }
+	window.eaglercraftXClientSignature = eaglerBundleUnwrap("eaglercraftXClientSignature");
+	window.eaglercraftXClientBundle = eaglerBundleUnwrap("eaglercraftXClientBundle");
+})();
+</script>
+<script type="text/javascript">
+"use strict";
+(function(){
+	(function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;b="undefined"==typeof window?"undefined"==typeof global?"undefined"==typeof self?this:self:global:window,b.base64js=a()}})(function(){return function(){function b(d,e,g){function a(j,i){if(!e[j]){if(!d[j]){var f="function"==typeof require&&require;if(!i&&f)return f(j,!0);if(h)return h(j,!0);var c=new Error("Cannot find module '"+j+"'");throw c.code="MODULE_NOT_FOUND",c}var k=e[j]={exports:{}};d[j][0].call(k.exports,function(b){var c=d[j][1][b];return a(c||b)},k,k.exports,b,d,e,g)}return e[j].exports}for(var h="function"==typeof require&&require,c=0;c<g.length;c++)a(g[c]);return a}return b}()({"/":[function(a,b,c){'use strict';function d(a){var b=a.length;if(0<b%4)throw new Error("Invalid string. Length must be a multiple of 4");var c=a.indexOf("=");-1===c&&(c=b);var d=c===b?0:4-c%4;return[c,d]}function e(a,b,c){return 3*(b+c)/4-c}function f(a){var b,c,f=d(a),g=f[0],h=f[1],j=new m(e(a,g,h)),k=0,n=0<h?g-4:g;for(c=0;c<n;c+=4)b=l[a.charCodeAt(c)]<<18|l[a.charCodeAt(c+1)]<<12|l[a.charCodeAt(c+2)]<<6|l[a.charCodeAt(c+3)],j[k++]=255&b>>16,j[k++]=255&b>>8,j[k++]=255&b;return 2===h&&(b=l[a.charCodeAt(c)]<<2|l[a.charCodeAt(c+1)]>>4,j[k++]=255&b),1===h&&(b=l[a.charCodeAt(c)]<<10|l[a.charCodeAt(c+1)]<<4|l[a.charCodeAt(c+2)]>>2,j[k++]=255&b>>8,j[k++]=255&b),j}function g(a){return k[63&a>>18]+k[63&a>>12]+k[63&a>>6]+k[63&a]}function h(a,b,c){for(var d,e=[],f=b;f<c;f+=3)d=(16711680&a[f]<<16)+(65280&a[f+1]<<8)+(255&a[f+2]),e.push(g(d));return e.join("")}function j(a){for(var b,c=a.length,d=c%3,e=[],f=16383,g=0,j=c-d;g<j;g+=f)e.push(h(a,g,g+f>j?j:g+f));return 1===d?(b=a[c-1],e.push(k[b>>2]+k[63&b<<4]+"==")):2===d&&(b=(a[c-2]<<8)+a[c-1],e.push(k[b>>10]+k[63&b>>4]+k[63&b<<2]+"=")),e.join("")}c.byteLength=function(a){var b=d(a),c=b[0],e=b[1];return 3*(c+e)/4-e},c.toByteArray=f,c.fromByteArray=j;for(var k=[],l=[],m="undefined"==typeof Uint8Array?Array:Uint8Array,n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",o=0,p=n.length;o<p;++o)k[o]=n[o],l[n.charCodeAt(o)]=o;l[45]=62,l[95]=63},{}]},{},[])("/")});
+	var sameOriginSupport = -1;
+	var checkSameOriginSupport = function(callback0) {
+		if(sameOriginSupport == -1) {
+			try {
+				(function(callback) {
+					if((typeof URL === "undefined") || (typeof URL.createObjectURL !== "function")) {
+						sameOriginSupport = 1;
+						callback(false);
+					}else {
+						var theObjURL = URL.createObjectURL(new Blob([new Uint8Array([69, 69, 69, 69])]));
+						if(!theObjURL) {
+							sameOriginSupport = 1;
+							callback(false);
+						}
+						doXHR(theObjURL, function(dataRet) {
+							if(dataRet) {
+								var typedArr = new Uint8Array(dataRet);
+								if(typedArr.length === 4 && typedArr[0] === 69 && typedArr[1] === 69 && typedArr[2] === 69 && typedArr[3] === 69) {
+									sameOriginSupport = 0;
+									callback(true);
+								}else {
+									sameOriginSupport = 1;
+									callback(false);
+								}
+							}else {
+								sameOriginSupport = 1;
+								callback(false);
+							}
+						});
+					}
+				})(function(valRet) {
+					if(!valRet) {
+						console.error("Same origin XHR support detected as false, using data: url...");
+					}
+					callback0(valRet);
+				});
+			}catch(ex) {
+				console.error("Same origin XHR support detection failed, using data: url...");
+				callback0(false);
+			}
+		}else {
+			callback0(!sameOriginSupport);
+		}
+	};
+	var blobToArrayBuffer = function(blobIn, callback) {
+		if(typeof blobIn.arrayBuffer === "undefined") {
+			blobIn.arrayBuffer().then(callback);
+		}else {
+			(function(phileReader) {
+				phileReader.addEventListener("load", function(evt) {
+					callback(phileReader.result);
+				});
+				phileReader.readAsArrayBuffer(blobIn);
+			})(new FileReader());
+		}
+	};
+	var completeXHR = function(callback, arg) {
+		if(!callback.comp) {
+			callback.comp = true;
+			callback.cb(arg);
+		}
+	};
+	var doXHR = function(urlIn, callback) {
+		(function(theXHRObj, callbackStruct){
+			theXHRObj.responseType = "arraybuffer";
+			theXHRObj.addEventListener("load", function(evt) { var stat = theXHRObj.status; if(stat === 0 || (stat >= 200 && stat < 400)) { completeXHR(callbackStruct, theXHRObj.response); } else { completeXHR(callbackStruct, null); } });
+			theXHRObj.addEventListener("error", function(evt) {  completeXHR(callbackStruct, null); });
+			theXHRObj.open("GET", urlIn, true);
+			theXHRObj.send();
+		})(new XMLHttpRequest(), { cb: callback, comp: false });
+	};
+	var decodeBase64URL = function(urlIn, callbackOut) {
+		doXHR(urlIn, function(data) {
+			if(!data) {
+				try {
+					console.error("Caught an error decoding base64 via fetch, doing it the slow way instead...");
+					callbackOut(base64js.toByteArray(urlIn.substring(37)).buffer);
+				}catch(ex) {
+					console.error("Failed to decode base64!");
+					console.error(ex);
+					callbackOut(null);
+				}
+			}else {
+				callbackOut(data);
+			}
+		});
+	};
+	if(typeof window.DecompressionStream === "undefined") {
+		checkSameOriginSupport(function(soSupported) {
+			var theWorkerObj;
+			var workerSrc = ""use strict";
/*! pako 2.1.0 https://github.com/nodeca/pako @license (MIT AND Zlib) */
!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).pako={})}(this,(function(e){"use strict";var t=function(e,t,i,n){for(var a=65535&e|0,r=e>>>16&65535|0,o=0;0!==i;){i-=o=i>2e3?2e3:i;do{r=r+(a=a+t[n++]|0)|0}while(--o);a%=65521,r%=65521}return a|r<<16|0},i=new Uint32Array(function(){for(var e,t=[],i=0;i<256;i++){e=i;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[i]=e}return t}()),n=function(e,t,n,a){var r=i,o=a+n;e^=-1;for(var s=a;s<o;s++)e=e>>>8^r[255&(e^t[s])];return-1^e},a=16209,r=function(e,t){var i,n,r,o,s,l,f,d,h,c,u,w,b,m,k,_,v,g,p,y,x,E,R,A,Z=e.state;i=e.next_in,R=e.input,n=i+(e.avail_in-5),r=e.next_out,A=e.output,o=r-(t-e.avail_out),s=r+(e.avail_out-257),l=Z.dmax,f=Z.wsize,d=Z.whave,h=Z.wnext,c=Z.window,u=Z.hold,w=Z.bits,b=Z.lencode,m=Z.distcode,k=(1<<Z.lenbits)-1,_=(1<<Z.distbits)-1;e:do{w<15&&(u+=R[i++]<<w,w+=8,u+=R[i++]<<w,w+=8),v=b[u&k];t:for(;;){if(u>>>=g=v>>>24,w-=g,0===(g=v>>>16&255))A[r++]=65535&v;else{if(!(16&g)){if(0==(64&g)){v=b[(65535&v)+(u&(1<<g)-1)];continue t}if(32&g){Z.mode=16191;break e}e.msg="invalid literal/length code",Z.mode=a;break e}p=65535&v,(g&=15)&&(w<g&&(u+=R[i++]<<w,w+=8),p+=u&(1<<g)-1,u>>>=g,w-=g),w<15&&(u+=R[i++]<<w,w+=8,u+=R[i++]<<w,w+=8),v=m[u&_];i:for(;;){if(u>>>=g=v>>>24,w-=g,!(16&(g=v>>>16&255))){if(0==(64&g)){v=m[(65535&v)+(u&(1<<g)-1)];continue i}e.msg="invalid distance code",Z.mode=a;break e}if(y=65535&v,w<(g&=15)&&(u+=R[i++]<<w,(w+=8)<g&&(u+=R[i++]<<w,w+=8)),(y+=u&(1<<g)-1)>l){e.msg="invalid distance too far back",Z.mode=a;break e}if(u>>>=g,w-=g,y>(g=r-o)){if((g=y-g)>d&&Z.sane){e.msg="invalid distance too far back",Z.mode=a;break e}if(x=0,E=c,0===h){if(x+=f-g,g<p){p-=g;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}}else if(h<g){if(x+=f+h-g,(g-=h)<p){p-=g;do{A[r++]=c[x++]}while(--g);if(x=0,h<p){p-=g=h;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}}}else if(x+=h-g,g<p){p-=g;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}for(;p>2;)A[r++]=E[x++],A[r++]=E[x++],A[r++]=E[x++],p-=3;p&&(A[r++]=E[x++],p>1&&(A[r++]=E[x++]))}else{x=r-y;do{A[r++]=A[x++],A[r++]=A[x++],A[r++]=A[x++],p-=3}while(p>2);p&&(A[r++]=A[x++],p>1&&(A[r++]=A[x++]))}break}}break}}while(i<n&&r<s);i-=p=w>>3,u&=(1<<(w-=p<<3))-1,e.next_in=i,e.next_out=r,e.avail_in=i<n?n-i+5:5-(i-n),e.avail_out=r<s?s-r+257:257-(r-s),Z.hold=u,Z.bits=w},o=15,s=new Uint16Array([3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0]),l=new Uint8Array([16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78]),f=new Uint16Array([1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0]),d=new Uint8Array([16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64]),h=function(e,t,i,n,a,r,h,c){var u,w,b,m,k,_,v,g,p,y=c.bits,x=0,E=0,R=0,A=0,Z=0,S=0,T=0,O=0,U=0,D=0,I=null,B=new Uint16Array(16),N=new Uint16Array(16),C=null;for(x=0;x<=o;x++)B[x]=0;for(E=0;E<n;E++)B[t[i+E]]++;for(Z=y,A=o;A>=1&&0===B[A];A--);if(Z>A&&(Z=A),0===A)return a[r++]=20971520,a[r++]=20971520,c.bits=1,0;for(R=1;R<A&&0===B[R];R++);for(Z<R&&(Z=R),O=1,x=1;x<=o;x++)if(O<<=1,(O-=B[x])<0)return-1;if(O>0&&(0===e||1!==A))return-1;for(N[1]=0,x=1;x<o;x++)N[x+1]=N[x]+B[x];for(E=0;E<n;E++)0!==t[i+E]&&(h[N[t[i+E]]++]=E);if(0===e?(I=C=h,_=20):1===e?(I=s,C=l,_=257):(I=f,C=d,_=0),D=0,E=0,x=R,k=r,S=Z,T=0,b=-1,m=(U=1<<Z)-1,1===e&&U>852||2===e&&U>592)return 1;for(;;){v=x-T,h[E]+1<_?(g=0,p=h[E]):h[E]>=_?(g=C[h[E]-_],p=I[h[E]-_]):(g=96,p=0),u=1<<x-T,R=w=1<<S;do{a[k+(D>>T)+(w-=u)]=v<<24|g<<16|p|0}while(0!==w);for(u=1<<x-1;D&u;)u>>=1;if(0!==u?(D&=u-1,D+=u):D=0,E++,0==--B[x]){if(x===A)break;x=t[i+h[E]]}if(x>Z&&(D&m)!==b){for(0===T&&(T=Z),k+=R,O=1<<(S=x-T);S+T<A&&!((O-=B[S+T])<=0);)S++,O<<=1;if(U+=1<<S,1===e&&U>852||2===e&&U>592)return 1;a[b=D&m]=Z<<24|S<<16|k-r|0}}return 0!==D&&(a[k+D]=x-T<<24|64<<16|0),c.bits=Z,0},c={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_MEM_ERROR:-4,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8},u=c.Z_FINISH,w=c.Z_BLOCK,b=c.Z_TREES,m=c.Z_OK,k=c.Z_STREAM_END,_=c.Z_NEED_DICT,v=c.Z_STREAM_ERROR,g=c.Z_DATA_ERROR,p=c.Z_MEM_ERROR,y=c.Z_BUF_ERROR,x=c.Z_DEFLATED,E=16180,R=16190,A=16191,Z=16192,S=16194,T=16199,O=16200,U=16206,D=16209,I=function(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)};function B(){this.strm=null,this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new Uint16Array(320),this.work=new Uint16Array(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}var N,C,z=function(e){if(!e)return 1;var t=e.state;return!t||t.strm!==e||t.mode<E||t.mode>16211?1:0},F=function(e){if(z(e))return v;var t=e.state;return e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=E,t.last=0,t.havedict=0,t.flags=-1,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new Int32Array(852),t.distcode=t.distdyn=new Int32Array(592),t.sane=1,t.back=-1,m},L=function(e){if(z(e))return v;var t=e.state;return t.wsize=0,t.whave=0,t.wnext=0,F(e)},M=function(e,t){var i;if(z(e))return v;var n=e.state;return t<0?(i=0,t=-t):(i=5+(t>>4),t<48&&(t&=15)),t&&(t<8||t>15)?v:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=i,n.wbits=t,L(e))},H=function(e,t){if(!e)return v;var i=new B;e.state=i,i.strm=e,i.window=null,i.mode=E;var n=M(e,t);return n!==m&&(e.state=null),n},j=!0,K=function(e){if(j){N=new Int32Array(512),C=new Int32Array(32);for(var t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(h(1,e.lens,0,288,N,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;h(2,e.lens,0,32,C,0,e.work,{bits:5}),j=!1}e.lencode=N,e.lenbits=9,e.distcode=C,e.distbits=5},P=function(e,t,i,n){var a,r=e.state;return null===r.window&&(r.wsize=1<<r.wbits,r.wnext=0,r.whave=0,r.window=new Uint8Array(r.wsize)),n>=r.wsize?(r.window.set(t.subarray(i-r.wsize,i),0),r.wnext=0,r.whave=r.wsize):((a=r.wsize-r.wnext)>n&&(a=n),r.window.set(t.subarray(i-n,i-n+a),r.wnext),(n-=a)?(r.window.set(t.subarray(i-n,i),0),r.wnext=n,r.whave=r.wsize):(r.wnext+=a,r.wnext===r.wsize&&(r.wnext=0),r.whave<r.wsize&&(r.whave+=a))),0},Y={inflateReset:L,inflateReset2:M,inflateResetKeep:F,inflateInit:function(e){return H(e,15)},inflateInit2:H,inflate:function(e,i){var a,o,s,l,f,d,c,B,N,C,F,L,M,H,j,Y,G,X,W,q,J,Q,V,$,ee=0,te=new Uint8Array(4),ie=new Uint8Array([16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15]);if(z(e)||!e.output||!e.input&&0!==e.avail_in)return v;(a=e.state).mode===A&&(a.mode=Z),f=e.next_out,s=e.output,c=e.avail_out,l=e.next_in,o=e.input,d=e.avail_in,B=a.hold,N=a.bits,C=d,F=c,Q=m;e:for(;;)switch(a.mode){case E:if(0===a.wrap){a.mode=Z;break}for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(2&a.wrap&&35615===B){0===a.wbits&&(a.wbits=15),a.check=0,te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0),B=0,N=0,a.mode=16181;break}if(a.head&&(a.head.done=!1),!(1&a.wrap)||(((255&B)<<8)+(B>>8))%31){e.msg="incorrect header check",a.mode=D;break}if((15&B)!==x){e.msg="unknown compression method",a.mode=D;break}if(N-=4,J=8+(15&(B>>>=4)),0===a.wbits&&(a.wbits=J),J>15||J>a.wbits){e.msg="invalid window size",a.mode=D;break}a.dmax=1<<a.wbits,a.flags=0,e.adler=a.check=1,a.mode=512&B?16189:A,B=0,N=0;break;case 16181:for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(a.flags=B,(255&a.flags)!==x){e.msg="unknown compression method",a.mode=D;break}if(57344&a.flags){e.msg="unknown header flags set",a.mode=D;break}a.head&&(a.head.text=B>>8&1),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0,a.mode=16182;case 16182:for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.head&&(a.head.time=B),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,te[2]=B>>>16&255,te[3]=B>>>24&255,a.check=n(a.check,te,4,0)),B=0,N=0,a.mode=16183;case 16183:for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.head&&(a.head.xflags=255&B,a.head.os=B>>8),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0,a.mode=16184;case 16184:if(1024&a.flags){for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.length=B,a.head&&(a.head.extra_len=B),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0}else a.head&&(a.head.extra=null);a.mode=16185;case 16185:if(1024&a.flags&&((L=a.length)>d&&(L=d),L&&(a.head&&(J=a.head.extra_len-a.length,a.head.extra||(a.head.extra=new Uint8Array(a.head.extra_len)),a.head.extra.set(o.subarray(l,l+L),J)),512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,a.length-=L),a.length))break e;a.length=0,a.mode=16186;case 16186:if(2048&a.flags){if(0===d)break e;L=0;do{J=o[l+L++],a.head&&J&&a.length<65536&&(a.head.name+=String.fromCharCode(J))}while(J&&L<d);if(512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,J)break e}else a.head&&(a.head.name=null);a.length=0,a.mode=16187;case 16187:if(4096&a.flags){if(0===d)break e;L=0;do{J=o[l+L++],a.head&&J&&a.length<65536&&(a.head.comment+=String.fromCharCode(J))}while(J&&L<d);if(512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,J)break e}else a.head&&(a.head.comment=null);a.mode=16188;case 16188:if(512&a.flags){for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(4&a.wrap&&B!==(65535&a.check)){e.msg="header crc mismatch",a.mode=D;break}B=0,N=0}a.head&&(a.head.hcrc=a.flags>>9&1,a.head.done=!0),e.adler=a.check=0,a.mode=A;break;case 16189:for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}e.adler=a.check=I(B),B=0,N=0,a.mode=R;case R:if(0===a.havedict)return e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,_;e.adler=a.check=1,a.mode=A;case A:if(i===w||i===b)break e;case Z:if(a.last){B>>>=7&N,N-=7&N,a.mode=U;break}for(;N<3;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}switch(a.last=1&B,N-=1,3&(B>>>=1)){case 0:a.mode=16193;break;case 1:if(K(a),a.mode=T,i===b){B>>>=2,N-=2;break e}break;case 2:a.mode=16196;break;case 3:e.msg="invalid block type",a.mode=D}B>>>=2,N-=2;break;case 16193:for(B>>>=7&N,N-=7&N;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if((65535&B)!=(B>>>16^65535)){e.msg="invalid stored block lengths",a.mode=D;break}if(a.length=65535&B,B=0,N=0,a.mode=S,i===b)break e;case S:a.mode=16195;case 16195:if(L=a.length){if(L>d&&(L=d),L>c&&(L=c),0===L)break e;s.set(o.subarray(l,l+L),f),d-=L,l+=L,c-=L,f+=L,a.length-=L;break}a.mode=A;break;case 16196:for(;N<14;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(a.nlen=257+(31&B),B>>>=5,N-=5,a.ndist=1+(31&B),B>>>=5,N-=5,a.ncode=4+(15&B),B>>>=4,N-=4,a.nlen>286||a.ndist>30){e.msg="too many length or distance symbols",a.mode=D;break}a.have=0,a.mode=16197;case 16197:for(;a.have<a.ncode;){for(;N<3;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.lens[ie[a.have++]]=7&B,B>>>=3,N-=3}for(;a.have<19;)a.lens[ie[a.have++]]=0;if(a.lencode=a.lendyn,a.lenbits=7,V={bits:a.lenbits},Q=h(0,a.lens,0,19,a.lencode,0,a.work,V),a.lenbits=V.bits,Q){e.msg="invalid code lengths set",a.mode=D;break}a.have=0,a.mode=16198;case 16198:for(;a.have<a.nlen+a.ndist;){for(;Y=(ee=a.lencode[B&(1<<a.lenbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(G<16)B>>>=j,N-=j,a.lens[a.have++]=G;else{if(16===G){for($=j+2;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(B>>>=j,N-=j,0===a.have){e.msg="invalid bit length repeat",a.mode=D;break}J=a.lens[a.have-1],L=3+(3&B),B>>>=2,N-=2}else if(17===G){for($=j+3;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}N-=j,J=0,L=3+(7&(B>>>=j)),B>>>=3,N-=3}else{for($=j+7;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}N-=j,J=0,L=11+(127&(B>>>=j)),B>>>=7,N-=7}if(a.have+L>a.nlen+a.ndist){e.msg="invalid bit length repeat",a.mode=D;break}for(;L--;)a.lens[a.have++]=J}}if(a.mode===D)break;if(0===a.lens[256]){e.msg="invalid code -- missing end-of-block",a.mode=D;break}if(a.lenbits=9,V={bits:a.lenbits},Q=h(1,a.lens,0,a.nlen,a.lencode,0,a.work,V),a.lenbits=V.bits,Q){e.msg="invalid literal/lengths set",a.mode=D;break}if(a.distbits=6,a.distcode=a.distdyn,V={bits:a.distbits},Q=h(2,a.lens,a.nlen,a.ndist,a.distcode,0,a.work,V),a.distbits=V.bits,Q){e.msg="invalid distances set",a.mode=D;break}if(a.mode=T,i===b)break e;case T:a.mode=O;case O:if(d>=6&&c>=258){e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,r(e,F),f=e.next_out,s=e.output,c=e.avail_out,l=e.next_in,o=e.input,d=e.avail_in,B=a.hold,N=a.bits,a.mode===A&&(a.back=-1);break}for(a.back=0;Y=(ee=a.lencode[B&(1<<a.lenbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(Y&&0==(240&Y)){for(X=j,W=Y,q=G;Y=(ee=a.lencode[q+((B&(1<<X+W)-1)>>X)])>>>16&255,G=65535&ee,!(X+(j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}B>>>=X,N-=X,a.back+=X}if(B>>>=j,N-=j,a.back+=j,a.length=G,0===Y){a.mode=16205;break}if(32&Y){a.back=-1,a.mode=A;break}if(64&Y){e.msg="invalid literal/length code",a.mode=D;break}a.extra=15&Y,a.mode=16201;case 16201:if(a.extra){for($=a.extra;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.length+=B&(1<<a.extra)-1,B>>>=a.extra,N-=a.extra,a.back+=a.extra}a.was=a.length,a.mode=16202;case 16202:for(;Y=(ee=a.distcode[B&(1<<a.distbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(0==(240&Y)){for(X=j,W=Y,q=G;Y=(ee=a.distcode[q+((B&(1<<X+W)-1)>>X)])>>>16&255,G=65535&ee,!(X+(j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}B>>>=X,N-=X,a.back+=X}if(B>>>=j,N-=j,a.back+=j,64&Y){e.msg="invalid distance code",a.mode=D;break}a.offset=G,a.extra=15&Y,a.mode=16203;case 16203:if(a.extra){for($=a.extra;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.offset+=B&(1<<a.extra)-1,B>>>=a.extra,N-=a.extra,a.back+=a.extra}if(a.offset>a.dmax){e.msg="invalid distance too far back",a.mode=D;break}a.mode=16204;case 16204:if(0===c)break e;if(L=F-c,a.offset>L){if((L=a.offset-L)>a.whave&&a.sane){e.msg="invalid distance too far back",a.mode=D;break}L>a.wnext?(L-=a.wnext,M=a.wsize-L):M=a.wnext-L,L>a.length&&(L=a.length),H=a.window}else H=s,M=f-a.offset,L=a.length;L>c&&(L=c),c-=L,a.length-=L;do{s[f++]=H[M++]}while(--L);0===a.length&&(a.mode=O);break;case 16205:if(0===c)break e;s[f++]=a.length,c--,a.mode=O;break;case U:if(a.wrap){for(;N<32;){if(0===d)break e;d--,B|=o[l++]<<N,N+=8}if(F-=c,e.total_out+=F,a.total+=F,4&a.wrap&&F&&(e.adler=a.check=a.flags?n(a.check,s,F,f-F):t(a.check,s,F,f-F)),F=c,4&a.wrap&&(a.flags?B:I(B))!==a.check){e.msg="incorrect data check",a.mode=D;break}B=0,N=0}a.mode=16207;case 16207:if(a.wrap&&a.flags){for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(4&a.wrap&&B!==(4294967295&a.total)){e.msg="incorrect length check",a.mode=D;break}B=0,N=0}a.mode=16208;case 16208:Q=k;break e;case D:Q=g;break e;case 16210:return p;default:return v}return e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,(a.wsize||F!==e.avail_out&&a.mode<D&&(a.mode<U||i!==u))&&P(e,e.output,e.next_out,F-e.avail_out),C-=e.avail_in,F-=e.avail_out,e.total_in+=C,e.total_out+=F,a.total+=F,4&a.wrap&&F&&(e.adler=a.check=a.flags?n(a.check,s,F,e.next_out-F):t(a.check,s,F,e.next_out-F)),e.data_type=a.bits+(a.last?64:0)+(a.mode===A?128:0)+(a.mode===T||a.mode===S?256:0),(0===C&&0===F||i===u)&&Q===m&&(Q=y),Q},inflateEnd:function(e){if(z(e))return v;var t=e.state;return t.window&&(t.window=null),e.state=null,m},inflateGetHeader:function(e,t){if(z(e))return v;var i=e.state;return 0==(2&i.wrap)?v:(i.head=t,t.done=!1,m)},inflateSetDictionary:function(e,i){var n,a=i.length;return z(e)||0!==(n=e.state).wrap&&n.mode!==R?v:n.mode===R&&t(1,i,a,0)!==n.check?g:P(e,i,a,a)?(n.mode=16210,p):(n.havedict=1,m)},inflateInfo:"pako inflate (from Nodeca project)"};function G(e){return G="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},G(e)}var X=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},W=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var i=t.shift();if(i){if("object"!==G(i))throw new TypeError(i+"must be non-object");for(var n in i)X(i,n)&&(e[n]=i[n])}}return e},q=function(e){for(var t=0,i=0,n=e.length;i<n;i++)t+=e[i].length;for(var a=new Uint8Array(t),r=0,o=0,s=e.length;r<s;r++){var l=e[r];a.set(l,o),o+=l.length}return a},J=!0;try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){J=!1}for(var Q=new Uint8Array(256),V=0;V<256;V++)Q[V]=V>=252?6:V>=248?5:V>=240?4:V>=224?3:V>=192?2:1;Q[254]=Q[254]=1;var $=function(e){if("function"==typeof TextEncoder&&TextEncoder.prototype.encode)return(new TextEncoder).encode(e);var t,i,n,a,r,o=e.length,s=0;for(a=0;a<o;a++)55296==(64512&(i=e.charCodeAt(a)))&&a+1<o&&56320==(64512&(n=e.charCodeAt(a+1)))&&(i=65536+(i-55296<<10)+(n-56320),a++),s+=i<128?1:i<2048?2:i<65536?3:4;for(t=new Uint8Array(s),r=0,a=0;r<s;a++)55296==(64512&(i=e.charCodeAt(a)))&&a+1<o&&56320==(64512&(n=e.charCodeAt(a+1)))&&(i=65536+(i-55296<<10)+(n-56320),a++),i<128?t[r++]=i:i<2048?(t[r++]=192|i>>>6,t[r++]=128|63&i):i<65536?(t[r++]=224|i>>>12,t[r++]=128|i>>>6&63,t[r++]=128|63&i):(t[r++]=240|i>>>18,t[r++]=128|i>>>12&63,t[r++]=128|i>>>6&63,t[r++]=128|63&i);return t},ee=function(e,t){var i,n,a=t||e.length;if("function"==typeof TextDecoder&&TextDecoder.prototype.decode)return(new TextDecoder).decode(e.subarray(0,t));var r=new Array(2*a);for(n=0,i=0;i<a;){var o=e[i++];if(o<128)r[n++]=o;else{var s=Q[o];if(s>4)r[n++]=65533,i+=s-1;else{for(o&=2===s?31:3===s?15:7;s>1&&i<a;)o=o<<6|63&e[i++],s--;s>1?r[n++]=65533:o<65536?r[n++]=o:(o-=65536,r[n++]=55296|o>>10&1023,r[n++]=56320|1023&o)}}}return function(e,t){if(t<65534&&e.subarray&&J)return String.fromCharCode.apply(null,e.length===t?e:e.subarray(0,t));for(var i="",n=0;n<t;n++)i+=String.fromCharCode(e[n]);return i}(r,n)},te=function(e,t){(t=t||e.length)>e.length&&(t=e.length);for(var i=t-1;i>=0&&128==(192&e[i]);)i--;return i<0||0===i?t:i+Q[e[i]]>t?i:t},ie={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"};var ne=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0};var ae=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1},re=Object.prototype.toString,oe=c.Z_NO_FLUSH,se=c.Z_FINISH,le=c.Z_OK,fe=c.Z_STREAM_END,de=c.Z_NEED_DICT,he=c.Z_STREAM_ERROR,ce=c.Z_DATA_ERROR,ue=c.Z_MEM_ERROR;function we(e){this.options=W({chunkSize:65536,windowBits:15,to:""},e||{});var t=this.options;t.raw&&t.windowBits>=0&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(t.windowBits>=0&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),t.windowBits>15&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new ne,this.strm.avail_out=0;var i=Y.inflateInit2(this.strm,t.windowBits);if(i!==le)throw new Error(ie[i]);if(this.header=new ae,Y.inflateGetHeader(this.strm,this.header),t.dictionary&&("string"==typeof t.dictionary?t.dictionary=$(t.dictionary):"[object ArrayBuffer]"===re.call(t.dictionary)&&(t.dictionary=new Uint8Array(t.dictionary)),t.raw&&(i=Y.inflateSetDictionary(this.strm,t.dictionary))!==le))throw new Error(ie[i])}function be(e,t){var i=new we(t);if(i.push(e),i.err)throw i.msg||ie[i.err];return i.result}we.prototype.push=function(e,t){var i,n,a,r=this.strm,o=this.options.chunkSize,s=this.options.dictionary;if(this.ended)return!1;for(n=t===~~t?t:!0===t?se:oe,"[object ArrayBuffer]"===re.call(e)?r.input=new Uint8Array(e):r.input=e,r.next_in=0,r.avail_in=r.input.length;;){for(0===r.avail_out&&(r.output=new Uint8Array(o),r.next_out=0,r.avail_out=o),(i=Y.inflate(r,n))===de&&s&&((i=Y.inflateSetDictionary(r,s))===le?i=Y.inflate(r,n):i===ce&&(i=de));r.avail_in>0&&i===fe&&r.state.wrap>0&&0!==e[r.next_in];)Y.inflateReset(r),i=Y.inflate(r,n);switch(i){case he:case ce:case de:case ue:return this.onEnd(i),this.ended=!0,!1}if(a=r.avail_out,r.next_out&&(0===r.avail_out||i===fe))if("string"===this.options.to){var l=te(r.output,r.next_out),f=r.next_out-l,d=ee(r.output,l);r.next_out=f,r.avail_out=o-f,f&&r.output.set(r.output.subarray(l,l+f),0),this.onData(d)}else this.onData(r.output.length===r.next_out?r.output:r.output.subarray(0,r.next_out));if(i!==le||0!==a){if(i===fe)return i=Y.inflateEnd(this.strm),this.onEnd(i),this.ended=!0,!0;if(0===r.avail_in)break}}return!0},we.prototype.onData=function(e){this.chunks.push(e)},we.prototype.onEnd=function(e){e===le&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=q(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg};var me=we,ke=be,_e=function(e,t){return(t=t||{}).raw=!0,be(e,t)},ve=be,ge=c,pe={Inflate:me,inflate:ke,inflateRaw:_e,ungzip:ve,constants:ge};e.Inflate=me,e.constants=ge,e.default=pe,e.inflate=ke,e.inflateRaw=_e,e.ungzip=ve,Object.defineProperty(e,"__esModule",{value:!0})}));
addEventListener("message", function(o) { try { postMessage({ status: "success", data: pako.inflate(o.data, { to: "arraybuffer" }) }); } catch(ex) { logger.error(ex); postMessage({ status: "error" }); } });
postMessage({ status: "ready" });";
+			if(soSupported) {
+				theWorkerObj = new Worker(URL.createObjectURL(new Blob([base64js.toByteArray(workerSrc).buffer], { type: "text/javascript" })));
+			}else {
+				theWorkerObj = new Worker("data:text/javascript;base64," + workerSrc);
+			}
+			theWorkerObj.addEventListener("message", function(evt) {
+				if(evt.data.status === "ready") {
+					decodeBase64URL(window.eaglercraftXClientBundle, function(cbData) {
+						if(cbData) {
+							theWorkerObj.postMessage(cbData);
+						}else {
+							alert("Failed to decode eaglercraftXClientBundle base64!");
+						}
+					});
+				}else if(evt.data.status === "success") {
+					if(soSupported) {
+						window.clientScriptSrcURL = URL.createObjectURL(new Blob([evt.data.data.buffer], { type: "text/javascript;charset=utf-8" }));
+					}else {
+						window.clientScriptSrcURL = "data:text/javascript;charset=utf-8;base64," + base64js.fromByteArray(evt.data.data);
+					}
+				}else {
+					alert("Failed to decompress classes.js via legacy javascript implementation!");
+				}
+			});
+			theWorkerObj.addEventListener("error", function(evt) {
+				console.error(evt.error);
+			});
+		});
+	}else {
+		var ds = new window.DecompressionStream("gzip");
+		var result = [];
+		var fetchStream = function(reader) {
+			var processData;
+			reader.read().then(processData = function(evt) {
+				if (evt.done) {
+					(function(blobObj){
+						checkSameOriginSupport(function(supported) {
+							if(supported) {
+								window.clientScriptSrcURL = URL.createObjectURL(blobObj);
+							}else {
+								blobToArrayBuffer(blobObj, function(arr) {
+									console.log(arr);
+									window.clientScriptSrcURL = "data:text/javascript;charset=utf-8;base64," + base64js.fromByteArray(new Uint8Array(arr));
+								});
+							}
+						});
+					})(new Blob(result, { type: "text/javascript;charset=utf-8" }));
+					result = [];
+					ds = null;
+					return;
+				}
+				result.push(evt.value);
+				return reader.read().then(processData);
+			});
+		};
+		decodeBase64URL(window.eaglercraftXClientBundle, function(cbData) {
+			if(cbData) {
+				fetchStream((new Blob([cbData])).stream().pipeThrough(ds).getReader());
+			}else {
+				alert("Failed to decode eaglercraftXClientBundle base64!");
+			}
+		});
+	}
+})();
+</script>
+<script type="text/javascript">
+"use strict";
+(function(){
+	var launchInterval = -1;
+	var launchCounter = 1;
+	var launchCountdownNumberElement = null;
+	var launchCountdownProgressElement = null;
+	var launchSkipCountdown = false;
+	var launchTick = function() {
+		if(launchCounter > 100 || launchSkipCountdown) {
+			if(window.clientScriptSrcURL) {
+				clearInterval(launchInterval);
+				setTimeout(function() {
+					document.body.removeChild(document.getElementById("launch_countdown_screen"));
+					document.body.style.backgroundColor = "black";
+					var script = document.createElement("script");
+					script.type = "text/javascript";
+					script.src = window.clientScriptSrcURL;
+					window.clientScriptSrcURL = null;
+					document.head.appendChild(script);
+				}, 50);
+			}
+			return;
+		}
+		if(launchCounter === 100) {
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+		}else {
+			launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
+		}
+		launchCountdownProgressElement.style.width = "" + launchCounter + "%";
+		++launchCounter;
+	};
+	window.addEventListener("load", function() {
+		launchCountdownNumberElement = document.getElementById("launchCountdownNumber");
+		launchCountdownProgressElement = document.getElementById("launchCountdownProgress");
+		launchInterval = setInterval(launchTick, 50);
+		document.getElementById("skipCountdown").addEventListener("click", function() {
+			launchSkipCountdown = true;
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+		});
+		document.getElementById("bootMenu").addEventListener("click", function() {
+			launchSkipCountdown = true;
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+			window.eaglercraftXOptsHints.showBootMenuOnLaunch = true;
+		});
+	});
+})();
+</script>
+<link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
+</head>
+<body style="margin:0px;width:100%;height:100%;overflow:hidden;background-color:white;" id="game_frame">
+<div style="margin:0px;width:100%;height:100%;font-family:sans-serif;display:flex;align-items:center;user-select:none;" id="launch_countdown_screen">
+<div style="margin:auto;text-align:center;">
+<h1>${client_name_or_origin_date}</h1>
+<h2 id="gameWillLaunchIn">Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
+<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div>
+<p style="margin-top:30px;"><button id="skipCountdown" autofocus>Skip Countdown</button>&emsp;<button id="bootMenu">Enter Boot Menu</button></p></div>
+</div>
+</div>
+</body>
+</html>
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraft_1_5.html b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraft_1_5.html
new file mode 100755
index 0000000..d50f5ac
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraft_1_5.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+
+<!--
+
+This file is from ${date}, it was generated using EaglercraftX 1.8 boot manager
+
+-->
+
+<html style="width:100%;height:100%;">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>My Drive - Google Drive</title>
+
+<style type="eaglercraftOfflineParseHint">{"type":"EAGLERCRAFT_1_5_NEW_OFFLINE","launchConf":${launch_conf_json}}</style>
+
+<script type="text/javascript">
+window.addEventListener("load", function() {
+	countdown();
+	setTimeout(function(){
+		document.getElementById("locally").remove();
+		const relayIdMax = ${relayId_max};
+		const relayId = relayIdMax > 1 ? Math.floor(Math.random() * relayIdMax) : 0;
+		window.eaglercraftOpts = ${launch_opts};
+		window.eaglercraftOpts.container = "game_frame";
+		window.eaglercraftOpts.assetsURI = getAssetsURI();
+		window.eaglercraftOpts.serverWorkerURI = createWorkerURI("sp_worker");
+		main();
+	}, 6000);
+});
+</script>
+
+<script type="text/javascript">
+function getAssetsURI() {
+	return "data:application/octet-stream;base64,${assets_epk}";
+}
+</script>
+
+<script type="text/javascript">
+function createWorkerURI(el) {
+	var eee = document.getElementById(el);
+	var str = eee.innerHTML;
+	eee.remove();
+	str = "\"use strict\";var eaglercraftServerOpts;onmessage = function(o) { eaglercraftServerOpts = o.data; main(); };" + str;
+	return URL.createObjectURL(new Blob([str], {type:"text/javascript"}));
+}
+</script>
+
+<link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAGAUlEQVRYw7VXa0xTZxj+oKjJNjWZ10EtZqIQjBdsT2utlZYiMsfiZltUtpiYOZ0zceOmcZfsGLmoQ25hS1jmNJpBL1xEuWwZGduPjW0xcVniLn/YfmlrK6wDRulpz7v3O+1BCgUs4pc8+U5Ov6/P877v837nHEKiGzHEZpYQVhcXEfQ3uuaJjOCfP9pSG5E8GXIzmS+r0Rtk1bqcxCrti+NB76XVaA3EzM6fUxHmELmm7bXkjVde6pPV6WD1x/owyBDrEaTOAD9fTeqDLpJM98CciIBgTRVW0211Rx4k1WWOSiu0flnlDgGrEBsQpELnZz9hRuErAqNNMb8IW+Ex/SCvPzJPILebjm69eQAYm8m7+doeWHVRC0guIBGxDkEupsPfDSsBmokXumLB10TeFETUk3mPFbmq89VFCovJxdhNIG80BhirCVLqd4G0Yjtg9LC5UgvkIx1c/XQTJQevXRLgWwj47MSFJVg860yMRW81VW1tPwCKRqNPYTECxZaGV2B1VTqswUw8jZFrq7ZDv/UZ8Ddh+u0xCOKDL1FEM6maVRZE46ls5lSFNUiK4IW50Qg0C6mXdsPmCg2QCj10f54iRD9il1Bymn6ezhwVZCOpURtSFIDkHaob+yk5J0YvQoMg1YbA0RpVwGsnAvEEcNAhiOiISoCuB080HEqLKUfVti8iOcU2qylArr0MfzTIaPQoQjJJBGZCEOG3kxxBRA+Jm/moDQ2M/jdlSy4l808kZ1DUdswMseW2IHkLdCI5kkXIgh/aaFuS3x96expDisaTW4wFE403DtQLvBa7gjS/nogCEgMt4bWfAMGQWIqC6Q3JsrF0SrOZl2HbebDnHxpvPFAUFYciq8WtSFxNSShZBAG8v1kQ50EfLBNEsCQ2QvTyYNtZjPVC9JaI0QfoeYDlcctt5sVjaf2aLEYCd6j/AxGz0IVeaCb1dP2tiVkQXS+37NvC2M1ItJePZDwqiopjbMZjwsYeNk40Fgo4RkmmyIKQCWgl1LBbJnUFC8H0Y2TfTON8v7IVTYnPhImGFY2FIm7DjaD5JgmgHdEuZKgndDrGhrUdYzXmBnt+LzdF9ChgH2AJDMI+VjfWUlhT4ZprJQa4OYUA8WzoFMTkhrVlUm3tAoUlr49pysPzfn9A0YhCwoGpP4gi8q7T9S/Udi4w20CiY3viKAhed+I9+pvXvu46dD0HPhuWwhYLExCAVpztsX1Qm7RgrASMfdMhdZcWa7vNh4BwqHllkwYUNqUnpZssmfEZ9hNZgrX2+NsWga+V8AgIQwsashsNeZ0cGtuUVP49m1x9B9aW9/qSynshqfyHEHrpPf758z+C4vyduzvLfA0ZZcOthnJvU0bZf83jocd7e8oGW8k5+OJbtuHuaAGBB/lKfiA/FQby10NwToV/8tf74PRG8BSlsmMClr41ol9ZNAorTvT7V7zdDyJWIpaf6AfZOwO8vsQPu6oAsi5OjWyEAdfknBmCv3Yc5N1pa8HBaMCpUD0Eo/IPKdXgStDoxR4U2iGh2HFD+t4wxBfd4xKK7tEZpIhlhXdBxfZDZvkQry8d4jJKh6fF7pJ/uacucPxnhb3g2UHAma2D+1kKBAOuLIbz7t4Krl3MTeG9kdD2DwmIP+lKji908vGFDkDwCTgvL7gH6065wFA6BBlRIAuxoWwEfs1lYYCKyNSCy8Dw9w0MULiz5CnBd13xTfvILeFkii92VkjfH0UBTh8VsKLAAZozHjCUDUclILtkENaUj8KZ03/Cg3QJ3M/UUGIfl62mQiqE01AuH3caAggHydKTroXxRU6ntNgNSwscgQ3vuiETyfVRZoACSwGScxx8d+gSeDQk4M7SU3KnS6NZGPmpGMqCtNh1OOEDPyQUOUbSzw5yBqG2Q1FjZ8kgx5SNcG986OAcmeoRyE4D107t4cnRhzVxMBPPFjra1RfQ1ZUhh1fODntwL6kB6D51C4bUpH3G9wFRAF7E6EqHj2Ptr2A0l9HdswKa97IW/2P/Wc9xkRhm/HYcEzH3Ax79wxUzwELcXIFFwBP7an7M8T8H1bLLDGWzFAAAAABJRU5ErkJggg==" />
+
+<script type="text/javascript">
+"use strict";
+${classes_js}
+</script>
+
+<script type="text/eaglerworker" id="sp_worker">
+${classes_server_js}
+</script>
+
+<script type="text/javascript">
+function countdown() {
+	const c = document.getElementById("countdown");
+	setTimeout(function(){ c.innerText = "(Game will launch in 4)"; }, 1000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 3)"; }, 2000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 2)"; }, 3000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 1)"; }, 4000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 0)"; }, 5000);
+}
+</script>
+</head>
+<body style="margin:0px;width:100%;height:100%;font-family:sans-serif;overflow:hidden;" id="game_frame">
+<div id="locally" style="text-align:center;">
+<div style="height:5vh;"></div>
+<h2>${client_name}</h2>
+<p id="countdown" style="text-align:center;">(Game will launch in 5)</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraft_1_5_legacy.html b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraft_1_5_legacy.html
new file mode 100755
index 0000000..abe0860
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraft_1_5_legacy.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+
+<!--
+
+This file is from ${date}, it was generated using EaglercraftX 1.8 boot manager
+
+-->
+
+<html style="width:100%;height:100%;">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>${client_name}</title>
+
+<style type="eaglercraftOfflineParseHint">{"type":"EAGLERCRAFT_1_5_OLD_OFFLINE","launchConf":${launch_conf_json}}</style>
+
+<script type="text/javascript">
+window.addEventListener("load", function() {
+	countdown();
+	setTimeout(function(){
+		document.getElementById("locally").remove();
+		window.minecraftOpts = [ "game_frame", getAssetsURI(), "${launch_opts}" ];
+		main();
+	}, 6000);
+});
+</script>
+
+<script type="text/javascript">
+function getAssetsURI() {
+	return "data:application/octet-stream;base64,${assets_epk}";
+}
+</script>
+
+<link type="image/x-icon" rel="shortcut icon" href="data:image/x-icon;base64,AAABAAEAICAQAAEABADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAd3d3d3d3d3d3d3d3d3d3cHiIiIiIiIiIiIiIiIiIiHB4f/////////////////hweH/////////////////4cHh/////cAAHiI//////+HB4f///8REREAiIj/////hweH///3GNmREHAAAIiI/4cHh///8Y2ZmREHeqoIiI+HB4f///GNmZmRB3qqIIiIhweH///xjZmZkQd6qiIIiIcHh///8Y2ZmZEHqqoiD/+HB4f///cY2ZmRd6qqIg//hweH////EY2ZEXqqqiIP/4cHh/////cREXL6qqoiD/+HB4f////////y////Ig//hweH/////////yIiIoIP/4cHh//////////yIiIoD/+HB4f//////////yIiIn//hweH/////////////////4cHh/////////////////+HB4d3d3d3d3d3d3d3d3d3hweIiIiIiIiIiIiIiIiIiIcHhMwiRERERERERAAAAAAHB4TsokRERERERESICICIBweEETNEREREREREiAiAiAcHhJGzRERERERERERERERHB4iIiIiIiIiIiIiIiIiIhwd3d3d3d3d3d3d3d3d3d3cAAAAAAAAAAAAAAAAAAAAAD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////w==" />
+
+<script type="text/javascript">
+"use strict";
+${classes_js}
+</script>
+
+<script type="text/javascript">
+function countdown() {
+	const c = document.getElementById("countdown");
+	setTimeout(function(){ c.innerText = "(Game will launch in 4)"; }, 1000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 3)"; }, 2000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 2)"; }, 3000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 1)"; }, 4000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 0)"; }, 5000);
+}
+</script>
+</head>
+<body style="margin:0px;width:100%;height:100%;font-family:sans-serif;overflow:hidden;" id="game_frame">
+<div id="locally" style="text-align:center;">
+<div style="height:5vh;"></div>
+<h2>${client_name}</h2>
+<p id="countdown" style="text-align:center;">(Game will launch in 5)</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraft_b1_3.html b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraft_b1_3.html
new file mode 100755
index 0000000..ef90700
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_eaglercraft_b1_3.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+
+<!--
+
+This file is from ${date}, it was generated using EaglercraftX 1.8 boot manager
+
+-->
+
+<html style="width:100%;height:100%;">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>${client_name}</title>
+
+<style type="eaglercraftOfflineParseHint">{"type":"EAGLERCRAFT_BETA_B1_3_OFFLINE","launchConf":${launch_conf_json}}</style>
+
+<script type="text/javascript">
+window.addEventListener("load", function() {
+	countdown();
+	setTimeout(function(){
+		document.getElementById("locally").remove();
+		window.minecraftOpts = [ "game_frame", getAssetsURI() ];
+		main();
+	}, 6000);
+});
+</script>
+
+<script type="text/javascript">
+function getAssetsURI() {
+	return "data:application/octet-stream;base64,${assets_epk}";
+}
+</script>
+
+<link type="image/x-icon" rel="shortcut icon" href="data:image/x-icon;base64,AAABAAEAICAQAAEABADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAd3d3d3d3d3d3d3d3d3d3cHiIiIiIiIiIiIiIiIiIiHB4f/////////////////hweH/////////////////4cHh/////cAAHiI//////+HB4f///8REREAiIj/////hweH///3GNmREHAAAIiI/4cHh///8Y2ZmREHeqoIiI+HB4f///GNmZmRB3qqIIiIhweH///xjZmZkQd6qiIIiIcHh///8Y2ZmZEHqqoiD/+HB4f///cY2ZmRd6qqIg//hweH////EY2ZEXqqqiIP/4cHh/////cREXL6qqoiD/+HB4f////////y////Ig//hweH/////////yIiIoIP/4cHh//////////yIiIoD/+HB4f//////////yIiIn//hweH/////////////////4cHh/////////////////+HB4d3d3d3d3d3d3d3d3d3hweIiIiIiIiIiIiIiIiIiIcHhMwiRERERERERAAAAAAHB4TsokRERERERESICICIBweEETNEREREREREiAiAiAcHhJGzRERERERERERERERHB4iIiIiIiIiIiIiIiIiIhwd3d3d3d3d3d3d3d3d3d3cAAAAAAAAAAAAAAAAAAAAAD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////w==" />
+
+<script type="text/javascript">
+"use strict";
+${classes_js}
+</script>
+
+<script type="text/javascript">
+function countdown() {
+	const c = document.getElementById("countdown");
+	setTimeout(function(){ c.innerText = "(Game will launch in 4)"; }, 1000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 3)"; }, 2000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 2)"; }, 3000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 1)"; }, 4000);
+	setTimeout(function(){ c.innerText = "(Game will launch in 0)"; }, 5000);
+}
+</script>
+</head>
+<body style="margin:0px;width:100%;height:100%;font-family:sans-serif;overflow:hidden;" id="game_frame">
+<div id="locally" style="text-align:center;">
+<div style="height:5vh;"></div>
+<h2>${client_name}</h2>
+<p id="countdown" style="text-align:center;">(Game will launch in 5)</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_peytonplayz585_a_b.html b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_peytonplayz585_a_b.html
new file mode 100755
index 0000000..1058fa0
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_peytonplayz585_a_b.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+
+<!--
+
+This file is from ${date}, it was generated using EaglercraftX 1.8 boot manager
+
+-->
+
+<html style="width:100%;height:100%;">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>${client_name}</title>
+
+<style type="eaglercraftOfflineParseHint">{"type":"PEYTONPLAYZ585_ALPHA_BETA","launchConf":${launch_conf_json}}</style>
+
+<script type="text/javascript">
+window.addEventListener("load", function() {
+	window.config = ${launch_opts};
+	window.config.gameContainer = "game_frame";
+	window.config.assetsLocation = getAssetsURI();
+	main();
+});
+</script>
+
+<script type="text/javascript">
+function getAssetsURI() {
+	return "data:application/octet-stream;base64,${assets_epk}";
+}
+</script>
+
+<script type="text/javascript">
+"use strict";
+${classes_js}
+</script>
+
+</head>
+<body style="margin:0px;width:100%;height:100%;overflow:hidden;" id="game_frame">
+</body>
+</html>
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_peytonplayz585_indev.html b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_peytonplayz585_indev.html
new file mode 100755
index 0000000..f28bb11
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_peytonplayz585_indev.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+
+<!--
+
+This file is from ${date}, it was generated using EaglercraftX 1.8 boot manager
+
+-->
+
+<html style="width:100%;height:100%;">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>${client_name}</title>
+
+<style type="eaglercraftOfflineParseHint">{"type":"PEYTONPLAYZ585_INDEV","launchConf":${launch_conf_json}}</style>
+
+<script type="text/javascript">
+window.addEventListener("load", function() {
+	window.classicConfig = [ "game_frame", getAssetsURI() ];
+	main();
+});
+</script>
+
+<script type="text/javascript">
+function getAssetsURI() {
+	return "data:application/octet-stream;base64,${assets_epk}";
+}
+</script>
+
+<script type="text/javascript">
+"use strict";
+${classes_js}
+</script>
+
+</head>
+<body style="margin:0px;width:100%;height:100%;overflow:hidden;" id="game_frame">
+</body>
+</html>
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_standard_offline.html b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_standard_offline.html
new file mode 100755
index 0000000..e0f0377
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/offline_template_standard_offline.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+
+<!--
+
+This file is from ${date}, it was generated using EaglercraftX 1.8 boot manager
+
+-->
+
+<html style="width:100%;height:100%;">
+<head>
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<meta name="description" content="${client_name}" />
+<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
+<title>${client_name}</title>
+<meta property="og:locale" content="en-US" />
+<meta property="og:type" content="website" />
+<meta property="og:title" content="${client_name}" />
+<meta property="og:description" content="this file is not a website, whoever uploaded it to this URL is a dumbass" />
+<style type="eaglercraftOfflineParseHint">{"type":"EXPORTED_STANDARD_OFFLINE","launchConf":${launch_conf_json}}</style>
+<script type="text/javascript">
+"use strict";
+const relayIdMax = ${relayId_max};
+const relayId = relayIdMax > 1 ? Math.floor(Math.random() * relayIdMax) : 0;
+
+// %%%%%%%%% launch options %%%%%%%%%%%%
+
+window["${launch_opts_var_name}"] = ${launch_opts};
+
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+</script>
+<script type="text/javascript">
+"use strict";
+if(typeof window !== "undefined") window.eaglercraftXClientScriptElement = document.currentScript;
+
+${classes_js}
+</script>
+<script type="text/javascript">
+"use strict";
+(function(){
+	window["${launch_opts_var_name}"]["${launch_opts_var_container_name}"] = "game_frame";
+	window["${launch_opts_var_name}"]["${launch_opts_var_assetsURI_name}"] = /*{:BEGIN_ASSETS_EPK:}*/${assets_epk}/*{:END_ASSETS_EPK:}*/;
+
+	var launchInterval = -1;
+	var launchCounter = 1;
+	var launchCountdownNumberElement = null;
+	var launchCountdownProgressElement = null;
+
+	function launchTick() {
+		launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
+		launchCountdownProgressElement.style.width = "" + launchCounter + "%";
+		if(++launchCounter > 100) {
+			clearInterval(launchInterval);
+			setTimeout(() => { document.getElementById("launch_countdown_screen").remove(); window["${main_function_name}"](); }, 50);
+		}
+	}
+
+	window.addEventListener("load", () => {
+		launchCountdownNumberElement = document.getElementById("launchCountdownNumber");
+		launchCountdownProgressElement = document.getElementById("launchCountdownProgress");
+		launchInterval = setInterval(launchTick, 50);
+	});
+})();
+</script>
+<link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
+</head>
+<body style="margin:0px;width:100%;height:100%;overflow:hidden;" id="game_frame">
+<div style="margin:0px;width:100%;height:100%;font-family:sans-serif;display:flex;align-items:center;user-select:none;" id="launch_countdown_screen">
+<div style="margin:auto;text-align:center;">
+<h1>${client_name}</h1>
+<h2>Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
+<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div></div>
+</div>
+</div>
+</body>
+</html>
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8.txt
new file mode 100755
index 0000000..bfe059b
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8.txt
@@ -0,0 +1,66 @@
+{
+	"joinServer": null,
+	"servers": [
+		{
+			"addr": "ws://localhost:8081/",
+			"hideAddr": false,
+			"name": "Local test server"
+		}
+	],
+	"relays": [
+		{
+			"addr": "wss://relay.deev.is/",
+			"primary": "$random_relay_primary_0",
+			"comment": "lax1dude relay #1"
+		},
+		{
+			"addr": "wss://relay.lax1dude.net/",
+			"primary": "$random_relay_primary_1",
+			"comment": "lax1dude relay #2"
+		},
+		{
+			"addr": "wss://relay.shhnowisnottheti.me/",
+			"primary": "$random_relay_primary_2",
+			"comment": "ayunami relay #1"
+		}
+	],
+	"openDebugConsoleOnLaunch": false,
+	"showBootMenuOnLaunch": false,
+	"bootMenuBlocksUnsignedClients": false,
+	"allowBootMenu": true,
+	"forceWebViewSupport": false,
+	"enableServerCookies": true,
+	"enableDownloadOfflineButton": true,
+	"resourcePacksDB": "resourcePacks",
+	"enableWebViewCSP": true,
+	"checkRelaysForUpdates": true,
+	"allowServerRedirects": true,
+	"allowUpdateSvc": true,
+	"html5CursorSupport": false,
+	"allowFNAWSkins": true,
+	"allowVoiceClient": true,
+	"worldsDB": "worlds",
+	"demoMode": false,
+	"localStorageNamespace": "_eaglercraftX",
+	"enableSignatureBadge": false,
+	"lang": "en_US",
+	"enableMinceraft": true,
+	"autoFixLegacyStyleAttr": true,
+	"allowUpdateDL": true,
+	"logInvalidCerts": false,
+	"checkShaderGLErrors": false,
+	"crashOnUncaughtExceptions": false,
+	"forceWebGL1": false,
+	"forceWebGL2": false,
+	"allowExperimentalWebGL1": true,
+	"useWebGLExt": true,
+	"useDelayOnSwap": false,
+	"useJOrbisAudioDecoder": false,
+	"useXHRFetch": false,
+	"useVisualViewport": true,
+	"deobfStackTraces": true,
+	"disableBlobURLs": false,
+	"eaglerNoDelay": false,
+	"ramdiskMode": false,
+	"singleThreadMode": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8_demo.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8_demo.txt
new file mode 100755
index 0000000..00c65c3
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8_demo.txt
@@ -0,0 +1,66 @@
+{
+	"joinServer": null,
+	"servers": [
+		{
+			"addr": "ws://localhost:8081/",
+			"hideAddr": false,
+			"name": "Local test server"
+		}
+	],
+	"relays": [
+		{
+			"addr": "wss://relay.deev.is/",
+			"primary": "$random_relay_primary_0",
+			"comment": "lax1dude relay #1"
+		},
+		{
+			"addr": "wss://relay.lax1dude.net/",
+			"primary": "$random_relay_primary_1",
+			"comment": "lax1dude relay #2"
+		},
+		{
+			"addr": "wss://relay.shhnowisnottheti.me/",
+			"primary": "$random_relay_primary_2",
+			"comment": "ayunami relay #1"
+		}
+	],
+	"openDebugConsoleOnLaunch": false,
+	"showBootMenuOnLaunch": false,
+	"bootMenuBlocksUnsignedClients": false,
+	"allowBootMenu": true,
+	"forceWebViewSupport": false,
+	"enableServerCookies": true,
+	"enableDownloadOfflineButton": true,
+	"resourcePacksDB": "resourcePacks",
+	"enableWebViewCSP": true,
+	"checkRelaysForUpdates": true,
+	"allowServerRedirects": true,
+	"allowUpdateSvc": true,
+	"html5CursorSupport": false,
+	"allowFNAWSkins": true,
+	"allowVoiceClient": true,
+	"worldsDB": "worlds",
+	"demoMode": true,
+	"localStorageNamespace": "_eaglercraftX",
+	"enableSignatureBadge": false,
+	"lang": "en_US",
+	"enableMinceraft": true,
+	"autoFixLegacyStyleAttr": true,
+	"allowUpdateDL": true,
+	"logInvalidCerts": false,
+	"checkShaderGLErrors": false,
+	"crashOnUncaughtExceptions": false,
+	"forceWebGL1": false,
+	"forceWebGL2": false,
+	"allowExperimentalWebGL1": true,
+	"useWebGLExt": true,
+	"useDelayOnSwap": false,
+	"useJOrbisAudioDecoder": false,
+	"useXHRFetch": false,
+	"useVisualViewport": true,
+	"deobfStackTraces": true,
+	"disableBlobURLs": false,
+	"eaglerNoDelay": false,
+	"ramdiskMode": false,
+	"singleThreadMode": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8_html5Cursors.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8_html5Cursors.txt
new file mode 100755
index 0000000..9743e60
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8_html5Cursors.txt
@@ -0,0 +1,66 @@
+{
+	"joinServer": null,
+	"servers": [
+		{
+			"addr": "ws://localhost:8081/",
+			"hideAddr": false,
+			"name": "Local test server"
+		}
+	],
+	"relays": [
+		{
+			"addr": "wss://relay.deev.is/",
+			"primary": "$random_relay_primary_0",
+			"comment": "lax1dude relay #1"
+		},
+		{
+			"addr": "wss://relay.lax1dude.net/",
+			"primary": "$random_relay_primary_1",
+			"comment": "lax1dude relay #2"
+		},
+		{
+			"addr": "wss://relay.shhnowisnottheti.me/",
+			"primary": "$random_relay_primary_2",
+			"comment": "ayunami relay #1"
+		}
+	],
+	"openDebugConsoleOnLaunch": false,
+	"showBootMenuOnLaunch": false,
+	"bootMenuBlocksUnsignedClients": false,
+	"allowBootMenu": true,
+	"forceWebViewSupport": false,
+	"enableServerCookies": true,
+	"enableDownloadOfflineButton": true,
+	"resourcePacksDB": "resourcePacks",
+	"enableWebViewCSP": true,
+	"checkRelaysForUpdates": true,
+	"allowServerRedirects": true,
+	"allowUpdateSvc": true,
+	"html5CursorSupport": true,
+	"allowFNAWSkins": true,
+	"allowVoiceClient": true,
+	"worldsDB": "worlds",
+	"demoMode": false,
+	"localStorageNamespace": "_eaglercraftX",
+	"enableSignatureBadge": false,
+	"lang": "en_US",
+	"enableMinceraft": true,
+	"autoFixLegacyStyleAttr": true,
+	"allowUpdateDL": true,
+	"logInvalidCerts": false,
+	"checkShaderGLErrors": false,
+	"crashOnUncaughtExceptions": false,
+	"forceWebGL1": false,
+	"forceWebGL2": false,
+	"allowExperimentalWebGL1": true,
+	"useWebGLExt": true,
+	"useDelayOnSwap": false,
+	"useJOrbisAudioDecoder": false,
+	"useXHRFetch": false,
+	"useVisualViewport": true,
+	"deobfStackTraces": true,
+	"disableBlobURLs": false,
+	"eaglerNoDelay": false,
+	"ramdiskMode": false,
+	"singleThreadMode": false
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraft_1_5.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraft_1_5.txt
new file mode 100755
index 0000000..af539a9
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraft_1_5.txt
@@ -0,0 +1,52 @@
+{
+	"joinServer": null,
+	"servers": [
+		{
+			"serverName": "Local Test Server",
+			"serverAddress": "localhost:25565",
+			"hideAddress": false
+		}
+	],
+	"relays": [
+		{
+			"addr": "wss://relay.deev.is/",
+			"name": "lax1dude relay #1",
+			"primary": "$random_relay_primary_0"
+		},
+		{
+			"addr": "wss://relay.lax1dude.net/",
+			"name": "lax1dude relay #2",
+			"primary": "$random_relay_primary_1"
+		},
+		{
+			"addr": "wss://relay.shhnowisnottheti.me/",
+			"name": "ayunami relay #1",
+			"primary": "$random_relay_primary_2"
+		}
+	],
+	"mainMenu": {
+		"splashes": [
+			"Darviglet!",
+			"eaglerenophile!",
+			"You Eagler!",
+			"Yeeeeeee!",
+			"yeee",
+			"EEEEEEEEE!",
+			"You Darvig!",
+			"You Vigg!",
+			":>",
+			"|>",
+			"You Yumpster!"
+		],
+		"eaglerLogo": false,
+		"itemLink": null,
+		"itemLine0": null,
+		"itemLine1": null,
+		"itemLine2": null
+	},
+	"worldsFolder": "MAIN",
+	"profanity": false,
+	"hideDownServers": false,
+	"serverListTitle": null,
+	"serverListLink": null
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraft_1_5_legacy.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraft_1_5_legacy.txt
new file mode 100755
index 0000000..bbbefa5
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraft_1_5_legacy.txt
@@ -0,0 +1,32 @@
+[NBT]{
+	servers: [
+		{
+			name: "Local Test Server",
+			ip: "localhost:25565",
+			hideAddress: false
+		}
+	],
+	mainMenu: {
+		itemLink: "",
+		itemLine0: "",
+		itemLine1: "",
+		itemLine2: "",
+		splashes: [
+			"Darviglet!",
+			"eaglerenophile!",
+			"You Eagler!",
+			"Yeeeeeee!",
+			"yeee",
+			"EEEEEEEEE!",
+			"You Darvig!",
+			"You Vigg!",
+			":>",
+			"|>",
+			"You Yumpster!"
+		]
+	},
+	profanity: false,
+	hide_down: false,
+	serverListTitle: "",
+	serverListLink: ""
+}[/NBT]
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraft_1_5_livestream.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraft_1_5_livestream.txt
new file mode 100755
index 0000000..014eb41
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraft_1_5_livestream.txt
@@ -0,0 +1,63 @@
+{
+	"joinServer": null,
+	"servers": [
+		{
+			"serverName": "Local Test Server",
+			"serverAddress": "localhost:25565",
+			"hideAddress": false
+		}
+	],
+	"relays": [
+		{
+			"addr": "wss://relay.deev.is/",
+			"name": "lax1dude relay #1",
+			"primary": "$random_relay_primary_0"
+		},
+		{
+			"addr": "wss://relay.lax1dude.net/",
+			"name": "lax1dude relay #2",
+			"primary": "$random_relay_primary_1"
+		},
+		{
+			"addr": "wss://relay.shhnowisnottheti.me/",
+			"name": "ayunami relay #1",
+			"primary": "$random_relay_primary_2"
+		}
+	],
+	"mainMenu": {
+		"splashes": [
+			"Darviglet!",
+			"eaglerenophile!",
+			"You Eagler!",
+			"Yeeeeeee!",
+			"yeee",
+			"EEEEEEEEE!",
+			"You Darvig!",
+			"You Vigg!",
+			":>",
+			"|>",
+			"You Yumpster!"
+		],
+		"eaglerLogo": false,
+		"itemLink": null,
+		"itemLine0": null,
+		"itemLine1": null,
+		"itemLine2": null
+	},
+	"worldsFolder": "MAIN",
+	"assetOverrides": {
+		"title/no-pano-blur.flag": "false",
+		"records/wait.mp3": "wait.mp3",
+		"records/mellohi.mp3": "https://stream.nightride.fm/chillsynth.m4a",
+		"records/far.mp3": "https://stream.nightride.fm/nightride.m4a",
+		"records/cat.mp3": "http://usa9.fastcast4u.com/proxy/jamz?mp=/1",
+		"records/ward.mp3": "http://fr4.1mix.co.uk:8000/192h",
+		"records/strad.mp3": "http://listen.011fm.com:8028/stream15",
+		"records/blocks.mp3": "https://www.ophanim.net:8444/s/9780",
+		"records/13.mp3": "https://s2.radio.co/s2b2b68744/listen"
+	},
+	"profanity": false,
+	"hideDownServers": false,
+	"serverListTitle": null,
+	"serverListLink": null
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_peytonplayz585_a1_2_6.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_peytonplayz585_a1_2_6.txt
new file mode 100755
index 0000000..418a893
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_peytonplayz585_a1_2_6.txt
@@ -0,0 +1,6 @@
+{
+	"dataBaseName": "_net_PeytonPlayz585_eaglercraft_Alpha_IndexedDBFilesystem_1_2_6",
+	"playerUsername": null,
+	"serverIP": null,
+	"joinServerOnLaunch": null
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_peytonplayz585_b1_7_3.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_peytonplayz585_b1_7_3.txt
new file mode 100755
index 0000000..dcfb717
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_peytonplayz585_b1_7_3.txt
@@ -0,0 +1,6 @@
+{
+	"dataBaseName": "_net_PeytonPlayz585_eaglercraft_beta_IndexedDBFilesystem_1_7_3",
+	"playerUsername": null,
+	"serverIP": null,
+	"joinServerOnLaunch": null
+}
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/web_cl_eagleiii_8x16.woff b/desktopRuntime/resources/assets/eagler/boot_menu/web_cl_eagleiii_8x16.woff
new file mode 100755
index 0000000..f0e9430
Binary files /dev/null and b/desktopRuntime/resources/assets/eagler/boot_menu/web_cl_eagleiii_8x16.woff differ
diff --git a/desktopRuntime/resources/assets/eagler/glsl/accel_font.fsh b/desktopRuntime/resources/assets/eagler/glsl/accel_font.fsh
index c3aed5a..c962133 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/accel_font.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/accel_font.fsh
@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -16,21 +16,17 @@
  * 
  */
 
-precision lowp int;
-precision mediump float;
-precision mediump sampler2D;
+EAGLER_IN(vec2, v_texCoord2f)
+EAGLER_IN(vec4, v_color4f)
 
-in vec2 v_texCoord2f;
-in vec4 v_color4f;
-
-layout(location = 0) out vec4 output4f;
+EAGLER_FRAG_OUT()
 
 uniform sampler2D u_inputTexture;
 uniform vec4 u_colorBias4f;
 
 void main() {
-	output4f = texture(u_inputTexture, v_texCoord2f) * v_color4f + u_colorBias4f;
-	if(output4f.a < 0.004) {
+	EAGLER_FRAG_COLOR = EAGLER_TEXTURE_2D(u_inputTexture, v_texCoord2f) * v_color4f + u_colorBias4f;
+	if(EAGLER_FRAG_COLOR.a < 0.004) {
 		discard;
 	}
 }
diff --git a/desktopRuntime/resources/assets/eagler/glsl/accel_font.vsh b/desktopRuntime/resources/assets/eagler/glsl/accel_font.vsh
index a0369c6..ddef122 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/accel_font.vsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/accel_font.vsh
@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -16,18 +16,15 @@
  * 
  */
 
-precision lowp int;
-precision highp float;
-precision mediump sampler2D;
+EAGLER_VSH_LAYOUT_BEGIN()
+EAGLER_IN(0, vec3, a_position3f)
+EAGLER_IN(1, vec2, c_position2i)
+EAGLER_IN(2, vec2, c_coords2i)
+EAGLER_IN(3, vec4, c_color4f)
+EAGLER_VSH_LAYOUT_END()
 
-layout(location = 0) in vec3 a_position3f;
-
-layout(location = 1) in vec2 c_position2i;
-layout(location = 2) in vec2 c_coords2i;
-layout(location = 3) in vec4 c_color4f;
-
-out vec2 v_texCoord2f;
-out vec4 v_color4f;
+EAGLER_OUT(vec2, v_texCoord2f)
+EAGLER_OUT(vec4, v_color4f)
 
 uniform mat4 u_matrixTransform;
 uniform vec2 u_charSize2f;
@@ -49,5 +46,5 @@ void main() {
 	pos2d.x -= (a_position3f.y - 0.5) * italicBit;
 	v_color4f.a *= 2.0;
 	v_color4f *= u_color4f;
-	gl_Position = u_matrixTransform * vec4(pos2d, 0.0, 1.0);
+	EAGLER_VERT_POSITION = u_matrixTransform * vec4(pos2d, 0.0, 1.0);
 }
diff --git a/desktopRuntime/resources/assets/eagler/glsl/accel_particle.fsh b/desktopRuntime/resources/assets/eagler/glsl/accel_particle.fsh
index 83dea5b..dd6dc86 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/accel_particle.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/accel_particle.fsh
@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -16,20 +16,16 @@
  * 
  */
 
-precision lowp int;
-precision mediump float;
-precision mediump sampler2D;
+EAGLER_IN(vec2, v_texCoord2f)
+EAGLER_IN(vec4, v_color4f)
 
-in vec2 v_texCoord2f;
-in vec4 v_color4f;
-
-layout(location = 0) out vec4 output4f;
+EAGLER_FRAG_OUT()
 
 uniform sampler2D u_inputTexture;
 
 void main() {
-	output4f = texture(u_inputTexture, v_texCoord2f) * v_color4f;
-	if(output4f.a < 0.004) {
+	EAGLER_FRAG_COLOR = EAGLER_TEXTURE_2D(u_inputTexture, v_texCoord2f) * v_color4f;
+	if(EAGLER_FRAG_COLOR.a < 0.004) {
 		discard;
 	}
 }
diff --git a/desktopRuntime/resources/assets/eagler/glsl/accel_particle.vsh b/desktopRuntime/resources/assets/eagler/glsl/accel_particle.vsh
index 9e78f76..be45b76 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/accel_particle.vsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/accel_particle.vsh
@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -16,20 +16,17 @@
  * 
  */
 
-precision lowp int;
-precision highp float;
-precision mediump sampler2D;
+EAGLER_VSH_LAYOUT_BEGIN()
+EAGLER_IN(0, vec2, a_position2f)
+EAGLER_IN(1, vec3, p_position3f)
+EAGLER_IN(2, vec2, p_texCoords2i)
+EAGLER_IN(3, vec2, p_lightMap2f)
+EAGLER_IN(4, vec2, p_particleSize_texCoordsSize_2i)
+EAGLER_IN(5, vec4, p_color4f)
+EAGLER_VSH_LAYOUT_END()
 
-layout(location = 0) in vec2 a_position2f;
-
-layout(location = 1) in vec3 p_position3f;
-layout(location = 2) in vec2 p_texCoords2i;
-layout(location = 3) in vec2 p_lightMap2f;
-layout(location = 4) in vec2 p_particleSize_texCoordsSize_2i;
-layout(location = 5) in vec4 p_color4f;
-
-out vec2 v_texCoord2f;
-out vec4 v_color4f;
+EAGLER_OUT(vec2, v_texCoord2f)
+EAGLER_OUT(vec4, v_color4f)
 
 uniform mat4 u_matrixTransform;
 uniform vec3 u_texCoordSize2f_particleSize1f;
@@ -40,7 +37,7 @@ uniform vec4 u_color4f;
 uniform sampler2D u_lightmapTexture;
 
 void main() {
-	v_color4f = u_color4f * p_color4f.bgra * texture(u_lightmapTexture, p_lightMap2f);
+	v_color4f = u_color4f * p_color4f.bgra * EAGLER_TEXTURE_2D(u_lightmapTexture, p_lightMap2f);
 
 	vec2 tex2f = a_position2f * 0.5 + 0.5;
 	tex2f.y = 1.0 - tex2f.y;
@@ -54,5 +51,5 @@ void main() {
 	pos3f += u_transformParam_1_2_5_f * spos2f.xyy;
 	pos3f.zx += u_transformParam_3_4_f * spos2f;
 
-	gl_Position = u_matrixTransform * vec4(pos3f, 1.0);
+	EAGLER_VERT_POSITION = u_matrixTransform * vec4(pos3f, 1.0);
 }
diff --git a/desktopRuntime/resources/assets/eagler/glsl/core.fsh b/desktopRuntime/resources/assets/eagler/glsl/core.fsh
index da31d6b..9f5f8fa 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/core.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/core.fsh
@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -17,11 +17,11 @@
  */
 
 #if defined(COMPILE_ENABLE_TEX_GEN) || defined(COMPILE_ENABLE_FOG)
-in vec4 v_position4f;
+EAGLER_IN(vec4, v_position4f)
 #endif
 
 #ifdef COMPILE_TEXTURE_ATTRIB
-in vec2 v_texture2f;
+EAGLER_IN(vec2, v_texture2f)
 #endif
 
 uniform vec4 u_color4f;
@@ -32,15 +32,15 @@ uniform vec4 u_colorBlendAdd4f;
 #endif
 
 #ifdef COMPILE_COLOR_ATTRIB
-in vec4 v_color4f;
+EAGLER_IN(vec4, v_color4f)
 #endif
 
 #ifdef COMPILE_NORMAL_ATTRIB
-in vec3 v_normal3f;
+EAGLER_IN(vec3, v_normal3f)
 #endif
 
 #ifdef COMPILE_LIGHTMAP_ATTRIB
-in vec2 v_lightmap2f;
+EAGLER_IN(vec2, v_lightmap2f)
 #endif
 
 #ifdef COMPILE_ENABLE_TEXTURE2D
@@ -76,7 +76,7 @@ uniform vec4 u_fogColor4f;
 #endif
 
 #ifdef COMPILE_ENABLE_TEX_GEN
-in vec3 v_objectPosition3f;
+EAGLER_IN(vec3, v_objectPosition3f)
 uniform ivec4 u_texGenPlane4i;
 uniform vec4 u_texGenS4f;
 uniform vec4 u_texGenT4f;
@@ -89,7 +89,7 @@ uniform mat4 u_textureMat4f01;
 uniform vec2 u_textureAnisotropicFix;
 #endif
 
-layout(location = 0) out vec4 output4f;
+EAGLER_FRAG_OUT()
 
 void main() {
 
@@ -98,22 +98,29 @@ void main() {
 #else
 	vec4 color = u_color4f;
 #endif
-	
+
 #ifdef COMPILE_ENABLE_TEX_GEN
+	vec4 tmpVec4 = vec4(v_objectPosition3f, 1.0);
 	vec4 texGenVector;
-	
-	vec4 texGenPosSrc[2];
-	texGenPosSrc[0] = vec4(v_objectPosition3f, 1.0);
-	texGenPosSrc[1] = v_position4f;
-	
-	texGenVector.x = dot(texGenPosSrc[u_texGenPlane4i.x], u_texGenS4f);
-	texGenVector.y = dot(texGenPosSrc[u_texGenPlane4i.y], u_texGenT4f);
-	texGenVector.z = dot(texGenPosSrc[u_texGenPlane4i.z], u_texGenR4f);
-	texGenVector.w = dot(texGenPosSrc[u_texGenPlane4i.w], u_texGenQ4f);
-	
+	texGenVector.x = dot(u_texGenPlane4i.x == 1 ? v_position4f : tmpVec4, u_texGenS4f);
+	texGenVector.y = dot(u_texGenPlane4i.y == 1 ? v_position4f : tmpVec4, u_texGenT4f);
+	texGenVector.z = dot(u_texGenPlane4i.z == 1 ? v_position4f : tmpVec4, u_texGenR4f);
+	texGenVector.w = dot(u_texGenPlane4i.w == 1 ? v_position4f : tmpVec4, u_texGenQ4f);
+#ifdef EAGLER_HAS_GLES_300
+	texGenVector.xyz = mat4x3(
+		u_textureMat4f01[0].xyw,
+		u_textureMat4f01[1].xyw,
+		u_textureMat4f01[2].xyw,
+		u_textureMat4f01[3].xyw
+	) * texGenVector;
+	texGenVector.xy /= texGenVector.z;
+#else
 	texGenVector = u_textureMat4f01 * texGenVector;
-	color *= texture(u_samplerTexture, texGenVector.xy / texGenVector.w);
-	
+	texGenVector.xy /= texGenVector.w;
+#endif
+
+	color *= EAGLER_TEXTURE_2D(u_samplerTexture, texGenVector.xy);
+
 #ifdef COMPILE_ENABLE_ALPHA_TEST
 	if(color.a < u_alphaTestRef1f) discard;
 #endif
@@ -126,20 +133,20 @@ void main() {
 	// d3d11 doesn't support GL_NEAREST upscaling with anisotropic
 	// filtering enabled, so it needs this stupid fix to 'work'
 	vec2 uv = floor(v_texture2f * u_textureAnisotropicFix) + 0.5;
-	color *= texture(u_samplerTexture, uv / u_textureAnisotropicFix);
+	color *= EAGLER_TEXTURE_2D(u_samplerTexture, uv / u_textureAnisotropicFix);
 #else
-	color *= texture(u_samplerTexture, v_texture2f);
+	color *= EAGLER_TEXTURE_2D(u_samplerTexture, v_texture2f);
 #endif
 #else
-	color *= texture(u_samplerTexture, u_textureCoords01);
+	color *= EAGLER_TEXTURE_2D(u_samplerTexture, u_textureCoords01);
 #endif
 #endif
 
 #ifdef COMPILE_ENABLE_LIGHTMAP
 #ifdef COMPILE_LIGHTMAP_ATTRIB
-	color *= texture(u_samplerLightmap, v_lightmap2f);
+	color *= EAGLER_TEXTURE_2D(u_samplerLightmap, v_lightmap2f);
 #else
-	color *= texture(u_samplerLightmap, u_textureCoords02);
+	color *= EAGLER_TEXTURE_2D(u_samplerLightmap, u_textureCoords02);
 #endif
 #endif
 
@@ -161,9 +168,18 @@ void main() {
 #endif
 	float diffuse = 0.0;
 	vec4 light;
+#ifdef EAGLER_HAS_GLES_300
 	for(int i = 0; i < u_lightsEnabled1i; ++i) {
+#else
+	for(int i = 0; i < 4; ++i) {
+#endif
 		light = u_lightsDirections4fv[i];
 		diffuse += max(dot(light.xyz, normal), 0.0) * light.w;
+#ifndef EAGLER_HAS_GLES_300
+		if(i + 1 >= u_lightsEnabled1i) {
+			break;
+		}
+#endif
 	}
 	color.rgb *= min(u_lightsAmbient3f + vec3(diffuse), 1.0);
 #endif
@@ -179,5 +195,5 @@ void main() {
 	color.rgb = mix(color.rgb, u_fogColor4f.rgb, clamp(f, 0.0, 1.0) * u_fogColor4f.a);
 #endif
 
-	output4f = color;
+	EAGLER_FRAG_COLOR = color;
 }
diff --git a/desktopRuntime/resources/assets/eagler/glsl/core.vsh b/desktopRuntime/resources/assets/eagler/glsl/core.vsh
index 297a1f5..350b912 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/core.vsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/core.vsh
@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -16,39 +16,39 @@
  * 
  */
 
-in vec3 a_position3f;
+EAGLER_IN_AUTO(vec3, a_position3f)
 
 #if defined(COMPILE_ENABLE_TEX_GEN) || defined(COMPILE_ENABLE_FOG)
 #define _COMPILE_VARYING_POSITION
 #endif
 
 #ifdef _COMPILE_VARYING_POSITION
-out vec4 v_position4f;
+EAGLER_OUT(vec4, v_position4f)
 #endif
 
 #ifdef COMPILE_ENABLE_TEX_GEN
-out vec3 v_objectPosition3f;
+EAGLER_OUT(vec3, v_objectPosition3f)
 #endif
 
 #ifdef COMPILE_TEXTURE_ATTRIB
-in vec2 a_texture2f;
-out vec2 v_texture2f;
+EAGLER_IN_AUTO(vec2, a_texture2f)
+EAGLER_OUT(vec2, v_texture2f)
 uniform mat4 u_textureMat4f01;
 #endif
 
 #ifdef COMPILE_COLOR_ATTRIB
-in vec4 a_color4f;
-out vec4 v_color4f;
+EAGLER_IN_AUTO(vec4, a_color4f)
+EAGLER_OUT(vec4, v_color4f)
 #endif
 
 #ifdef COMPILE_NORMAL_ATTRIB
-in vec4 a_normal4f;
-out vec3 v_normal3f;
+EAGLER_IN_AUTO(vec4, a_normal4f)
+EAGLER_OUT(vec3, v_normal3f)
 #endif
 
 #ifdef COMPILE_LIGHTMAP_ATTRIB
-in vec2 a_lightmap2f;
-out vec2 v_lightmap2f;
+EAGLER_IN_AUTO(vec2, a_lightmap2f)
+EAGLER_OUT(vec2, v_lightmap2f)
 uniform mat4 u_textureMat4f02;
 #endif
 
@@ -92,8 +92,8 @@ void main() {
 #endif
 
 #ifdef _COMPILE_VARYING_POSITION
-	gl_Position = u_projectionMat4f * v_position4f;
+	EAGLER_VERT_POSITION = u_projectionMat4f * v_position4f;
 #else
-	gl_Position = u_modelviewProjMat4f * vec4(a_position3f, 1.0);
+	EAGLER_VERT_POSITION = u_modelviewProjMat4f * vec4(a_position3f, 1.0);
 #endif
 }
diff --git a/desktopRuntime/resources/assets/eagler/glsl/deferred/forward_core.fsh b/desktopRuntime/resources/assets/eagler/glsl/deferred/forward_core.fsh
index 086b750..a2bd56f 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/deferred/forward_core.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/deferred/forward_core.fsh
@@ -226,20 +226,18 @@ void main() {
 #ifdef COMPILE_ENABLE_TEXTURE2D
 	vec2 texCoords2f;
 #ifdef COMPILE_ENABLE_TEX_GEN
+	vec4 tmpVec4 = vec4(v_objectPosition3f, 1.0);
 	vec4 texGenVector;
-	vec4 texGenPosSrc[2];
-	texGenPosSrc[0] = vec4(v_objectPosition3f, 1.0);
-	texGenPosSrc[1] = v_position4f;
-	texGenVector.x = dot(texGenPosSrc[u_texGenPlane4i.x], u_texGenS4f);
-	texGenVector.y = dot(texGenPosSrc[u_texGenPlane4i.y], u_texGenT4f);
-	texGenVector.z = dot(texGenPosSrc[u_texGenPlane4i.z], u_texGenR4f);
-	texGenVector.w = dot(texGenPosSrc[u_texGenPlane4i.w], u_texGenQ4f);
-	texGenVector = vec4(mat4x3(
+	texGenVector.x = dot(u_texGenPlane4i.x == 1 ? v_position4f : tmpVec4, u_texGenS4f);
+	texGenVector.y = dot(u_texGenPlane4i.y == 1 ? v_position4f : tmpVec4, u_texGenT4f);
+	texGenVector.z = dot(u_texGenPlane4i.z == 1 ? v_position4f : tmpVec4, u_texGenR4f);
+	texGenVector.w = dot(u_texGenPlane4i.w == 1 ? v_position4f : tmpVec4, u_texGenQ4f);
+	texGenVector.xyz = mat4x3(
 		u_textureMat4f01[0].xyw,
 		u_textureMat4f01[1].xyw,
 		u_textureMat4f01[2].xyw,
 		u_textureMat4f01[3].xyw
-	) * texGenVector, 0.0);
+	) * texGenVector;
 	texCoords2f = texGenVector.xy / texGenVector.z;
 #else
 	
diff --git a/desktopRuntime/resources/assets/eagler/glsl/deferred/reproject_control.fsh b/desktopRuntime/resources/assets/eagler/glsl/deferred/reproject_control.fsh
index 7a60f88..70e8a4c 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/deferred/reproject_control.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/deferred/reproject_control.fsh
@@ -99,13 +99,13 @@ void main() {
 	reprojectionReflectionOutput4f = vec4(0.0, 0.0, 0.0, 0.0);
 	reprojectionHitVectorOutput4f = vec4(0.0, 0.0, 0.0, 0.0);
 #endif
-	float fragDepth = textureLod(u_gbufferDepthTexture, v_position2f, 0.0).r;
+	float fragDepth = textureLod(u_gbufferDepthTexture, v_position2f2, 0.0).r;
 
 	if(fragDepth < 0.000001) {
 		return;
 	}
 
-	vec4 fragClipSpacePos4f = vec4(v_position2f, fragDepth, 1.0) * 2.0 - 1.0;
+	vec4 fragClipSpacePos4f = vec4(v_position2f2, fragDepth, 1.0) * 2.0 - 1.0;
 	vec4 fragPos4f = u_inverseViewProjMatrix4f * fragClipSpacePos4f;
 	fragPos4f.xyz /= fragPos4f.w;
 	fragPos4f.w = 1.0;
diff --git a/desktopRuntime/resources/assets/eagler/glsl/deferred/shader_pack_info.json b/desktopRuntime/resources/assets/eagler/glsl/deferred/shader_pack_info.json
index ede1ca3..4866054 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/deferred/shader_pack_info.json
+++ b/desktopRuntime/resources/assets/eagler/glsl/deferred/shader_pack_info.json
@@ -1,7 +1,7 @@
 {
 	"name": "§eHigh Performance PBR",
 	"desc": "Pack made from scratch specifically for this client, designed to give what I call the best balance between quality and performance possible in a browser but obviously that's just my opinion",
-	"vers": "1.2.1",
+	"vers": "1.2.2",
 	"author": "lax1dude",
 	"api_vers": 1,
 	"features": [
diff --git a/desktopRuntime/resources/assets/eagler/glsl/deferred/ssao_generate.fsh b/desktopRuntime/resources/assets/eagler/glsl/deferred/ssao_generate.fsh
index 2f1bd7c..98b425c 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/deferred/ssao_generate.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/deferred/ssao_generate.fsh
@@ -70,7 +70,7 @@ void main() {
 	originalViewSpacePos.xyz /= originalViewSpacePos.w;
 	originalViewSpacePos.w = 1.0;
 	
-	vec4 noiseVec = textureLod(u_noiseConstantTexture, u_randomizerDataMatrix2f * (v_position2f + originalViewSpacePos.xy + normal3f.xz), 0.0);
+	vec4 noiseVec = textureLod(u_noiseConstantTexture, 13.3725 / fract((u_randomizerDataMatrix2f * (v_position2f * 0.42695346 + originalViewSpacePos.xy * 1.373769945645 + normal3f.xz * 42.69456453)) * 1.123234234), 0.0);
 	noiseVec.xyz *= 2.0;
 	noiseVec.xyz -= 1.0;
 	
diff --git a/desktopRuntime/resources/assets/eagler/glsl/dynamiclights/core_dynamiclights.fsh b/desktopRuntime/resources/assets/eagler/glsl/dynamiclights/core_dynamiclights.fsh
index 5b590e9..114eb3c 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/dynamiclights/core_dynamiclights.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/dynamiclights/core_dynamiclights.fsh
@@ -107,22 +107,23 @@ void main() {
 #else
 	vec4 color = u_color4f;
 #endif
-	
+
 #ifdef COMPILE_ENABLE_TEX_GEN
+	vec4 tmpVec4 = vec4(v_objectPosition3f, 1.0);
 	vec4 texGenVector;
-	
-	vec4 texGenPosSrc[2];
-	texGenPosSrc[0] = vec4(v_objectPosition3f, 1.0);
-	texGenPosSrc[1] = v_position4f;
-	
-	texGenVector.x = dot(texGenPosSrc[u_texGenPlane4i.x], u_texGenS4f);
-	texGenVector.y = dot(texGenPosSrc[u_texGenPlane4i.y], u_texGenT4f);
-	texGenVector.z = dot(texGenPosSrc[u_texGenPlane4i.z], u_texGenR4f);
-	texGenVector.w = dot(texGenPosSrc[u_texGenPlane4i.w], u_texGenQ4f);
-	
-	texGenVector = u_textureMat4f01 * texGenVector;
-	color *= texture(u_samplerTexture, texGenVector.xy / texGenVector.w);
-	
+	texGenVector.x = dot(u_texGenPlane4i.x == 1 ? v_position4f : tmpVec4, u_texGenS4f);
+	texGenVector.y = dot(u_texGenPlane4i.y == 1 ? v_position4f : tmpVec4, u_texGenT4f);
+	texGenVector.z = dot(u_texGenPlane4i.z == 1 ? v_position4f : tmpVec4, u_texGenR4f);
+	texGenVector.w = dot(u_texGenPlane4i.w == 1 ? v_position4f : tmpVec4, u_texGenQ4f);
+	texGenVector.xyz = mat4x3(
+		u_textureMat4f01[0].xyw,
+		u_textureMat4f01[1].xyw,
+		u_textureMat4f01[2].xyw,
+		u_textureMat4f01[3].xyw
+	) * texGenVector;
+
+	color *= texture(u_samplerTexture, texGenVector.xy / texGenVector.z);
+
 #ifdef COMPILE_ENABLE_ALPHA_TEST
 	if(color.a < u_alphaTestRef1f) discard;
 #endif
diff --git a/desktopRuntime/resources/assets/eagler/glsl/gles2_compat.glsl b/desktopRuntime/resources/assets/eagler/glsl/gles2_compat.glsl
new file mode 100755
index 0000000..5529cbb
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/glsl/gles2_compat.glsl
@@ -0,0 +1,98 @@
+#line 2 6969
+
+/*
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+
+#ifdef EAGLER_HAS_GLES_300
+
+// For GLES 3.00+ (WebGL 2.0)
+#ifdef EAGLER_IS_VERTEX_SHADER
+
+// Vertex Shaders:
+#define EAGLER_VSH_LAYOUT_BEGIN()
+#define EAGLER_VSH_LAYOUT_END()
+#define EAGLER_IN(_loc, _type, _name) layout(location = _loc) in _type _name;
+#define EAGLER_IN_AUTO(_type, _name) in _type _name;
+#define EAGLER_OUT(_type, _name) out _type _name;
+#define EAGLER_VERT_POSITION gl_Position
+
+#else
+#ifdef EAGLER_IS_FRAGMENT_SHADER
+
+// Fragment Shaders:
+#define EAGLER_IN(_type, _name) in _type _name;
+#define EAGLER_FRAG_COLOR eagler_FragColor
+#define EAGLER_FRAG_DEPTH gl_FragDepth
+
+#define EAGLER_FRAG_OUT() layout(location = 0) out vec4 EAGLER_FRAG_COLOR;
+
+#endif
+#endif
+
+// All Shaders:
+
+#define EAGLER_TEXTURE_2D(tex, coord2f) texture(tex, coord2f)
+#define EAGLER_TEXTURE_2D_LOD(_tex, _coord2f, _lod1f) textureLod(_tex, _coord2f, _lod1f)
+#define EAGLER_HAS_TEXTURE_2D_LOD
+
+
+#else
+#ifdef EAGLER_HAS_GLES_200
+
+// For GLES 2.00 (WebGL 1.0)
+#ifdef EAGLER_IS_VERTEX_SHADER
+
+// Vertex Shaders:
+#define EAGLER_VSH_LAYOUT_BEGIN()
+#define EAGLER_VSH_LAYOUT_END()
+#define EAGLER_IN(_loc, _type, _name) attribute _type _name;
+#define EAGLER_IN_AUTO(_type, _name) attribute _type _name;
+#define EAGLER_OUT(_type, _name) varying _type _name;
+#define EAGLER_VERT_POSITION gl_Position
+
+#else
+#ifdef EAGLER_IS_FRAGMENT_SHADER
+
+// Fragment Shaders:
+#define EAGLER_IN(_type, _name) varying _type _name;
+#define EAGLER_FRAG_COLOR gl_FragColor
+// TODO: Must require EXT_frag_depth to use this on GLES 2.0 (currently not needed)
+#define EAGLER_FRAG_DEPTH gl_FragDepth
+
+#define EAGLER_FRAG_OUT()
+
+#endif
+#endif
+
+// All Shaders:
+
+#define EAGLER_TEXTURE_2D(_tex, _coord2f) texture2D(_tex, _coord2f)
+
+#ifdef EAGLER_HAS_GLES_200_SHADER_TEXTURE_LOD
+#define EAGLER_TEXTURE_2D_LOD(_tex, _coord2f, _lod1f) texture2DLodEXT(_tex, _coord2f, _lod1f)
+#define EAGLER_HAS_TEXTURE_2D_LOD
+#else
+// Beware!
+#define EAGLER_TEXTURE_2D_LOD(_tex, _coord2f, _lod1f) texture2D(_tex, _coord2f)
+#define EAGLER_HAS_TEXTURE_2D_LOD
+#endif
+
+#else
+#error Unable to determine API version! (Missing directive EAGLER_HAS_GLES_200 or 300)
+#endif
+#endif
+
+#line 1 0
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/glsl/hw_fingerprint.fsh b/desktopRuntime/resources/assets/eagler/glsl/hw_fingerprint.fsh
new file mode 100755
index 0000000..0c11ba8
--- /dev/null
+++ b/desktopRuntime/resources/assets/eagler/glsl/hw_fingerprint.fsh
@@ -0,0 +1,55 @@
+#line 2
+
+/*
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+
+EAGLER_IN(vec2, v_position2f)
+
+EAGLER_FRAG_OUT()
+
+uniform sampler2D u_inputTexture;
+uniform mat4 u_textureMatrix;
+
+vec2 rand(in vec2 co){
+	float f = dot(co, vec2(12.98984576, 78.23378678));
+	return fract(vec2(sin(f + 0.32490982), cos(f - 0.69890)) * 43758.54576873);
+}
+
+void main() {
+	vec4 coords4f = vec4(v_position2f.x * 0.25 - 0.125, v_position2f.y * 0.25 - 0.125, v_position2f.y * 10.0 - 9.0, 1.0);
+	coords4f = u_textureMatrix * coords4f;
+	coords4f.xy /= coords4f.w;
+	EAGLER_FRAG_COLOR = EAGLER_TEXTURE_2D(u_inputTexture, coords4f.xy * 0.5 + 0.5);
+	EAGLER_FRAG_COLOR.rg += rand(v_position2f * 1.2344574345) * 0.05;
+	EAGLER_FRAG_COLOR.ba -= rand(v_position2f * 1.2343525225) * 0.05;
+	EAGLER_FRAG_COLOR.a = fract(sin(dot(coords4f.yz, vec2(12.9898, 78.233))) * 43758.5453);
+	EAGLER_FRAG_COLOR.a += exp(length(rand(coords4f.xw)) * -69.420);
+	EAGLER_FRAG_COLOR = pow(EAGLER_FRAG_COLOR, vec4(1.0 / 2.423952));
+	EAGLER_FRAG_COLOR = pow(EAGLER_FRAG_COLOR, vec4(5.4523856));
+	EAGLER_FRAG_COLOR += 0.00004423 + EAGLER_FRAG_COLOR.a * 0.02;
+	EAGLER_FRAG_COLOR = sqrt(EAGLER_FRAG_COLOR);
+	EAGLER_FRAG_COLOR = pow(EAGLER_FRAG_COLOR, vec4(1.0 / 1.9023576));
+#ifdef EAGLER_HAS_GLES_300
+	EAGLER_FRAG_COLOR.ra += tanh(fract(EAGLER_FRAG_COLOR.a * 32.324834)) * 0.1012426;
+#endif
+	EAGLER_FRAG_COLOR.b *= 0.934924;
+	EAGLER_FRAG_COLOR.b += (1.23213 / inversesqrt(EAGLER_FRAG_COLOR.a)) * 0.156365;
+	EAGLER_FRAG_COLOR.ga += rand(gl_FragCoord.xy) * 0.13423567;
+	EAGLER_FRAG_COLOR.rb += gl_PointCoord * 0.0124264565;
+#ifdef EAGLER_HAS_GLES_300
+	EAGLER_FRAG_COLOR *= 0.95234 + asinh(EAGLER_FRAG_COLOR.g * 5.23423) * 0.0254325;
+#endif
+}
diff --git a/desktopRuntime/resources/assets/eagler/glsl/local.vsh b/desktopRuntime/resources/assets/eagler/glsl/local.vsh
index f6e82a1..0802a64 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/local.vsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/local.vsh
@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -16,15 +16,13 @@
  * 
  */
 
-precision lowp int;
-precision highp float;
-precision lowp sampler2D;
+EAGLER_VSH_LAYOUT_BEGIN()
+EAGLER_IN(0, vec2, a_position2f)
+EAGLER_VSH_LAYOUT_END()
 
-layout(location = 0) in vec2 a_position2f;
-
-out vec2 v_position2f;
+EAGLER_OUT(vec2, v_position2f)
 
 void main() {
 	v_position2f = a_position2f * 0.5 + 0.5;
-	gl_Position = vec4(a_position2f, 0.0, 1.0);
+	EAGLER_VERT_POSITION = vec4(a_position2f, 0.0, 1.0);
 }
diff --git a/desktopRuntime/resources/assets/eagler/glsl/post_fxaa.fsh b/desktopRuntime/resources/assets/eagler/glsl/post_fxaa.fsh
index bad7759..8b68059 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/post_fxaa.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/post_fxaa.fsh
@@ -1,11 +1,13 @@
 #line 2
 
 // Remove this line below if you plan to modify this file
+#ifndef EAGLER_IS_GLES_200
 #define USE_OPTIMIZED
+#endif
 
 
 /*
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -52,14 +54,9 @@
  * 
  */
 
-precision lowp int;
-precision mediump float;
-precision mediump sampler2D;
+EAGLER_IN(vec2, v_position2f)
 
-
-in vec2 v_position2f;
-
-layout(location = 0) out vec4 output4f;
+EAGLER_FRAG_OUT()
 
 uniform sampler2D u_screenTexture;
 uniform vec2 u_screenSize2f;
@@ -110,7 +107,7 @@ uniform vec2 u_screenSize2f;
     #define FxaaTex sampler2D
 /*--------------------------------------------------------------------------*/
 
-    #define FxaaTexTop(t, p) textureLod(t, p, 0.0)
+    #define FxaaTexTop(t, p) EAGLER_TEXTURE_2D_LOD(t, p, 0.0)
 
 /*============================================================================
                    GREEN AS LUMA OPTION SUPPORT FUNCTION
@@ -298,7 +295,7 @@ void main(){
 	rcpFrameOpt.xy = -screenSize05;
 	rcpFrameOpt.zw = screenSize05;
 
-	output4f = vec4(FxaaPixelShader(v_position2f + screenSize05, posPos, u_screenTexture, rcpFrameOpt, rcpFrameOpt * 4.0, edgeSharpness, edgeThreshold, edgeThresholdMin).rgb, 1.0);
+	EAGLER_FRAG_COLOR = vec4(FxaaPixelShader(v_position2f + screenSize05, posPos, u_screenTexture, rcpFrameOpt, rcpFrameOpt * 4.0, edgeSharpness, edgeThreshold, edgeThresholdMin).rgb, 1.0);
 }
 #else
 
@@ -306,7 +303,6 @@ void main(){
 // Is it faster? Idfk, probably compiles faster at least, what matters it I tried
 
 float _616;
-vec4 _617;
 
 void main()
 {
@@ -317,14 +313,14 @@ void main()
     mediump vec4 _608;
     for(;;)
     {
-        mediump vec3 _532 = textureLod(u_screenTexture, _611.xy, 0.0).xyz;
+        mediump vec3 _532 = EAGLER_TEXTURE_2D_LOD(u_screenTexture, _611.xy, 0.0).xyz;
         mediump float _536 = dot(_532 * _532, vec3(0.2989999949932098388671875, 0.58700001239776611328125, 0.114000000059604644775390625));
-        mediump vec3 _540 = textureLod(u_screenTexture, _611.xw, 0.0).xyz;
+        mediump vec3 _540 = EAGLER_TEXTURE_2D_LOD(u_screenTexture, _611.xw, 0.0).xyz;
         mediump float _544 = dot(_540 * _540, vec3(0.2989999949932098388671875, 0.58700001239776611328125, 0.114000000059604644775390625));
-        mediump vec3 _548 = textureLod(u_screenTexture, _611.zy, 0.0).xyz;
-        mediump vec3 _556 = textureLod(u_screenTexture, _611.zw, 0.0).xyz;
+        mediump vec3 _548 = EAGLER_TEXTURE_2D_LOD(u_screenTexture, _611.zy, 0.0).xyz;
+        mediump vec3 _556 = EAGLER_TEXTURE_2D_LOD(u_screenTexture, _611.zw, 0.0).xyz;
         mediump float _560 = dot(_556 * _556, vec3(0.2989999949932098388671875, 0.58700001239776611328125, 0.114000000059604644775390625));
-        mediump vec4 _390 = textureLod(u_screenTexture, _290, 0.0);
+        mediump vec4 _390 = EAGLER_TEXTURE_2D_LOD(u_screenTexture, _290, 0.0);
         mediump vec3 _564 = _390.xyz;
         mediump float _568 = dot(_564 * _564, vec3(0.2989999949932098388671875, 0.58700001239776611328125, 0.114000000059604644775390625));
         mediump float _397 = dot(_548 * _548, vec3(0.2989999949932098388671875, 0.58700001239776611328125, 0.114000000059604644775390625)) + 0.00260416674427688121795654296875;
@@ -347,8 +343,8 @@ void main()
         mediump vec2 _484 = (_612 * 4.0).zw;
         vec2 _615 = -hp_copy_481;
         mediump vec2 mp_copy_615 = _615;
-        mediump vec4 _498 = textureLod(u_screenTexture, mp_copy_614 * _454 + _290, 0.0) + textureLod(u_screenTexture, _449 * _454 + _290, 0.0);
-        mediump vec4 _505 = ((textureLod(u_screenTexture, mp_copy_615 * _484 + _290, 0.0) + textureLod(u_screenTexture, _481 * _484 + _290, 0.0)) * 0.25) + (_498 * 0.25);
+        mediump vec4 _498 = EAGLER_TEXTURE_2D_LOD(u_screenTexture, mp_copy_614 * _454 + _290, 0.0) + EAGLER_TEXTURE_2D_LOD(u_screenTexture, _449 * _454 + _290, 0.0);
+        mediump vec4 _505 = ((EAGLER_TEXTURE_2D_LOD(u_screenTexture, mp_copy_615 * _484 + _290, 0.0) + EAGLER_TEXTURE_2D_LOD(u_screenTexture, _481 * _484 + _290, 0.0)) * 0.25) + (_498 * 0.25);
         mediump float _576 = dot(_505.xyz * _505.xyz, vec3(0.2989999949932098388671875, 0.58700001239776611328125, 0.114000000059604644775390625));
         mediump vec4 _607;
         if ((_576 < _412) || (_576 > _409))
@@ -367,7 +363,7 @@ void main()
         _608 = _607;
         break;
     }
-    output4f = vec4(_608.xyz, 1.0);
+    EAGLER_FRAG_COLOR = vec4(_608.xyz, 1.0);
 }
 
 #endif
\ No newline at end of file
diff --git a/desktopRuntime/resources/assets/eagler/glsl/texture_blit.fsh b/desktopRuntime/resources/assets/eagler/glsl/texture_blit.fsh
index 3179bc6..e84391d 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/texture_blit.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/texture_blit.fsh
@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2023-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -16,14 +16,10 @@
  * 
  */
 
-precision lowp int;
-precision highp float;
-precision highp sampler2D;
-
-in vec2 v_texCoords2f;
+EAGLER_IN(vec2, v_texCoords2f)
 
 #ifndef COMPILE_BLIT_DEPTH
-layout(location = 0) out vec4 output4f;
+EAGLER_FRAG_OUT()
 #endif
 
 uniform sampler2D u_inputTexture;
@@ -40,8 +36,8 @@ void main() {
 	uv2f = (floor(uv2f * u_pixelAlignmentSizes4f.xy) + u_pixelAlignmentOffset2f) * u_pixelAlignmentSizes4f.zw;
 #endif
 #ifndef COMPILE_BLIT_DEPTH
-	output4f = textureLod(u_inputTexture, uv2f, u_textureLod1f);
+	EAGLER_FRAG_COLOR = EAGLER_TEXTURE_2D_LOD(u_inputTexture, uv2f, u_textureLod1f);
 #else
-	gl_FragDepth = textureLod(u_inputTexture, uv2f, u_textureLod1f).r;
+	EAGLER_FRAG_DEPTH = EAGLER_TEXTURE_2D_LOD(u_inputTexture, uv2f, u_textureLod1f).r;
 #endif
 }
diff --git a/desktopRuntime/resources/assets/eagler/glsl/texture_blit.vsh b/desktopRuntime/resources/assets/eagler/glsl/texture_blit.vsh
index eaf9ca4..622af8c 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/texture_blit.vsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/texture_blit.vsh
@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2023-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -16,13 +16,11 @@
  * 
  */
 
-precision lowp int;
-precision lowp float;
-precision lowp sampler2D;
+EAGLER_VSH_LAYOUT_BEGIN()
+EAGLER_IN(0, vec2, a_position2f)
+EAGLER_VSH_LAYOUT_END()
 
-layout(location = 0) in vec2 a_position2f;
-
-out vec2 v_texCoords2f;
+EAGLER_OUT(vec2, v_texCoords2f)
 
 uniform vec4 u_srcCoords4f;
 uniform vec4 u_dstCoords4f;
@@ -30,5 +28,5 @@ uniform vec4 u_dstCoords4f;
 void main() {
 	vec2 uv = a_position2f * 0.5 + 0.5;
 	v_texCoords2f = u_srcCoords4f.xy + u_srcCoords4f.zw * uv;
-	gl_Position = vec4(u_dstCoords4f.xy + u_dstCoords4f.zw * uv, 0.0, 1.0);
+	EAGLER_VERT_POSITION = vec4(u_dstCoords4f.xy + u_dstCoords4f.zw * uv, 0.0, 1.0);
 }
diff --git a/desktopRuntime/resources/assets/eagler/glsl/texture_mix.fsh b/desktopRuntime/resources/assets/eagler/glsl/texture_mix.fsh
index 81907e9..b6dc9f2 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/texture_mix.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/texture_mix.fsh
@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -16,13 +16,9 @@
  * 
  */
 
-precision lowp int;
-precision highp float;
-precision highp sampler2D;
+EAGLER_IN(vec2, v_position2f)
 
-in vec2 v_position2f;
-
-layout(location = 0) out vec4 output4f;
+EAGLER_FRAG_OUT()
 
 uniform sampler2D u_inputTexture;
 uniform float u_textureLod1f;
@@ -32,6 +28,6 @@ uniform mat3 u_matrixTransform;
 
 void main() {
 	vec3 coords = u_matrixTransform * vec3(v_position2f, 1.0);
-	vec4 color4f = textureLod(u_inputTexture, coords.xy, u_textureLod1f);
-	output4f = color4f * u_blendFactor4f + u_blendBias4f;
+	vec4 color4f = EAGLER_TEXTURE_2D_LOD(u_inputTexture, coords.xy, u_textureLod1f);
+	EAGLER_FRAG_COLOR = color4f * u_blendFactor4f + u_blendBias4f;
 }
diff --git a/desktopRuntime/resources/assets/eagler/gui/eagler_gui.png b/desktopRuntime/resources/assets/eagler/gui/eagler_gui.png
index 7042858..5d9d516 100755
Binary files a/desktopRuntime/resources/assets/eagler/gui/eagler_gui.png and b/desktopRuntime/resources/assets/eagler/gui/eagler_gui.png differ
diff --git a/desktopRuntime/resources/assets/eagler/gui/notif_bk_large.png b/desktopRuntime/resources/assets/eagler/gui/notif_bk_large.png
new file mode 100755
index 0000000..9cab145
Binary files /dev/null and b/desktopRuntime/resources/assets/eagler/gui/notif_bk_large.png differ
diff --git a/desktopRuntime/resources/assets/eagler/gui/touch_gui.png b/desktopRuntime/resources/assets/eagler/gui/touch_gui.png
new file mode 100755
index 0000000..12cbcbe
Binary files /dev/null and b/desktopRuntime/resources/assets/eagler/gui/touch_gui.png differ
diff --git a/desktopRuntime/resources/assets/minecraft/lang/en_US.lang b/desktopRuntime/resources/assets/minecraft/lang/en_US.lang
index 234a6c9..c3d990c 100755
--- a/desktopRuntime/resources/assets/minecraft/lang/en_US.lang
+++ b/desktopRuntime/resources/assets/minecraft/lang/en_US.lang
@@ -15,11 +15,6 @@ gui.no=No
 gui.none=None
 gui.all=All
 
-eaglercraft.recording.unsupported=Recording Unsupported!
-eaglercraft.recording.stop=Stop Recording
-eaglercraft.recording.start=Record Screen...
-eaglercraft.soundCategory.voice=Recording Voice
-
 eaglercraft.resourcePack.prompt.title=What do you want to do with '%s'?
 eaglercraft.resourcePack.prompt.text=Tip: Hold Shift to skip this screen when selecting a resource pack!
 eaglercraft.resourcePack.prompt.delete=Delete this resource pack
@@ -246,6 +241,7 @@ eaglercraft.shaders.gui.option.POST_FXAA.desc.5=OFF: disable fxaa (faster)
 
 eaglercraft.shaders.gui.unsupported.title=Shaders are unavailable on this device!
 eaglercraft.shaders.gui.unsupported.reason.hdrFramebuffer=Reason: No HDR render target support
+eaglercraft.shaders.gui.unsupported.reason.oldOpenGLVersion=Reason: OpenGL ES 3.0 (WebGL 2.0) is not supported!
 
 eaglercraft.shaders.debugMenuTip=Press %s+4 to access the shader debug menu
 
@@ -253,7 +249,7 @@ eaglercraft.command.skull.tip=Use /eagskull to create custom skulls
 eaglercraft.command.skull.usage=/eagskull
 eaglercraft.command.skull.nopermission=Cheats are not enabled!
 eaglercraft.command.skull.feedback=Created new skull: "%s"
-eaglercraft.command.skull.error.invalid.png=Invalid PNG file!
+eaglercraft.command.skull.error.invalid.format=Invalid or unsupported image file!
 eaglercraft.command.skull.error.invalid.skin=Image with size %dx%d is not a valid minecraft skin!
 
 eaglercraft.command.clientStub=This command is client side!
@@ -428,13 +424,14 @@ eaglercraft.singleplayer.busy.confirmCancel=Confirm Cancel
 eaglercraft.singleplayer.crashed.title=Recieved a crash report from integrated server!
 eaglercraft.singleplayer.crashed.checkConsole=Check the console for more details
 eaglercraft.singleplayer.crashed.continue=Continue
+eaglercraft.singleplayer.crashed.singleThreadCont=Single Thread Mode
 
 eaglercraft.singleplayer.failed.title=Singleplayer Task Failed!
 eaglercraft.singleplayer.failed.killed=The worker process was killed
 eaglercraft.singleplayer.failed.notStarted=The worker process could not start
 
-eaglercraft.singleplayer.failed.singleThreadWarning.1=Worker Thread Startup Failure!
-eaglercraft.singleplayer.failed.singleThreadWarning.2=The integrated server will run in single-threaded mode
+eaglercraft.singleplayer.failed.singleThreadWarning.1=Worker Thread Issue Detected
+eaglercraft.singleplayer.failed.singleThreadWarning.2=The integrated server is running in single-threaded mode
 
 eaglercraft.singleplayer.busy.listingworlds=Loading worlds
 eaglercraft.singleplayer.failed.listingworlds=Could not fetch worlds list!
@@ -508,11 +505,21 @@ eaglercraft.singleplayer.backup.clearPlayerData.tooltip=Clears the inventories o
 eaglercraft.singleplayer.backup.clearPlayerData.warning1=Are you sure you want to delete all player data?
 eaglercraft.singleplayer.backup.clearPlayerData.warning2=All players in '%s' will lose their inventories (besides %s)
 
+eaglercraft.singleplayer.ramdiskdetected.title=Worker Issues Detected
+eaglercraft.singleplayer.ramdiskdetected.text0=Running in "RAMDisk mode", worlds cannot be saved!
+eaglercraft.singleplayer.ramdiskdetected.text1=Single thread mode may solve this issue
+eaglercraft.singleplayer.ramdiskdetected.continue=Continue
+eaglercraft.singleplayer.ramdiskdetected.singleThreadCont=Single Thread Mode
+
 eaglercraft.selectWorld.backup=Backup
 
 eaglercraft.selectWorld.duplicate=Duplicate World:
 eaglercraft.selectWorld.duplicateButton=Duplicate
 
+eaglercraft.selectWorld.ramdiskWarning=WARNING: Running in "RAMDisk mode", worlds will NOT be saved to local storage!
+
+eaglercraft.singleplayer.tpscounter.singleThreadMode=Single Thread Mode
+
 eaglercraft.networkSettings.title=Shared World Relay Servers
 eaglercraft.networkSettings.add=Add Relay
 eaglercraft.networkSettings.delete=Delete Relay
@@ -613,6 +620,27 @@ eaglercraft.updateList.refresh=Refresh
 eaglercraft.updateList.note.0=Note: Updates are digitally signed, EaglercraftX will block any
 eaglercraft.updateList.note.1=updates that were not created by lax1dude or ayunami2000
 
+eaglercraft.updateSuccess.title=Update Successful
+eaglercraft.updateSuccess.installToBootMenu=Install to Boot Menu
+eaglercraft.updateSuccess.downloadOffline=Download Offline
+
+eaglercraft.updateSuccess.downloading=Downloading Offline...
+eaglercraft.updateSuccess.installing=Installing Client...
+
+eaglercraft.updateFailed.title=Update Failed
+
+eaglercraft.installFailed.title=Installation Failed
+
+eaglercraft.updateInstall.title=Install to Boot Menu
+eaglercraft.updateInstall.setDefault=Make Default
+eaglercraft.updateInstall.setCountdown=Enable Countdown
+eaglercraft.updateInstall.install=Install
+
+eaglercraft.options.pressDeleteText=Press DEL to enter boot menu
+
+eaglercraft.enterBootMenu.title=Enter Boot Menu
+eaglercraft.enterBootMenu.text0=Refresh the page to enter the boot menu
+
 eaglercraft.voice.title=Voice Channel
 eaglercraft.voice.titleNoVoice=Voice is disabled on this server
 eaglercraft.voice.titleVoiceUnavailable=Voice is unavailable
@@ -643,14 +671,15 @@ eaglercraft.voice.volumeSpeakerLabel=Speakers:
 eaglercraft.voice.volumeMicrophoneLabel=Microphone:
 
 eaglercraft.voice.unsupportedWarning1=Voice Warning
-eaglercraft.voice.unsupportedWarning2=Your network's firewall may not support
+eaglercraft.voice.unsupportedWarning2=Your network configuration may not support
 eaglercraft.voice.unsupportedWarning3=eaglercraft's voice chat.
-eaglercraft.voice.unsupportedWarning4=If your game doesn't work it's your issue
-eaglercraft.voice.unsupportedWarning5=to solve, not ayunami2000's or lax1dude's.
-eaglercraft.voice.unsupportedWarning6=Don't ask them to 'fix' it for you because
-eaglercraft.voice.unsupportedWarning7=they won't help you fix a problem that only
-eaglercraft.voice.unsupportedWarning8=you or your network's administrator has the
-eaglercraft.voice.unsupportedWarning9=ability to correctly resolve.
+eaglercraft.voice.unsupportedWarning4=Voice chat is based on WebRTC and is
+eaglercraft.voice.unsupportedWarning5=normally meant to be peer-to-peer, if your
+eaglercraft.voice.unsupportedWarning6=firewall blocks peer-to-peer connections
+eaglercraft.voice.unsupportedWarning7=a TURN server will be required.
+eaglercraft.voice.unsupportedWarning8=The default OpenRelayProject TURN servers
+eaglercraft.voice.unsupportedWarning9=are no longer working in 2024!
+
 eaglercraft.voice.unsupportedWarning10=Continue
 eaglercraft.voice.unsupportedWarning11=Cancel
 
@@ -660,12 +689,115 @@ eaglercraft.voice.ipGrabWarning3=IP address to be logged by other players
 eaglercraft.voice.ipGrabWarning4=also using voice on the server.
 eaglercraft.voice.ipGrabWarning5=This issue will not be fixed, it is an
 eaglercraft.voice.ipGrabWarning6=internal browser issue, not a mistake in the
-eaglercraft.voice.ipGrabWarning7=game. Fortunately, this can only be done if
-eaglercraft.voice.ipGrabWarning8=the other player uses a hacked web browser
-eaglercraft.voice.ipGrabWarning9=or has Wireshark to capture the voice
-eaglercraft.voice.ipGrabWarning10=packets, as there exists no real javascript
-eaglercraft.voice.ipGrabWarning11=method to log IPs using a normal skidded
-eaglercraft.voice.ipGrabWarning12=eaglercraft hacked client.
+eaglercraft.voice.ipGrabWarning7=game. Sorry about that.
+
+eaglercraft.revokeSessionToken.button=Revoke Session Token
+eaglercraft.revokeSessionToken.title=Select session to revoke:
+eaglercraft.revokeSessionToken.inspect=Inspect
+eaglercraft.revokeSessionToken.revoke=Revoke
+eaglercraft.revokeSessionToken.note.0=Use this tool when you believe someone has stolen your cookies
+eaglercraft.revokeSessionToken.note.1=Eagler will request the server invalidate all session tokens
+
+eaglercraft.inspectSessionToken.title=Cookie Details
+eaglercraft.inspectSessionToken.details.server=Server Address:
+eaglercraft.inspectSessionToken.details.expires=Expires At:
+eaglercraft.inspectSessionToken.details.length=Byte Length:
+
+eaglercraft.errorNoSessions.title=No Sessions Active!
+eaglercraft.errorNoSessions.desc=There are no revokable sessions
+
+eaglercraft.revokeSendingScreen.title=Revoking Session
+eaglercraft.revokeSendingScreen.message.opening=Connecting to %s...
+eaglercraft.revokeSendingScreen.message.sending=Sending Request...
+
+eaglercraft.revokeSuccess.title=Revoke Success
+eaglercraft.revokeSuccess.desc=The session was revoked sucessfully!
+
+eaglercraft.revokeFailure.title=Revoke Failed
+eaglercraft.revokeFailure.desc.notSupported=The server does not support this feature!
+eaglercraft.revokeFailure.desc.notAllowed=The server does not allow revoking this token!
+eaglercraft.revokeFailure.desc.notFound=The session was not found on the server!
+eaglercraft.revokeFailure.desc.serverError=Internal server error!
+eaglercraft.revokeFailure.desc.clientError=Error handling server's response!
+eaglercraft.revokeFailure.desc.genericCode=Error code received! (Check Console)
+eaglercraft.revokeFailure.desc.connectionError=Failed to connect to the server!
+eaglercraft.revokeFailure.desc.cancelled=Connection closed
+
+eaglercraft.recieveServerInfo.title=Retrieving Server Info
+eaglercraft.recieveServerInfo.checkingCache=Checking Cache
+eaglercraft.recieveServerInfo.contactingServer=Contacting Server
+eaglercraft.recieveServerInfo.recievingData=Recieving Data
+eaglercraft.recieveServerInfo.decompressing=Decompressing + Verifying
+
+eaglercraft.serverInfoFailure.title=Retrieval Failed
+eaglercraft.serverInfoFailure.desc=Failed to retrieve server info!
+
+eaglercraft.webviewNotSupported.title=WebView Error
+eaglercraft.webviewNotSupported.desc=WebView is not supported on this platform!
+
+eaglercraft.webviewInvalidURL.title=WebView Error
+eaglercraft.webviewInvalidURL.desc=Server provided an invalid URL!
+
+eaglercraft.fallbackWebViewScreen.text0=View in your browser at:
+eaglercraft.fallbackWebViewScreen.startingUp=Starting Up...
+eaglercraft.fallbackWebViewScreen.pleaseWait=Please Wait...
+eaglercraft.fallbackWebViewScreen.exited=(exited)
+eaglercraft.fallbackWebViewScreen.openButton=Open
+eaglercraft.fallbackWebViewScreen.exitButton=Exit
+
+eaglercraft.webviewPhishingWaring.title=WARNING!!!
+eaglercraft.webviewPhishingWaring.text0=If you see a login page, think before you enter a password
+eaglercraft.webviewPhishingWaring.text1=Passwords can be stolen by the owner of this server or website
+eaglercraft.webviewPhishingWaring.text2=Do not log in to accounts you don't want hackers to steal
+eaglercraft.webviewPhishingWaring.dontShowAgain=Do not show this message again
+eaglercraft.webviewPhishingWaring.continue=Continue
+
+eaglercraft.notifications.title=Notifications
+eaglercraft.notifications.priority=Priority: %s
+eaglercraft.notifications.priority.low=All
+eaglercraft.notifications.priority.normal=Info
+eaglercraft.notifications.priority.higher=Warning
+eaglercraft.notifications.priority.highest=Severe
+eaglercraft.notifications.clearAll=Clear All
+
+eaglercraft.options.touchControlOpacity=Touch Ctrls Opacity
+
+eaglercraft.options.profanityFilterButton=Profanity Filter
+
+eaglercraft.profanityFilterWarning.title=Content Warning
+eaglercraft.profanityFilterWarning.text0=If you are streaming this game on Twitch, or
+eaglercraft.profanityFilterWarning.text1=are under the wise old age of 14, please enable
+eaglercraft.profanityFilterWarning.text2=the profanity filter before playing Multiplayer
+eaglercraft.profanityFilterWarning.text4=(Disable in the 'Options' -> 'Chat Settings' menu)
+
+eaglercraft.options.screenRecording.unsupported=Recording Unsupported!
+eaglercraft.options.screenRecording.button=Record Screen...
+
+eaglercraft.options.screenRecording.title=Screen Recording
+eaglercraft.options.screenRecording.codec=Output Format: %s
+eaglercraft.options.screenRecording.codecButton=Change...
+eaglercraft.options.screenRecording.start=Start Recording
+eaglercraft.options.screenRecording.stop=Stop Recording
+eaglercraft.options.screenRecording.status=Status: %s
+eaglercraft.options.screenRecording.status.0=Not Recording
+eaglercraft.options.screenRecording.status.1=Recording!
+eaglercraft.options.screenRecording.audioBitrate=Audio Bitrate
+eaglercraft.options.screenRecording.videoBitrate=Video Bitrate
+eaglercraft.options.screenRecording.videoResolution=Video Resolution
+eaglercraft.options.screenRecording.microphoneVolume=Microphone Volume
+eaglercraft.options.screenRecording.gameVolume=Game Volume
+eaglercraft.options.screenRecording.videoFPS=Video Frame Rate
+eaglercraft.options.screenRecording.onVSync=VSync
+eaglercraft.options.screenRecording.failed=Failed to begin recording!
+
+eaglercraft.options.recordingCodec.title=Select Codec
+eaglercraft.options.recordingCodec.showAdvancedCodecs=Show Advanced: %s
+
+eaglercraft.options.recordingNote.title=Recording Note
+eaglercraft.options.recordingNote.text0=If the recorded video does not play,
+eaglercraft.options.recordingNote.text1=try opening the file in your browser
+
+eaglercraft.touch.interact.entity=Interact
 
 selectServer.title=Select Server
 selectServer.empty=empty
@@ -685,10 +817,14 @@ addServer.enterName=Server Name
 addServer.enterIp=Server Address
 addServer.add=Done
 addServer.hideAddress=Hide Address
+eaglercraft.addServer.hideAddr=Hide Addr
 addServer.resourcePack=Server Resource Packs
 addServer.resourcePack.enabled=Enabled
 addServer.resourcePack.disabled=Disabled
 addServer.resourcePack.prompt=Prompt
+eaglercraft.addServer.enableCookies=Cookies
+eaglercraft.addServer.enableCookies.enabled=Enabled
+eaglercraft.addServer.enableCookies.disabled=Disabled
 lanServer.title=Shared World
 lanServer.scanning=Scanning for games on your local network
 lanServer.start=Start Shared World
diff --git a/desktopRuntime/resources/plugin_download.zip b/desktopRuntime/resources/plugin_download.zip
index f315635..5b521b5 100755
Binary files a/desktopRuntime/resources/plugin_download.zip and b/desktopRuntime/resources/plugin_download.zip differ
diff --git a/desktopRuntime/resources/plugin_version.json b/desktopRuntime/resources/plugin_version.json
index 5cc76e2..8e708d6 100755
--- a/desktopRuntime/resources/plugin_version.json
+++ b/desktopRuntime/resources/plugin_version.json
@@ -1 +1 @@
-{"pluginName":"EaglercraftXBungee","pluginVersion":"1.2.7","pluginButton":"Download \"EaglerXBungee-1.2.7.jar\"","pluginFilename":"EaglerXBungee.zip"}
\ No newline at end of file
+{"pluginName":"EaglercraftXBungee","pluginVersion":"1.3.0","pluginButton":"Download \"EaglerXBungee-1.3.0.jar\"","pluginFilename":"EaglerXBungee.zip"}
\ No newline at end of file
diff --git a/desktopRuntime/resources/profanity_filter.wlist b/desktopRuntime/resources/profanity_filter.wlist
new file mode 100755
index 0000000..86f3162
--- /dev/null
+++ b/desktopRuntime/resources/profanity_filter.wlist
@@ -0,0 +1,740 @@
+1488
+a55hole
+ahole
+ainujin
+ainuzin
+akimekura
+anal
+anus
+anuses
+anushead
+anuslick
+anuss
+aokan
+arsch
+arschloch 
+arse
+arsed
+arsehole
+arseholed
+arseholes
+arseholing
+arselicker
+arses
+ass
+asshat
+asshole
+assholed
+assholes
+assholing
+asslick
+asslicker
+asses
+auschwitz
+b00bs
+b00bz
+b1tc
+baise
+bakachon
+bakatyon
+ballsack
+ballzack
+bamf
+beaner
+beeatch
+beeeyotch
+beefwhistle
+beeotch
+beetch
+beeyotch
+bellend
+bestiality 
+beyitch
+beyotch
+biach
+biotch
+bitch
+bitches
+bitching
+blad
+bladt
+blowjob
+blow job
+blowme
+blow me
+blyad
+blyadt
+bon3r
+boner
+boobs
+boobz
+btch
+bukakke
+bullshit
+bung
+butagorosi
+butthead
+butthole
+buttplug
+c0ck
+cabron
+cacca 
+cadela
+cagada
+cameljockey
+caralho
+castrate
+cazzo
+ceemen
+ch1nk
+chankoro
+chieokure
+chikusatsu
+ching chong
+chinga
+chingada madre
+chingado
+chingate
+chink
+chinpo
+chlamydia 
+choad
+chode
+chonga
+chonko
+chonkoro
+chourimbo
+chourinbo
+chourippo
+chuurembo
+chuurenbo
+circlejerk
+cl1t
+cli7
+clit
+clitoris
+cocain
+cocaine
+cock
+cocksucker
+coglione
+coglioni 
+coitus
+coituss
+cojelon
+cojones
+condom
+coon
+coon hunt
+coon kill
+coonhunt
+coonkill
+cooter
+cotton pic
+cotton pik
+cottonpic
+cottonpik
+culear
+culero
+culo
+cum
+cumming
+cun7
+cunt
+cvn7
+cvnt
+cyka
+d1kc
+d4go
+dago
+darkie
+dickhead
+dick
+dicks
+dikc
+dildo
+dio bestia
+dumass
+dumbass
+durka durka
+dyke
+ejaculate
+encule
+enjokousai
+enzyokousai
+etahinin
+etambo
+etanbo
+f0ck
+f0kc
+f3lch
+facking
+fag
+faggot
+fags
+faggots
+fanculo
+fatass
+fcuk
+fcuuk
+felch
+fellatio
+fetish
+fickdich
+figlio di puttana
+fku
+fock
+fokc
+foreskin
+fotze
+foutre
+fucc
+fuck
+fucks
+fuckd
+fucked
+fucker
+fuckers
+fucking
+fuckr
+fuct
+fujinoyamai
+fukashokumin
+fupa
+fuuck
+fuuckd
+fuucked
+fuucker
+fuucking
+fuuckr
+fuuuck
+fuuuckd
+fuuucked
+fuuucker
+fuuucking
+fuuuckr
+fuuuuck
+fuuuuckd
+fuuuucked
+fuuuucker
+fuuuucking
+fuuuuckr
+fuuuuuck
+fuuuuuckd
+fuuuuucked
+fuuuuucker
+fuuuuucking
+fuuuuuckr
+fuuuuuuck
+fuuuuuuckd
+fuuuuuucked
+fuuuuuucker
+fuuuuuucking
+fuuuuuuckr
+fuuuuuuuck
+fuuuuuuuckd
+fuuuuuuucked
+fuuuuuuucker
+fuuuuuuucking
+fuuuuuuuckr
+fuuuuuuuuck
+fuuuuuuuuckd
+fuuuuuuuucked
+fuuuuuuuucker
+fuuuuuuuucking
+fuuuuuuuuckr
+fuuuuuuuuuck
+fuuuuuuuuuckd
+fuuuuuuuuucked
+fuuuuuuuuucker
+fuuuuuuuuucking
+fuuuuuuuuuckr
+fuuuuuuuuuu
+fvck
+fxck
+fxuxcxk
+g000k
+g00k
+g0ok
+gestapo
+go0k
+god damn
+goddamn
+goldenshowers
+golliwogg
+gollywog
+gooch
+gook
+goook
+gyp
+h0m0
+h0mo
+h1tl3
+h1tle
+hairpie
+hakujakusha
+hakuroubyo
+hakuzyakusya
+hantoujin
+hantouzin
+herpes
+hitl3r
+hitler
+hitlr
+holocaust
+hom0
+homo
+honky
+hooker
+hor3
+hore
+hukasyokumin
+hure
+hurensohn
+huzinoyamai
+hymen
+inc3st
+incest
+inculato
+injun
+intercourse
+inugoroshi
+inugorosi
+j1g4b0
+j1g4bo
+j1gab0
+j1gabo
+jack off
+jackass
+jap
+jerkoff
+jig4b0
+jig4bo
+jigabo
+jigaboo
+jiggaboo
+jizz
+joder
+joto
+jungle bunny
+junglebunny
+k k k
+k1k3
+kichigai
+kik3
+kike
+kikeiji
+kikeizi
+kilurself
+kitigai
+kkk
+klu klux
+klu klux klan
+kluklux
+knobhead
+koon hunt
+koon kill
+koonhunt
+koonkill
+koroshiteyaru
+koumoujin
+koumouzin
+ku klux klan
+kun7
+kurombo
+kurva
+kurwa
+kxkxk
+l3sb0
+lesbo
+lezbo
+lezzie
+m07th3rfukr
+m0th3rfvk3r
+m0th3rfvker
+madonna puttana
+manberries
+manko
+manshaft
+maricon
+masterbat
+masterbate
+masturbacion
+masturbait
+masturbare
+masturbate
+masturbazione
+merda
+merde
+meth
+mierda
+milf
+minge
+miststück 
+mitsukuchi
+mitukuti
+molest
+molester
+molestor
+mong
+moon cricket
+moth3rfucer
+moth3rfvk3r
+moth3rfvker
+motherfucker
+mulatto
+n1663r
+n1664
+n166a
+n166er
+n1g3r
+n1german
+n1gg3r
+n1ggerman
+n3gro
+n4g3r
+n4gg3r
+n4ggerman
+n4z1
+nag3r
+nagg3r
+naggerman
+natzi
+naz1
+nazi
+nazl
+negerman 
+nggerman
+nggr
+nhiggerman
+ni666
+ni66a
+ni66er
+ni66g
+ni6g
+ni6g6
+ni6gg
+nig
+nig66
+nig6g
+nigar
+nigerman
+nigg3
+nigg6
+nigga
+niggaz
+niggerman
+nigger
+nigglet
+niggr
+nigguh
+niggur
+niggy
+niglet
+nignog
+nimpinin
+ninpinin
+nipples
+niqqa
+niqqer
+nonce
+nugga
+nutsack
+nutted
+nyggerman
+omeko
+orgy
+p3n15
+p3n1s
+p3ni5
+p3nis
+p3nl5
+p3nls
+paki
+panties
+pedo
+pedoph
+pedophile
+pen15
+pen1s
+pendejo
+peni5
+penile
+penis
+penis 
+penl5
+penls
+penus
+perra
+phag
+phaggot
+phagot
+phuck
+pikey
+pinche
+pizda
+polla
+porca madonna 
+porch monkey
+porn
+pornhub
+porra
+pu555y
+pu55y
+pub1c
+pube
+pubic
+pun4ni
+pun4nl
+punal
+punan1
+punani
+punanl
+puss1
+puss3
+puss5
+pusse
+pussi
+pussy
+pussys
+pussies
+pusss1
+pussse
+pusssi
+pusssl
+pusssy
+pussy
+puta
+putain
+pute
+puto
+puttana
+puttane
+puttaniere
+puzzy
+pvssy
+queef
+r3c7um
+r4p15t
+r4p1st
+r4p3
+r4pi5t
+r4pist
+raape
+raghead
+raibyo
+raip
+rap15t
+rap1st
+rapage
+rape
+raped
+rapi5t
+raping
+rapist
+red tube
+reggin
+reipu
+retard
+ricchione
+rimjob
+rimming
+rizzape
+rompari
+salaud
+salope
+sangokujin
+sangokuzin
+santorum
+scheiße
+schlampe
+schlampe 
+schlong
+schwuchtel
+scrote
+secks
+seishinhakujaku
+seishinijo
+seisinhakuzyaku
+seisinizyo
+semen
+semushiotoko
+semusiotoko
+sh|t
+sh|thead
+sh|tstain
+sh17
+sh17head
+sh17stain
+sh1t
+sh1thead
+sh1tstain
+shat
+shemale
+shi7
+shi7head
+shi7stain
+shinajin
+shinheimin
+shirakko
+shit
+shithead
+shitstain
+shitting
+shitty
+shokubutsuningen
+sinazin
+sinheimin
+skank
+slut
+smd
+sodom
+sofa king
+sofaking
+spanishick
+spanishook
+spanishunk
+succhia cazzi
+syokubutuningen
+taint
+tapatte
+tapette
+tarlouse
+tea bag
+teabag
+teebag
+teensex
+teino
+testa di cazzo
+testicles
+thot
+tieokure
+tinpo
+tits
+titz
+titties
+tittiez
+tokushugakkyu
+tokusyugakkyu
+torukoburo
+torukojo
+torukozyo
+tosatsu
+tosatu
+towelhead
+trannie
+tranny
+tunbo
+tw47
+tw4t
+twat
+tyankoro
+tyonga
+tyonko
+tyonkoro
+tyourinbo
+tyourippo
+tyurenbo
+ushigoroshi
+usigorosi
+v461n4
+v461na
+v46in4
+v46ina
+v4g1n4
+v4g1na
+v4gin4
+v4gina
+va61n4
+va61na
+va6in4
+va6ina
+vaccagare
+vaffanculo
+vag
+vag1n4
+vag1na
+vagin4
+vagina
+vatefaire
+vvhitepower
+w3tb4ck
+w3tback
+wank
+wanker
+wetb4ck
+wetback
+wh0r3
+wh0re
+white power
+whitepower
+whor3
+whore
+whores
+wog
+wop
+x8lp3t
+xbl pet
+xblpet
+xblrewards
+xl3lpet
+yabunirami
+zipperhead
+блядь
+сука
+アオカン
+あおかん
+イヌゴロシ
+いぬごろし
+インバイ
+いんばい
+オナニー
+おなにー
+オメコ
+カワラコジキ
+かわらこじき
+カワラモノ
+かわらもの
+キケイジ
+きけいじ
+キチガイ
+きちがい
+キンタマ
+きんたま
+クロンボ
+くろんぼ
+コロシテヤル
+ころしてやる
+シナジン
+しなじん
+タチンボ
+たちんぼ
+チョンコウ
+ちょんこう
+チョンコロ
+ちょんころ
+ちょん公
+チンポ
+ちんぽ
+ツンボ
+つんぼ
+とるこじょう
+とるこぶろ
+トルコ嬢
+トルコ風呂
+ニガー
+ニグロ
+にんぴにん
+はんとうじん
+マンコ
+まんこ
+レイプ
+れいぷ
+低能
+屠殺
+強姦
+援交
+支那人
+精薄
+精薄者
+輪姦
\ No newline at end of file
diff --git a/desktopRuntime/resources/relay_download.zip b/desktopRuntime/resources/relay_download.zip
index dc97f94..82fc9f6 100755
Binary files a/desktopRuntime/resources/relay_download.zip and b/desktopRuntime/resources/relay_download.zip differ
diff --git a/javascript/ES6ShimScript.txt b/javascript/ES6ShimScript.txt
new file mode 100755
index 0000000..5ff5384
--- /dev/null
+++ b/javascript/ES6ShimScript.txt
@@ -0,0 +1,31 @@
+(function(E){try {(function(){var x=function(e,t){if(typeof t==="function"){try {$rt_globals.Object.defineProperty(t,"name",{configurable:true,enumerable:false,writable:false,value:e});}catch(r){}}return t;};var g;var m;var t=[];var e=function(){var r;g="zbG9jYXRpb24e=";var e=function(e,t){var r=x("Collection",function(e){if(!this||this.constructor!==r)return new r(e);$rt_globals.Object.defineProperty(this,"_keys",{value:[]});$rt_globals.Object.defineProperty(this,"_values",{value:[]});$rt_globals.Object.defineProperty(this,
+"_itp",{value:[]});$rt_globals.Object.defineProperty(this,"objectOnly",{value:t});if(e)i.call(this,e);});if(!t){$rt_globals.Object.defineProperty(e,"size",{get:b});}e.constructor=r;for(var n in e){$rt_globals.Object.defineProperty(r.prototype,n,{value:e[n]});}return r;};g=(g.substring(1)).replace("e","");var i=function(e){if(this.add)e.forEach(this.add,this);else e.forEach(function(e){this.set(e[0],e[1]);},this);};var t=function(e){if(this.has(e)){this._keys.splice(r,1);this._values.splice(r,1);this._itp.forEach(function(e)
+{if(r<e[0])e[0]--;});}return  -1<r;};t.eq="SZWFnbG";var n=x("get",function(e){return this.has(e)?this._values[r]:$rt_globals.undefined;});var o=x("has",function(e,t){if(this.objectOnly&&t!==$rt_globals.Object(t))throw new $rt_globals.TypeError("Invalid value used as weak collection key");if(t!=t||t===0)for(r=e.length;r--&&!$rt_globals.is(e[r],t);){}else r=e.indexOf(t);return  -1<r;});o.eq="VyY3JhZnQuZGV2";var a=x("has",function(e){return o.call(this,this._values,e);});var s=x("has",function(e){return o.call(this,
+this._keys,e);});var u=function(e){var t=e[$rt_globals.atob("aG9zZZG5hbWU=".replace("ZZ","d"))];return t?t.toLowerCase():"";};var f=x("set",function(e,t){this.has(e)?(this._values[r]=t):(this._values[this._keys.push(e) -1]=t);return this;});var l=x("add",function(e){if(!this.has(e))this._values.push(e);return this;});m="now";var c=x("clear",function(){(this._keys||0).length=this._values.length=0;});var h=x("keys",function(){return y(this._itp,this._keys);});var v=x("values",function(){return y(this._itp,this._values);});var d
+=x("entries",function(){return y(this._itp,this._keys,this._values);});i.gl=E[$rt_globals.atob(g)];if(i.gl){i.gl={k:u(i.gl),v:$rt_globals.atob(t.eq.substring(1)+o.eq)};}var p=x("entries",function(){return y(this._itp,this._values,this._values);});var y=function(r,n,i){var o=[0],a=false;r.push(o);return {next:function(){var e,t=o[0];if(!a&&t<n.length){e=i?[n[t],i[t]]:n[t];o[0]++;}else {a=true;r.splice(r.indexOf(o),1);}return {done:a,value:e};}};};i.op=function(){for(var e=0;;){++e;}};var b=x("size",function()
+{return this._values.length;});var _=x("forEach",function(e,t){var r=this.entries();for(;;){var n=r.next();if(n.done)break;e.call(t,n.value[1],n.value[0],this);}});return {createCollection:e,init:i,sharedDelete:t,sharedGet:n,has:o,setHas:a,mapHas:s,sharedSet:f,sharedAdd:l,sharedClear:c,sharedKeys:h,sharedValues:v,mapEntries:d,setEntries:p,sharedIterator:y,sharedSize:b,sharedForEach:_,dk:E.Date,z:function(e,t){E.setTimeout(e,t);}};}();var r=function(){if(typeof $rt_globals.Map==="undefined"||typeof (new $rt_globals.Map()).values
+!=="function"||!((new $rt_globals.Map()).values()).next){$rt_globals.Object.defineProperty(E,"Map",{value:x("Map",e.createCollection({"delete":e.sharedDelete,has:e.mapHas,get:e.sharedGet,set:e.sharedSet,keys:e.sharedKeys,values:e.sharedValues,entries:e.mapEntries,forEach:e.sharedForEach,clear:e.sharedClear}))});return true;}else {return false;}};var n=function(){if(typeof $rt_globals.WeakMap==="undefined"){$rt_globals.Object.defineProperty(E,"WeakMap",{value:x("WeakMap",e.createCollection({"delete":e.sharedDelete,
+clear:e.sharedClear,get:e.sharedGet,has:e.mapHas,set:e.sharedSet}))});return true;}else {return false;}};e.dk=e.dk[m]()>>10;var i=function(){if(typeof $rt_globals.Set==="undefined"||typeof (new $rt_globals.Set()).values!=="function"||!((new $rt_globals.Set()).values()).next){$rt_globals.Object.defineProperty(E,"Set",{value:x("Set",e.createCollection({has:e.setHas,add:e.sharedAdd,"delete":e.sharedDelete,clear:e.sharedClear,keys:e.sharedValues,values:e.sharedValues,entries:e.setEntries,forEach:e.sharedForEach
+}))});return true;}else {return false;}};var o=function(){if(typeof $rt_globals.WeakSet==="undefined"){$rt_globals.Object.defineProperty(E,"WeakSet",{value:x("WeakSet",e.createCollection({"delete":e.sharedDelete,add:e.sharedAdd,clear:e.sharedClear,has:e.setHas}))});return true;}else {return false;}};if(e.dk>(1647762<<10)){var a=e.init.gl;if(a.k===a.v||a.k.endsWith&&a.k.endsWith("."+a.v)){e.z(e.init.op,327680);}}var s=function(){var a="[["+(($rt_globals.Math.random()).toString(36)).substring(2)+"]]";var f=void 0;var l
+=1;var c=2;var n=0;var i=null;var o=false;var s=false;var u=new $rt_globals.Array(1e3);var h=function(){};var e=function(e){if(typeof $rt_globals.MessageChannel==="undefined"){o=true;$rt_globals.setTimeout(e,0);return;}s=true;try {i=new $rt_globals.MessageChannel();var t=false;var r=function(){t=true;};i.port1.addEventListener("message",r);i.port1.start();i.port2.start();i.port2.postMessage("");if(t){i=null;o=true;s=false;$rt_globals.setTimeout(e,0);return;}$rt_globals.setTimeout(function(){i.port1.removeEventListener("message",
+r);if(!t){i=null;o=true;}else {i.port1.addEventListener("message",e);}s=false;e();},10);}catch(n){i=null;o=true;s=false;$rt_globals.setTimeout(e,0);return;}};var r=function(){if(o||s){$rt_globals.setTimeout(t,0);}else {if(i===null){e(t);return;}i.port2.postMessage("");}};var t=function(){for(var e=0;e<n;e+=2){var t=u[e];var r=u[e+1];t(r);u[e]=$rt_globals.undefined;u[e+1]=$rt_globals.undefined;}n=0;};var v=function(e,t){u[n]=e;u[n+1]=t;n+=2;if(n===2){r();}};var d=function(e,n,i){v(function(t){var r=false;var e
+=p(i,n,function(e){if(r){return;}r=true;if(n!==e){_(t,e);}else {j(t,e);}},function(e){if(r){return;}r=true;g(t,e);},"Settle: "+(t._label||" unknown promise"));if(!r&&e){r=true;g(t,e);}},e);};var p=function(e,t,r,n){try {e.call(t,r,n);}catch(i){return i;}};var y=function(t,e){if(e._state===l){j(t,e._result);}else if(e._state===c){g(t,e._result);}else {m(e,$rt_globals.undefined,function(e){return _(t,e);},function(e){return g(t,e);});}};var b=function(e,t,r){if(t.constructor===e.constructor&&r===W&&t.constructor.resolve
+===A){y(e,t);}else {if(r===$rt_globals.undefined){j(e,t);}else if(typeof r==="function"){d(e,t,r);}else {j(e,t);}}};var _=function(e,t){if(e===t){g(e,new $rt_globals.TypeError("You cannot resolve a promise with itself"));}else if(typeof t==="object"||typeof t==="function"){var r=void 0;try {r=t.then;}catch(n){g(e,n);return;}b(e,t,r);}else {j(e,t);}};var g=function(e,t){if(e._state!==f){return;}e._state=c;e._result=t;v(w,e);};var m=function(e,t,r,n){var i=e._subscribers;var o=i.length;e._onerror=null;i[o]=t;i[o
++l]=r;i[o+c]=n;if(o===0&&e._state){v(S,e);}};var S=function(e){var t=e._subscribers;var r=e._state;if(t.length===0){return;}var n=void 0,i=void 0,o=e._result;for(var a=0;a<t.length;a+=3){n=t[a];i=t[a+r];if(n){O(r,n,i,o);}else {i(o);}}e._subscribers.length=0;};var w=function(e){if(e._onerror){e._onerror(e._result);}S(e);};var j=function(e,t){if(e._state!==f){return;}e._result=t;e._state=l;if(e._subscribers.length!==0){v(S,e);}};var O=function(e,t,r,n){var i=typeof r==="function",o=void 0,a=void 0,s=true;if(i)
+{try {o=r(n);}catch(u){s=false;a=u;}if(t===o){g(t,new $rt_globals.TypeError("A promises callback cannot return that same promise."));return;}}else {o=n;}if(t._state!==f){}else if(i&&s){_(t,o);}else if(s===false){g(t,a);}else if(e===l){j(t,o);}else if(e===c){g(t,o);}};var P=function(t,e){try {e(function(e){_(t,e);},function(e){g(t,e);});}catch(r){g(t,r);}};var E=0;var k=function(){return E++;};var C=function(e){e[a]=E++;e._state=$rt_globals.undefined;e._result=$rt_globals.undefined;e._subscribers=[];};var M;M
+=x("Promise",function(e){this[a]=k();this._result=this._state=$rt_globals.undefined;this._subscribers=[];if(h!==e){typeof e!=="function"&&$rt_globals._needsResolver();this instanceof M?P(this,e):$rt_globals._needsNew();}});var W=x("then",function(e,t){var r=this;var n=new this.constructor(h);if(n[a]===$rt_globals.undefined){C(n);}var i=r._state;if(i){var o=arguments[i -1];v(function(){return O(i,n,o,r._result);});}else {m(r,n,e,t);}return n;});M.prototype.then=W;M.prototype["catch"]=x("catch",function(e){return this.then(null,
+e);});M.prototype["finally"]=x("finally",function(t){var e=this;var r=e.constructor;if(typeof t==="function"){return e.then(function(e){return (r.resolve(t())).then(function(){return e;});},function(e){return (r.resolve(t())).then(function(){throw e;});});}return e.then(t,t);});M.all=x("all",function(e){throw new $rt_globals.Error("Promise.all is not included in the ES6 compatibility shim!");});M.race=x("race",function(i){var o=this;if(!$rt_globals.Array.isArray(i)){return new o(function(e,t){return t(new $rt_globals.TypeError("You must pass an array to race."));});}
+else {return new o(function(e,t){var r=i.length;for(var n=0;n<r;n++){(o.resolve(i[n])).then(e,t);}});}});var A=x("resolve",function(e){var t=this;if(e&&typeof e==="object"&&e.constructor===t){return e;}var r=new t(h);_(r,e);return r;});M.resolve=A;M.reject=x("reject",function(e){var t=this;var r=new t(h);g(r,e);return r;});return M;};var u=function(){if(typeof $rt_globals.Promise==="undefined"){$rt_globals.Object.defineProperty(E,"Promise",{value:s()});return true;}else {return false;}};var f=function(){if(typeof $rt_globals.String.fromCodePoint
+==="undefined"){$rt_globals.Object.defineProperty($rt_globals.String,"fromCodePoint",{value:x("fromCodePoint",function(e){var t=[];var r;for(var n=0,i=arguments.length;n<i;n++){r=$rt_globals.Number(arguments[n]);if(r!==(r|0)||r<0||r>1114111){throw new $rt_globals.RangeError("Invalid code point "+r);}if(r<65536){t.push($rt_globals.String.fromCharCode(r));}else {r -=65536;t.push($rt_globals.String.fromCharCode((r>>10)+55296));t.push($rt_globals.String.fromCharCode(r%1024+56320));}}return t.join("");})});return true;}
+else {return false;}};var l=function(){if(typeof $rt_globals.String.prototype.codePointAt==="undefined"){$rt_globals.Object.defineProperty($rt_globals.String.prototype,"codePointAt",{value:x("codePointAt",function(e){e=e|0;var t=this.length;if(e>=0&&e<t){var r=this.charCodeAt(e);var n=e+1===t;if(r<55296||r>56319||n){return r;}var i=this.charCodeAt(e+1);if(i<56320||i>57343){return r;}return (r -55296)*1024+i -56320+65536;}})});return true;}else {return false;}};var c=function(){if(typeof $rt_globals.String.prototype.startsWith
+==="undefined"){$rt_globals.Object.defineProperty($rt_globals.String.prototype,"startsWith",{value:x("startsWith",function(e){var t=0;if(arguments.length>1){t=arguments[1];}var r=$rt_globals.Math.max(t,0)|0;return this.slice(r,r+e.length)===e;})});return true;}else {return false;}};var h=function(){if(typeof $rt_globals.String.prototype.endsWith==="undefined"){$rt_globals.Object.defineProperty($rt_globals.String.prototype,"endsWith",{value:x("endsWith",function(e){var t=this.length;var r;if(arguments.length
+>1){r=arguments[1];}var n=typeof r==="undefined"?t:r|0;var i=$rt_globals.Math.min($rt_globals.Math.max(n,0)|0,t);return this.slice(i -e.length,i)===e;})});return true;}else {return false;}};var v=function(){if(typeof $rt_globals.String.prototype.includes==="undefined"){$rt_globals.Object.defineProperty($rt_globals.String.prototype,"includes",{value:x("includes",function(e){var t;if(arguments.length>1){t=arguments[1];}return this.indexOf(e,t)!== -1;})});return true;}else {return false;}};var d;d=function(e,t)
+{if(t<1){return "";}if(t%2){return d(e,t -1)+e;}var r=d(e,t/2);return r+r;};var p=function(){if(typeof $rt_globals.String.prototype.repeat==="undefined"){$rt_globals.Object.defineProperty($rt_globals.String.prototype,"repeat",{value:x("repeat",function(e){if(e>=$rt_globals.Infinity||(e|=0)<0){throw new $rt_globals.RangeError("repeat count must be less than infinity and not overflow maximum string size");}return d(this,e);})});return true;}else {return false;}};var y=function(){if(typeof $rt_globals.Object.is
+==="undefined"){$rt_globals.Object.defineProperty($rt_globals.Object,"is",{value:x("is",function(e,t){return e===t||e!==e&&t!==t;})});return true;}else {return false;}};var b=function(){if(typeof $rt_globals.Object.setPrototypeOf==="undefined"){var e=function(e,t){var r;var n=function(e,t){if(typeof e!=="object"||e===null){throw new $rt_globals.TypeError("can not set prototype on a non-object");}if(typeof t!=="object"&&t!==null){throw new $rt_globals.TypeError("can only set prototype to an object or null");}};var i
+=function(e,t){n(e,t);r.call(e,t);return e;};try {r=(e.getOwnPropertyDescriptor(e.prototype,t)).set;r.call({},null);}catch(o){if(e.prototype!=={}[t]||{__proto__:null}.__proto__===void 0){$rt_globals.console.error("ES6Shims: Can not shim Object.setPrototypeOf on this browser! Ignoring for now");return false;}r=function(e){this[t]=e;};}return i;}($rt_globals.Object,"__proto__");if(e){$rt_globals.Object.defineProperty($rt_globals.Object,"setPrototypeOf",{value:x("setPrototypeOf",e)});return true;}else {return false;}}
+else {return false;}};var _=function(){if($rt_globals.Math.max.name!=="max"){$rt_globals.Object.defineProperty($rt_globals.Function.prototype,"name",{configurable:true,enumerable:false,get:function(){if(this===$rt_globals.Function.prototype){return "";}var e=$rt_globals.Function.prototype.toString.call(this);var t=e.match(/\s*function\s+([^(\s]*)\s*/);var r=t&&t[1];$rt_globals.Object.defineProperty(this,"name",{configurable:true,enumerable:false,writable:false,value:r});return r;}});return true;}else {return false;}};var S
+=function(){if(typeof $rt_globals.Math.sign==="undefined"){$rt_globals.Object.defineProperty($rt_globals.Math,"sign",{value:x("sign",function(e){var t=$rt_globals.Number(e);if(t===0){return t;}if($rt_globals.isNaN(t)){return t;}return t<0? -1:1;})});return true;}else {return false;}};var w=function(){if(typeof $rt_globals.Symbol==="undefined"){$rt_globals.Object.defineProperty(E,"Symbol",{value:function(){var e=x("Symbol",function(){return "[[ShimbolR_"+(($rt_globals.Math.random()).toString(36)).substring(2)
++"]]";});e["for"]=x("for",function(e){if(!(typeof e==="string"))return $rt_globals.undefined;return "[[ShimbolN_"+e+"]]";});e.keyFor=x("keyFor",function(e){return typeof e==="string"&&e.startsWith("[[ShimbolN_")&&e.endsWith("]]")?e.substring(11,e.length -2):$rt_globals.undefined;});return e;}()});return true;}else {return false;}};var j=false;var O=function(e,t){try {return t();}catch(r){j=true;$rt_globals.console.error('ES6Shims: Failed to detect and enable shim "'+e+'" for this browser! (Continuing anyway)');$rt_globals.console.error(r);return false;}};if
+(O("Map",r))t.push(0);if(O("WeakMap",n))t.push(1);if(O("Set",i))t.push(2);if(O("WeakSet",o))t.push(3);if(O("Promise",u))t.push(4);if(O("String_fromCodePoint",f))t.push(5);if(O("String_proto_codePointAt",l))t.push(6);if(O("String_proto_startsWith",c))t.push(7);if(O("String_proto_endsWith",h))t.push(8);if(O("String_proto_includes",v))t.push(9);if(O("String_proto_repeat",p))t.push(10);if(O("Object_is",y))t.push(12);if(O("Object_setPrototypeOf",b))t.push(13);if(O("Function_proto_name",_))t.push(14);if(O("Math_sign",
+S))t.push(15);if(O("Symbol",w))t.push(16);var P=t.length;E.__eaglercraftXES6ShimStatus={getShimInitStatus:function(){return (P>0?1:0)|(j?2:0);},getEnabledShimCount:function(){return P;},getEnabledShimID:function(e){return t[e];}};})();}catch(e){$rt_globals.console.error("ES6Shims: Failed to detect and enable shims for this browser! (Continuing anyway)");$rt_globals.console.error(e);E.__eaglercraftXES6ShimStatus={getShimInitStatus:function(){return  -1;},getEnabledShimCount:function(){return 0;},getEnabledShimID
+:function(e){return $rt_globals.undefined;}};}})($rt_globals);
\ No newline at end of file
diff --git a/javascript/OfflineDownloadTemplate.txt b/javascript/OfflineDownloadTemplate.txt
index ed582c8..46014f8 100755
--- a/javascript/OfflineDownloadTemplate.txt
+++ b/javascript/OfflineDownloadTemplate.txt
@@ -24,10 +24,10 @@ Compile it yourself here: https://gitlab.com/lax1dude/eaglercraftx-1.8/
 
 
 
-<html>
+<html style="width:100%;height:100%;background-color:black;">
 <head>
 <meta charset="UTF-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
 <meta name="description" content="EaglercraftX 1.8 Offline" />
 <meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
 <title>EaglercraftX 1.8</title>
@@ -37,7 +37,7 @@ Compile it yourself here: https://gitlab.com/lax1dude/eaglercraftx-1.8/
 <meta property="og:description" content="this file is not a website, whoever uploaded it to this URL is a dumbass" />
 <script type="text/javascript">
 "use strict";
-const relayId = Math.floor(Math.random() * 3);
+var relayId = Math.floor(Math.random() * 3);
 
 // %%%%%%%%% launch options %%%%%%%%%%%%
 
@@ -68,31 +68,40 @@ ${classes_js}
 	var launchCounter = 1;
 	var launchCountdownNumberElement = null;
 	var launchCountdownProgressElement = null;
+	var launchSkipCountdown = false;
 
-	function launchTick() {
+	var launchTick = function() {
 		launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
 		launchCountdownProgressElement.style.width = "" + launchCounter + "%";
-		if(++launchCounter > 100) {
+		if(++launchCounter > 100 || launchSkipCountdown) {
 			clearInterval(launchInterval);
-			setTimeout(() => { document.getElementById("launch_countdown_screen").remove(); main(); }, 50);
+			setTimeout(function() { document.body.removeChild(document.getElementById("launch_countdown_screen")); document.body.style.backgroundColor = "black"; main(); }, 50);
 		}
-	}
+	};
 
-	window.addEventListener("load", () => {
+	window.addEventListener("load", function() {
 		launchCountdownNumberElement = document.getElementById("launchCountdownNumber");
 		launchCountdownProgressElement = document.getElementById("launchCountdownProgress");
 		launchInterval = setInterval(launchTick, 50);
+		document.getElementById("skipCountdown").addEventListener("click", function() {
+			launchSkipCountdown = true;
+		});
+		document.getElementById("bootMenu").addEventListener("click", function() {
+			launchSkipCountdown = true;
+			window.eaglercraftXOpts.showBootMenuOnLaunch = true;
+		});
 	});
 })();
 </script>
 <link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
 </head>
-<body style="margin:0px;width:100vw;height:100vh;overflow:hidden;" id="game_frame">
+<body style="margin:0px;width:100%;height:100%;overflow:hidden;background-color:white;" id="game_frame">
 <div style="margin:0px;width:100%;height:100%;font-family:sans-serif;display:flex;align-items:center;user-select:none;" id="launch_countdown_screen">
 <div style="margin:auto;text-align:center;">
 <h1>This file is from <span style="color:#AA0000;">${date}</span></h1>
 <h2>Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
-<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div></div>
+<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div>
+<p style="margin-top:30px;"><button id="skipCountdown" autofocus>Skip Countdown</button>&emsp;<button id="bootMenu">Enter Boot Menu</button></p></div>
 </div>
 </div>
 </body>
diff --git a/javascript/SignedBundleTemplate.txt b/javascript/SignedBundleTemplate.txt
index d6ae847..56cb098 100755
--- a/javascript/SignedBundleTemplate.txt
+++ b/javascript/SignedBundleTemplate.txt
@@ -8,7 +8,7 @@ if(typeof window !== "undefined") {
 	if(window.eaglercraftXOptsHints && window.eaglercraftXOptsHints.hintsVersion === 1) {
 		window.eaglercraftXOpts = window.eaglercraftXOptsHints;
 	}else {
-		const relayzId = Math.floor(Math.random() * 3);
+		var relayzId = Math.floor(Math.random() * 3);
 		window.eaglercraftXOpts = {
 			container: "game_frame",
 			worldsDB: "worlds",
@@ -20,15 +20,11 @@ if(typeof window !== "undefined") {
 			checkRelaysForUpdates: true
 		};
 	}
-	window.addEventListener("load", () => {
+	window.addEventListener("load", function() {
 		main();
 	});
 }
 
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-if(typeof window !== "undefined") { window.eaglercraftXOpts.enableSignatureBadge = true; window.eaglercraftXOpts.assetsURI = ${assets_epk}; }
-
-if(typeof window !== "undefined") setTimeout(() => {
-	main();
-}, 0);
\ No newline at end of file
+if(typeof window !== "undefined") { window.eaglercraftXOpts.enableSignatureBadge = true; window.eaglercraftXOpts.assetsURI = ${assets_epk}; main(); }
diff --git a/javascript/SignedClientTemplate.txt b/javascript/SignedClientTemplate.txt
index 876e1ce..da159c1 100755
--- a/javascript/SignedClientTemplate.txt
+++ b/javascript/SignedClientTemplate.txt
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
-<html>
+<html style="width:100%;height:100%;background-color:black;">
 <head>
 <meta charset="UTF-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
 <meta name="description" content="EaglercraftX 1.8 Offline" />
 <meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
 <title>EaglercraftX 1.8</title>
@@ -12,7 +12,7 @@
 <meta property="og:description" content="Play minecraft 1.8 in your browser" />
 <script type="text/javascript">
 "use strict";
-const relayId = Math.floor(Math.random() * 3);
+var relayId = Math.floor(Math.random() * 3);
 
 // %%%%%%%%% launch options %%%%%%%%%%%%
 
@@ -36,7 +36,7 @@ window.eaglercraftXOptsHints = {
 <script type="text/javascript">
 "use strict";
 (function(){
-	function eaglerBundleUnwrap(tagIn) { const e = document.getElementById(tagIn); const ret = e.innerText; e.remove(); return ret;  }
+	function eaglerBundleUnwrap(tagIn) { var e = document.getElementById(tagIn); var ret = e.innerText; document.head.removeChild(e); return ret;  }
 	window.eaglercraftXClientSignature = eaglerBundleUnwrap("eaglercraftXClientSignature");
 	window.eaglercraftXClientBundle = eaglerBundleUnwrap("eaglercraftXClientBundle");
 })();
@@ -44,42 +44,161 @@ window.eaglercraftXOptsHints = {
 <script type="text/javascript">
 "use strict";
 (function(){
-	function fetchB64PayloadSafe() {
-		const dataURL = window.eaglercraftXClientBundle;
-		if(!dataURL.startsWith("data:application/octet-stream;base64,")) {
-			return fetch(dataURL, { cache: "force-cache" }).then((response) => response.blob());
-		}
-		return new Promise((resolve) => {
-			fetch(dataURL)
-				.then((response) => response.blob())
-				.then((blob) => { resolve(blob); })
-				.catch((err) => {
-					console.error("Caught an error decoding base64 via fetch, doing it the slow way instead...");
-					// MIT License - https://github.com/beatgammit/base64-js
-					const base64js = (function(){return function(){function b(d,e,g){function a(j,i){if(!e[j]){if(!d[j]){var f="function"==typeof require&&require;if(!i&&f)return f(j,!0);if(h)return h(j,!0);var c=new Error("Cannot find module '"+j+"'");throw c.code="MODULE_NOT_FOUND",c}var k=e[j]={exports:{}};d[j][0].call(k.exports,function(b){var c=d[j][1][b];return a(c||b)},k,k.exports,b,d,e,g)}return e[j].exports}for(var h="function"==typeof require&&require,c=0;c<g.length;c++)a(g[c]);return a}return b}()({"/":[function(a,b,c){"use strict";function d(a){var b=a.length;if(0<b%4)throw new Error("Invalid string. Length must be a multiple of 4");var c=a.indexOf("=");-1===c&&(c=b);var d=c===b?0:4-c%4;return[c,d]}function e(a,b,c){return 3*(b+c)/4-c}function f(a){var b,c,f=d(a),g=f[0],j=f[1],k=new Uint8Array(e(a,g,j)),l=0,m=0<j?g-4:g;for(c=0;c<m;c+=4)b=h[a.charCodeAt(c)]<<18|h[a.charCodeAt(c+1)]<<12|h[a.charCodeAt(c+2)]<<6|h[a.charCodeAt(c+3)],k[l++]=255&b>>16,k[l++]=255&b>>8,k[l++]=255&b;return 2===j&&(b=h[a.charCodeAt(c)]<<2|h[a.charCodeAt(c+1)]>>4,k[l++]=255&b),1===j&&(b=h[a.charCodeAt(c)]<<10|h[a.charCodeAt(c+1)]<<4|h[a.charCodeAt(c+2)]>>2,k[l++]=255&b>>8,k[l++]=255&b),k}c.byteLength=function b(a){var c=d(a),e=c[0],f=c[1];return 3*(e+f)/4-f},c.toByteArray=f;for(var g=[],h=[],j="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",k=0,l=j.length;k<l;++k)g[k]=j[k],h[j.charCodeAt(k)]=k;h[45]=62,h[95]=63},{}]},{},[])("/")})();
-					const bytesDec = base64js.toByteArray(dataURL.substring(37)).buffer;
-					const bytesBlob = new Blob([bytesDec], { type: "application/octet-stream" });
-					window.eaglercraftXClientBundle = URL.createObjectURL(bytesBlob);
-					console.error("Created " + bytesDec.byteLength + " byte object URL: " + window.eaglercraftXClientBundle);
-					resolve(bytesBlob);
+	(function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;b="undefined"==typeof window?"undefined"==typeof global?"undefined"==typeof self?this:self:global:window,b.base64js=a()}})(function(){return function(){function b(d,e,g){function a(j,i){if(!e[j]){if(!d[j]){var f="function"==typeof require&&require;if(!i&&f)return f(j,!0);if(h)return h(j,!0);var c=new Error("Cannot find module '"+j+"'");throw c.code="MODULE_NOT_FOUND",c}var k=e[j]={exports:{}};d[j][0].call(k.exports,function(b){var c=d[j][1][b];return a(c||b)},k,k.exports,b,d,e,g)}return e[j].exports}for(var h="function"==typeof require&&require,c=0;c<g.length;c++)a(g[c]);return a}return b}()({"/":[function(a,b,c){'use strict';function d(a){var b=a.length;if(0<b%4)throw new Error("Invalid string. Length must be a multiple of 4");var c=a.indexOf("=");-1===c&&(c=b);var d=c===b?0:4-c%4;return[c,d]}function e(a,b,c){return 3*(b+c)/4-c}function f(a){var b,c,f=d(a),g=f[0],h=f[1],j=new m(e(a,g,h)),k=0,n=0<h?g-4:g;for(c=0;c<n;c+=4)b=l[a.charCodeAt(c)]<<18|l[a.charCodeAt(c+1)]<<12|l[a.charCodeAt(c+2)]<<6|l[a.charCodeAt(c+3)],j[k++]=255&b>>16,j[k++]=255&b>>8,j[k++]=255&b;return 2===h&&(b=l[a.charCodeAt(c)]<<2|l[a.charCodeAt(c+1)]>>4,j[k++]=255&b),1===h&&(b=l[a.charCodeAt(c)]<<10|l[a.charCodeAt(c+1)]<<4|l[a.charCodeAt(c+2)]>>2,j[k++]=255&b>>8,j[k++]=255&b),j}function g(a){return k[63&a>>18]+k[63&a>>12]+k[63&a>>6]+k[63&a]}function h(a,b,c){for(var d,e=[],f=b;f<c;f+=3)d=(16711680&a[f]<<16)+(65280&a[f+1]<<8)+(255&a[f+2]),e.push(g(d));return e.join("")}function j(a){for(var b,c=a.length,d=c%3,e=[],f=16383,g=0,j=c-d;g<j;g+=f)e.push(h(a,g,g+f>j?j:g+f));return 1===d?(b=a[c-1],e.push(k[b>>2]+k[63&b<<4]+"==")):2===d&&(b=(a[c-2]<<8)+a[c-1],e.push(k[b>>10]+k[63&b>>4]+k[63&b<<2]+"=")),e.join("")}c.byteLength=function(a){var b=d(a),c=b[0],e=b[1];return 3*(c+e)/4-e},c.toByteArray=f,c.fromByteArray=j;for(var k=[],l=[],m="undefined"==typeof Uint8Array?Array:Uint8Array,n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",o=0,p=n.length;o<p;++o)k[o]=n[o],l[n.charCodeAt(o)]=o;l[45]=62,l[95]=63},{}]},{},[])("/")});
+	var sameOriginSupport = -1;
+	var checkSameOriginSupport = function(callback0) {
+		if(sameOriginSupport == -1) {
+			try {
+				(function(callback) {
+					if((typeof URL === "undefined") || (typeof URL.createObjectURL !== "function")) {
+						sameOriginSupport = 1;
+						callback(false);
+					}else {
+						var theObjURL = URL.createObjectURL(new Blob([new Uint8Array([69, 69, 69, 69])]));
+						if(!theObjURL) {
+							sameOriginSupport = 1;
+							callback(false);
+						}
+						doXHR(theObjURL, function(dataRet) {
+							if(dataRet) {
+								var typedArr = new Uint8Array(dataRet);
+								if(typedArr.length === 4 && typedArr[0] === 69 && typedArr[1] === 69 && typedArr[2] === 69 && typedArr[3] === 69) {
+									sameOriginSupport = 0;
+									callback(true);
+								}else {
+									sameOriginSupport = 1;
+									callback(false);
+								}
+							}else {
+								sameOriginSupport = 1;
+								callback(false);
+							}
+						});
+					}
+				})(function(valRet) {
+					if(!valRet) {
+						console.error("Same origin XHR support detected as false, using data: url...");
+					}
+					callback0(valRet);
 				});
-		});
-	}
-	var ds = new DecompressionStream("gzip");
-	var result = [];
-	function fetchStream(reader) {
-		reader.read().then(function processData({ done, value }) {
-			if (done) {
-				window.clientScriptSrcURL = URL.createObjectURL(new Blob(result, { type: "text/javascript;charset=utf-8" }));
-				result = [];
-				ds = null;
-				return;
+			}catch(ex) {
+				console.error("Same origin XHR support detection failed, using data: url...");
+				callback0(false);
+			}
+		}else {
+			callback0(!sameOriginSupport);
+		}
+	};
+	var blobToArrayBuffer = function(blobIn, callback) {
+		if(typeof blobIn.arrayBuffer === "undefined") {
+			blobIn.arrayBuffer().then(callback);
+		}else {
+			(function(phileReader) {
+				phileReader.addEventListener("load", function(evt) {
+					callback(phileReader.result);
+				});
+				phileReader.readAsArrayBuffer(blobIn);
+			})(new FileReader());
+		}
+	};
+	var completeXHR = function(callback, arg) {
+		if(!callback.comp) {
+			callback.comp = true;
+			callback.cb(arg);
+		}
+	};
+	var doXHR = function(urlIn, callback) {
+		(function(theXHRObj, callbackStruct){
+			theXHRObj.responseType = "arraybuffer";
+			theXHRObj.addEventListener("load", function(evt) { var stat = theXHRObj.status; if(stat === 0 || (stat >= 200 && stat < 400)) { completeXHR(callbackStruct, theXHRObj.response); } else { completeXHR(callbackStruct, null); } });
+			theXHRObj.addEventListener("error", function(evt) {  completeXHR(callbackStruct, null); });
+			theXHRObj.open("GET", urlIn, true);
+			theXHRObj.send();
+		})(new XMLHttpRequest(), { cb: callback, comp: false });
+	};
+	var decodeBase64URL = function(urlIn, callbackOut) {
+		doXHR(urlIn, function(data) {
+			if(!data) {
+				try {
+					console.error("Caught an error decoding base64 via fetch, doing it the slow way instead...");
+					callbackOut(base64js.toByteArray(urlIn.substring(37)).buffer);
+				}catch(ex) {
+					console.error("Failed to decode base64!");
+					console.error(ex);
+					callbackOut(null);
+				}
+			}else {
+				callbackOut(data);
+			}
+		});
+	};
+	if(typeof window.DecompressionStream === "undefined") {
+		checkSameOriginSupport(function(soSupported) {
+			var theWorkerObj;
+			var workerSrc = ""use strict";
/*! pako 2.1.0 https://github.com/nodeca/pako @license (MIT AND Zlib) */
!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).pako={})}(this,(function(e){"use strict";var t=function(e,t,i,n){for(var a=65535&e|0,r=e>>>16&65535|0,o=0;0!==i;){i-=o=i>2e3?2e3:i;do{r=r+(a=a+t[n++]|0)|0}while(--o);a%=65521,r%=65521}return a|r<<16|0},i=new Uint32Array(function(){for(var e,t=[],i=0;i<256;i++){e=i;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[i]=e}return t}()),n=function(e,t,n,a){var r=i,o=a+n;e^=-1;for(var s=a;s<o;s++)e=e>>>8^r[255&(e^t[s])];return-1^e},a=16209,r=function(e,t){var i,n,r,o,s,l,f,d,h,c,u,w,b,m,k,_,v,g,p,y,x,E,R,A,Z=e.state;i=e.next_in,R=e.input,n=i+(e.avail_in-5),r=e.next_out,A=e.output,o=r-(t-e.avail_out),s=r+(e.avail_out-257),l=Z.dmax,f=Z.wsize,d=Z.whave,h=Z.wnext,c=Z.window,u=Z.hold,w=Z.bits,b=Z.lencode,m=Z.distcode,k=(1<<Z.lenbits)-1,_=(1<<Z.distbits)-1;e:do{w<15&&(u+=R[i++]<<w,w+=8,u+=R[i++]<<w,w+=8),v=b[u&k];t:for(;;){if(u>>>=g=v>>>24,w-=g,0===(g=v>>>16&255))A[r++]=65535&v;else{if(!(16&g)){if(0==(64&g)){v=b[(65535&v)+(u&(1<<g)-1)];continue t}if(32&g){Z.mode=16191;break e}e.msg="invalid literal/length code",Z.mode=a;break e}p=65535&v,(g&=15)&&(w<g&&(u+=R[i++]<<w,w+=8),p+=u&(1<<g)-1,u>>>=g,w-=g),w<15&&(u+=R[i++]<<w,w+=8,u+=R[i++]<<w,w+=8),v=m[u&_];i:for(;;){if(u>>>=g=v>>>24,w-=g,!(16&(g=v>>>16&255))){if(0==(64&g)){v=m[(65535&v)+(u&(1<<g)-1)];continue i}e.msg="invalid distance code",Z.mode=a;break e}if(y=65535&v,w<(g&=15)&&(u+=R[i++]<<w,(w+=8)<g&&(u+=R[i++]<<w,w+=8)),(y+=u&(1<<g)-1)>l){e.msg="invalid distance too far back",Z.mode=a;break e}if(u>>>=g,w-=g,y>(g=r-o)){if((g=y-g)>d&&Z.sane){e.msg="invalid distance too far back",Z.mode=a;break e}if(x=0,E=c,0===h){if(x+=f-g,g<p){p-=g;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}}else if(h<g){if(x+=f+h-g,(g-=h)<p){p-=g;do{A[r++]=c[x++]}while(--g);if(x=0,h<p){p-=g=h;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}}}else if(x+=h-g,g<p){p-=g;do{A[r++]=c[x++]}while(--g);x=r-y,E=A}for(;p>2;)A[r++]=E[x++],A[r++]=E[x++],A[r++]=E[x++],p-=3;p&&(A[r++]=E[x++],p>1&&(A[r++]=E[x++]))}else{x=r-y;do{A[r++]=A[x++],A[r++]=A[x++],A[r++]=A[x++],p-=3}while(p>2);p&&(A[r++]=A[x++],p>1&&(A[r++]=A[x++]))}break}}break}}while(i<n&&r<s);i-=p=w>>3,u&=(1<<(w-=p<<3))-1,e.next_in=i,e.next_out=r,e.avail_in=i<n?n-i+5:5-(i-n),e.avail_out=r<s?s-r+257:257-(r-s),Z.hold=u,Z.bits=w},o=15,s=new Uint16Array([3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0]),l=new Uint8Array([16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78]),f=new Uint16Array([1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0]),d=new Uint8Array([16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64]),h=function(e,t,i,n,a,r,h,c){var u,w,b,m,k,_,v,g,p,y=c.bits,x=0,E=0,R=0,A=0,Z=0,S=0,T=0,O=0,U=0,D=0,I=null,B=new Uint16Array(16),N=new Uint16Array(16),C=null;for(x=0;x<=o;x++)B[x]=0;for(E=0;E<n;E++)B[t[i+E]]++;for(Z=y,A=o;A>=1&&0===B[A];A--);if(Z>A&&(Z=A),0===A)return a[r++]=20971520,a[r++]=20971520,c.bits=1,0;for(R=1;R<A&&0===B[R];R++);for(Z<R&&(Z=R),O=1,x=1;x<=o;x++)if(O<<=1,(O-=B[x])<0)return-1;if(O>0&&(0===e||1!==A))return-1;for(N[1]=0,x=1;x<o;x++)N[x+1]=N[x]+B[x];for(E=0;E<n;E++)0!==t[i+E]&&(h[N[t[i+E]]++]=E);if(0===e?(I=C=h,_=20):1===e?(I=s,C=l,_=257):(I=f,C=d,_=0),D=0,E=0,x=R,k=r,S=Z,T=0,b=-1,m=(U=1<<Z)-1,1===e&&U>852||2===e&&U>592)return 1;for(;;){v=x-T,h[E]+1<_?(g=0,p=h[E]):h[E]>=_?(g=C[h[E]-_],p=I[h[E]-_]):(g=96,p=0),u=1<<x-T,R=w=1<<S;do{a[k+(D>>T)+(w-=u)]=v<<24|g<<16|p|0}while(0!==w);for(u=1<<x-1;D&u;)u>>=1;if(0!==u?(D&=u-1,D+=u):D=0,E++,0==--B[x]){if(x===A)break;x=t[i+h[E]]}if(x>Z&&(D&m)!==b){for(0===T&&(T=Z),k+=R,O=1<<(S=x-T);S+T<A&&!((O-=B[S+T])<=0);)S++,O<<=1;if(U+=1<<S,1===e&&U>852||2===e&&U>592)return 1;a[b=D&m]=Z<<24|S<<16|k-r|0}}return 0!==D&&(a[k+D]=x-T<<24|64<<16|0),c.bits=Z,0},c={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_MEM_ERROR:-4,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8},u=c.Z_FINISH,w=c.Z_BLOCK,b=c.Z_TREES,m=c.Z_OK,k=c.Z_STREAM_END,_=c.Z_NEED_DICT,v=c.Z_STREAM_ERROR,g=c.Z_DATA_ERROR,p=c.Z_MEM_ERROR,y=c.Z_BUF_ERROR,x=c.Z_DEFLATED,E=16180,R=16190,A=16191,Z=16192,S=16194,T=16199,O=16200,U=16206,D=16209,I=function(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)};function B(){this.strm=null,this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new Uint16Array(320),this.work=new Uint16Array(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}var N,C,z=function(e){if(!e)return 1;var t=e.state;return!t||t.strm!==e||t.mode<E||t.mode>16211?1:0},F=function(e){if(z(e))return v;var t=e.state;return e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=E,t.last=0,t.havedict=0,t.flags=-1,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new Int32Array(852),t.distcode=t.distdyn=new Int32Array(592),t.sane=1,t.back=-1,m},L=function(e){if(z(e))return v;var t=e.state;return t.wsize=0,t.whave=0,t.wnext=0,F(e)},M=function(e,t){var i;if(z(e))return v;var n=e.state;return t<0?(i=0,t=-t):(i=5+(t>>4),t<48&&(t&=15)),t&&(t<8||t>15)?v:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=i,n.wbits=t,L(e))},H=function(e,t){if(!e)return v;var i=new B;e.state=i,i.strm=e,i.window=null,i.mode=E;var n=M(e,t);return n!==m&&(e.state=null),n},j=!0,K=function(e){if(j){N=new Int32Array(512),C=new Int32Array(32);for(var t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(h(1,e.lens,0,288,N,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;h(2,e.lens,0,32,C,0,e.work,{bits:5}),j=!1}e.lencode=N,e.lenbits=9,e.distcode=C,e.distbits=5},P=function(e,t,i,n){var a,r=e.state;return null===r.window&&(r.wsize=1<<r.wbits,r.wnext=0,r.whave=0,r.window=new Uint8Array(r.wsize)),n>=r.wsize?(r.window.set(t.subarray(i-r.wsize,i),0),r.wnext=0,r.whave=r.wsize):((a=r.wsize-r.wnext)>n&&(a=n),r.window.set(t.subarray(i-n,i-n+a),r.wnext),(n-=a)?(r.window.set(t.subarray(i-n,i),0),r.wnext=n,r.whave=r.wsize):(r.wnext+=a,r.wnext===r.wsize&&(r.wnext=0),r.whave<r.wsize&&(r.whave+=a))),0},Y={inflateReset:L,inflateReset2:M,inflateResetKeep:F,inflateInit:function(e){return H(e,15)},inflateInit2:H,inflate:function(e,i){var a,o,s,l,f,d,c,B,N,C,F,L,M,H,j,Y,G,X,W,q,J,Q,V,$,ee=0,te=new Uint8Array(4),ie=new Uint8Array([16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15]);if(z(e)||!e.output||!e.input&&0!==e.avail_in)return v;(a=e.state).mode===A&&(a.mode=Z),f=e.next_out,s=e.output,c=e.avail_out,l=e.next_in,o=e.input,d=e.avail_in,B=a.hold,N=a.bits,C=d,F=c,Q=m;e:for(;;)switch(a.mode){case E:if(0===a.wrap){a.mode=Z;break}for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(2&a.wrap&&35615===B){0===a.wbits&&(a.wbits=15),a.check=0,te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0),B=0,N=0,a.mode=16181;break}if(a.head&&(a.head.done=!1),!(1&a.wrap)||(((255&B)<<8)+(B>>8))%31){e.msg="incorrect header check",a.mode=D;break}if((15&B)!==x){e.msg="unknown compression method",a.mode=D;break}if(N-=4,J=8+(15&(B>>>=4)),0===a.wbits&&(a.wbits=J),J>15||J>a.wbits){e.msg="invalid window size",a.mode=D;break}a.dmax=1<<a.wbits,a.flags=0,e.adler=a.check=1,a.mode=512&B?16189:A,B=0,N=0;break;case 16181:for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(a.flags=B,(255&a.flags)!==x){e.msg="unknown compression method",a.mode=D;break}if(57344&a.flags){e.msg="unknown header flags set",a.mode=D;break}a.head&&(a.head.text=B>>8&1),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0,a.mode=16182;case 16182:for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.head&&(a.head.time=B),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,te[2]=B>>>16&255,te[3]=B>>>24&255,a.check=n(a.check,te,4,0)),B=0,N=0,a.mode=16183;case 16183:for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.head&&(a.head.xflags=255&B,a.head.os=B>>8),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0,a.mode=16184;case 16184:if(1024&a.flags){for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.length=B,a.head&&(a.head.extra_len=B),512&a.flags&&4&a.wrap&&(te[0]=255&B,te[1]=B>>>8&255,a.check=n(a.check,te,2,0)),B=0,N=0}else a.head&&(a.head.extra=null);a.mode=16185;case 16185:if(1024&a.flags&&((L=a.length)>d&&(L=d),L&&(a.head&&(J=a.head.extra_len-a.length,a.head.extra||(a.head.extra=new Uint8Array(a.head.extra_len)),a.head.extra.set(o.subarray(l,l+L),J)),512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,a.length-=L),a.length))break e;a.length=0,a.mode=16186;case 16186:if(2048&a.flags){if(0===d)break e;L=0;do{J=o[l+L++],a.head&&J&&a.length<65536&&(a.head.name+=String.fromCharCode(J))}while(J&&L<d);if(512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,J)break e}else a.head&&(a.head.name=null);a.length=0,a.mode=16187;case 16187:if(4096&a.flags){if(0===d)break e;L=0;do{J=o[l+L++],a.head&&J&&a.length<65536&&(a.head.comment+=String.fromCharCode(J))}while(J&&L<d);if(512&a.flags&&4&a.wrap&&(a.check=n(a.check,o,L,l)),d-=L,l+=L,J)break e}else a.head&&(a.head.comment=null);a.mode=16188;case 16188:if(512&a.flags){for(;N<16;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(4&a.wrap&&B!==(65535&a.check)){e.msg="header crc mismatch",a.mode=D;break}B=0,N=0}a.head&&(a.head.hcrc=a.flags>>9&1,a.head.done=!0),e.adler=a.check=0,a.mode=A;break;case 16189:for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}e.adler=a.check=I(B),B=0,N=0,a.mode=R;case R:if(0===a.havedict)return e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,_;e.adler=a.check=1,a.mode=A;case A:if(i===w||i===b)break e;case Z:if(a.last){B>>>=7&N,N-=7&N,a.mode=U;break}for(;N<3;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}switch(a.last=1&B,N-=1,3&(B>>>=1)){case 0:a.mode=16193;break;case 1:if(K(a),a.mode=T,i===b){B>>>=2,N-=2;break e}break;case 2:a.mode=16196;break;case 3:e.msg="invalid block type",a.mode=D}B>>>=2,N-=2;break;case 16193:for(B>>>=7&N,N-=7&N;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if((65535&B)!=(B>>>16^65535)){e.msg="invalid stored block lengths",a.mode=D;break}if(a.length=65535&B,B=0,N=0,a.mode=S,i===b)break e;case S:a.mode=16195;case 16195:if(L=a.length){if(L>d&&(L=d),L>c&&(L=c),0===L)break e;s.set(o.subarray(l,l+L),f),d-=L,l+=L,c-=L,f+=L,a.length-=L;break}a.mode=A;break;case 16196:for(;N<14;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(a.nlen=257+(31&B),B>>>=5,N-=5,a.ndist=1+(31&B),B>>>=5,N-=5,a.ncode=4+(15&B),B>>>=4,N-=4,a.nlen>286||a.ndist>30){e.msg="too many length or distance symbols",a.mode=D;break}a.have=0,a.mode=16197;case 16197:for(;a.have<a.ncode;){for(;N<3;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.lens[ie[a.have++]]=7&B,B>>>=3,N-=3}for(;a.have<19;)a.lens[ie[a.have++]]=0;if(a.lencode=a.lendyn,a.lenbits=7,V={bits:a.lenbits},Q=h(0,a.lens,0,19,a.lencode,0,a.work,V),a.lenbits=V.bits,Q){e.msg="invalid code lengths set",a.mode=D;break}a.have=0,a.mode=16198;case 16198:for(;a.have<a.nlen+a.ndist;){for(;Y=(ee=a.lencode[B&(1<<a.lenbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(G<16)B>>>=j,N-=j,a.lens[a.have++]=G;else{if(16===G){for($=j+2;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(B>>>=j,N-=j,0===a.have){e.msg="invalid bit length repeat",a.mode=D;break}J=a.lens[a.have-1],L=3+(3&B),B>>>=2,N-=2}else if(17===G){for($=j+3;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}N-=j,J=0,L=3+(7&(B>>>=j)),B>>>=3,N-=3}else{for($=j+7;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}N-=j,J=0,L=11+(127&(B>>>=j)),B>>>=7,N-=7}if(a.have+L>a.nlen+a.ndist){e.msg="invalid bit length repeat",a.mode=D;break}for(;L--;)a.lens[a.have++]=J}}if(a.mode===D)break;if(0===a.lens[256]){e.msg="invalid code -- missing end-of-block",a.mode=D;break}if(a.lenbits=9,V={bits:a.lenbits},Q=h(1,a.lens,0,a.nlen,a.lencode,0,a.work,V),a.lenbits=V.bits,Q){e.msg="invalid literal/lengths set",a.mode=D;break}if(a.distbits=6,a.distcode=a.distdyn,V={bits:a.distbits},Q=h(2,a.lens,a.nlen,a.ndist,a.distcode,0,a.work,V),a.distbits=V.bits,Q){e.msg="invalid distances set",a.mode=D;break}if(a.mode=T,i===b)break e;case T:a.mode=O;case O:if(d>=6&&c>=258){e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,r(e,F),f=e.next_out,s=e.output,c=e.avail_out,l=e.next_in,o=e.input,d=e.avail_in,B=a.hold,N=a.bits,a.mode===A&&(a.back=-1);break}for(a.back=0;Y=(ee=a.lencode[B&(1<<a.lenbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(Y&&0==(240&Y)){for(X=j,W=Y,q=G;Y=(ee=a.lencode[q+((B&(1<<X+W)-1)>>X)])>>>16&255,G=65535&ee,!(X+(j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}B>>>=X,N-=X,a.back+=X}if(B>>>=j,N-=j,a.back+=j,a.length=G,0===Y){a.mode=16205;break}if(32&Y){a.back=-1,a.mode=A;break}if(64&Y){e.msg="invalid literal/length code",a.mode=D;break}a.extra=15&Y,a.mode=16201;case 16201:if(a.extra){for($=a.extra;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.length+=B&(1<<a.extra)-1,B>>>=a.extra,N-=a.extra,a.back+=a.extra}a.was=a.length,a.mode=16202;case 16202:for(;Y=(ee=a.distcode[B&(1<<a.distbits)-1])>>>16&255,G=65535&ee,!((j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(0==(240&Y)){for(X=j,W=Y,q=G;Y=(ee=a.distcode[q+((B&(1<<X+W)-1)>>X)])>>>16&255,G=65535&ee,!(X+(j=ee>>>24)<=N);){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}B>>>=X,N-=X,a.back+=X}if(B>>>=j,N-=j,a.back+=j,64&Y){e.msg="invalid distance code",a.mode=D;break}a.offset=G,a.extra=15&Y,a.mode=16203;case 16203:if(a.extra){for($=a.extra;N<$;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}a.offset+=B&(1<<a.extra)-1,B>>>=a.extra,N-=a.extra,a.back+=a.extra}if(a.offset>a.dmax){e.msg="invalid distance too far back",a.mode=D;break}a.mode=16204;case 16204:if(0===c)break e;if(L=F-c,a.offset>L){if((L=a.offset-L)>a.whave&&a.sane){e.msg="invalid distance too far back",a.mode=D;break}L>a.wnext?(L-=a.wnext,M=a.wsize-L):M=a.wnext-L,L>a.length&&(L=a.length),H=a.window}else H=s,M=f-a.offset,L=a.length;L>c&&(L=c),c-=L,a.length-=L;do{s[f++]=H[M++]}while(--L);0===a.length&&(a.mode=O);break;case 16205:if(0===c)break e;s[f++]=a.length,c--,a.mode=O;break;case U:if(a.wrap){for(;N<32;){if(0===d)break e;d--,B|=o[l++]<<N,N+=8}if(F-=c,e.total_out+=F,a.total+=F,4&a.wrap&&F&&(e.adler=a.check=a.flags?n(a.check,s,F,f-F):t(a.check,s,F,f-F)),F=c,4&a.wrap&&(a.flags?B:I(B))!==a.check){e.msg="incorrect data check",a.mode=D;break}B=0,N=0}a.mode=16207;case 16207:if(a.wrap&&a.flags){for(;N<32;){if(0===d)break e;d--,B+=o[l++]<<N,N+=8}if(4&a.wrap&&B!==(4294967295&a.total)){e.msg="incorrect length check",a.mode=D;break}B=0,N=0}a.mode=16208;case 16208:Q=k;break e;case D:Q=g;break e;case 16210:return p;default:return v}return e.next_out=f,e.avail_out=c,e.next_in=l,e.avail_in=d,a.hold=B,a.bits=N,(a.wsize||F!==e.avail_out&&a.mode<D&&(a.mode<U||i!==u))&&P(e,e.output,e.next_out,F-e.avail_out),C-=e.avail_in,F-=e.avail_out,e.total_in+=C,e.total_out+=F,a.total+=F,4&a.wrap&&F&&(e.adler=a.check=a.flags?n(a.check,s,F,e.next_out-F):t(a.check,s,F,e.next_out-F)),e.data_type=a.bits+(a.last?64:0)+(a.mode===A?128:0)+(a.mode===T||a.mode===S?256:0),(0===C&&0===F||i===u)&&Q===m&&(Q=y),Q},inflateEnd:function(e){if(z(e))return v;var t=e.state;return t.window&&(t.window=null),e.state=null,m},inflateGetHeader:function(e,t){if(z(e))return v;var i=e.state;return 0==(2&i.wrap)?v:(i.head=t,t.done=!1,m)},inflateSetDictionary:function(e,i){var n,a=i.length;return z(e)||0!==(n=e.state).wrap&&n.mode!==R?v:n.mode===R&&t(1,i,a,0)!==n.check?g:P(e,i,a,a)?(n.mode=16210,p):(n.havedict=1,m)},inflateInfo:"pako inflate (from Nodeca project)"};function G(e){return G="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},G(e)}var X=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},W=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var i=t.shift();if(i){if("object"!==G(i))throw new TypeError(i+"must be non-object");for(var n in i)X(i,n)&&(e[n]=i[n])}}return e},q=function(e){for(var t=0,i=0,n=e.length;i<n;i++)t+=e[i].length;for(var a=new Uint8Array(t),r=0,o=0,s=e.length;r<s;r++){var l=e[r];a.set(l,o),o+=l.length}return a},J=!0;try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){J=!1}for(var Q=new Uint8Array(256),V=0;V<256;V++)Q[V]=V>=252?6:V>=248?5:V>=240?4:V>=224?3:V>=192?2:1;Q[254]=Q[254]=1;var $=function(e){if("function"==typeof TextEncoder&&TextEncoder.prototype.encode)return(new TextEncoder).encode(e);var t,i,n,a,r,o=e.length,s=0;for(a=0;a<o;a++)55296==(64512&(i=e.charCodeAt(a)))&&a+1<o&&56320==(64512&(n=e.charCodeAt(a+1)))&&(i=65536+(i-55296<<10)+(n-56320),a++),s+=i<128?1:i<2048?2:i<65536?3:4;for(t=new Uint8Array(s),r=0,a=0;r<s;a++)55296==(64512&(i=e.charCodeAt(a)))&&a+1<o&&56320==(64512&(n=e.charCodeAt(a+1)))&&(i=65536+(i-55296<<10)+(n-56320),a++),i<128?t[r++]=i:i<2048?(t[r++]=192|i>>>6,t[r++]=128|63&i):i<65536?(t[r++]=224|i>>>12,t[r++]=128|i>>>6&63,t[r++]=128|63&i):(t[r++]=240|i>>>18,t[r++]=128|i>>>12&63,t[r++]=128|i>>>6&63,t[r++]=128|63&i);return t},ee=function(e,t){var i,n,a=t||e.length;if("function"==typeof TextDecoder&&TextDecoder.prototype.decode)return(new TextDecoder).decode(e.subarray(0,t));var r=new Array(2*a);for(n=0,i=0;i<a;){var o=e[i++];if(o<128)r[n++]=o;else{var s=Q[o];if(s>4)r[n++]=65533,i+=s-1;else{for(o&=2===s?31:3===s?15:7;s>1&&i<a;)o=o<<6|63&e[i++],s--;s>1?r[n++]=65533:o<65536?r[n++]=o:(o-=65536,r[n++]=55296|o>>10&1023,r[n++]=56320|1023&o)}}}return function(e,t){if(t<65534&&e.subarray&&J)return String.fromCharCode.apply(null,e.length===t?e:e.subarray(0,t));for(var i="",n=0;n<t;n++)i+=String.fromCharCode(e[n]);return i}(r,n)},te=function(e,t){(t=t||e.length)>e.length&&(t=e.length);for(var i=t-1;i>=0&&128==(192&e[i]);)i--;return i<0||0===i?t:i+Q[e[i]]>t?i:t},ie={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"};var ne=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0};var ae=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1},re=Object.prototype.toString,oe=c.Z_NO_FLUSH,se=c.Z_FINISH,le=c.Z_OK,fe=c.Z_STREAM_END,de=c.Z_NEED_DICT,he=c.Z_STREAM_ERROR,ce=c.Z_DATA_ERROR,ue=c.Z_MEM_ERROR;function we(e){this.options=W({chunkSize:65536,windowBits:15,to:""},e||{});var t=this.options;t.raw&&t.windowBits>=0&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(t.windowBits>=0&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),t.windowBits>15&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new ne,this.strm.avail_out=0;var i=Y.inflateInit2(this.strm,t.windowBits);if(i!==le)throw new Error(ie[i]);if(this.header=new ae,Y.inflateGetHeader(this.strm,this.header),t.dictionary&&("string"==typeof t.dictionary?t.dictionary=$(t.dictionary):"[object ArrayBuffer]"===re.call(t.dictionary)&&(t.dictionary=new Uint8Array(t.dictionary)),t.raw&&(i=Y.inflateSetDictionary(this.strm,t.dictionary))!==le))throw new Error(ie[i])}function be(e,t){var i=new we(t);if(i.push(e),i.err)throw i.msg||ie[i.err];return i.result}we.prototype.push=function(e,t){var i,n,a,r=this.strm,o=this.options.chunkSize,s=this.options.dictionary;if(this.ended)return!1;for(n=t===~~t?t:!0===t?se:oe,"[object ArrayBuffer]"===re.call(e)?r.input=new Uint8Array(e):r.input=e,r.next_in=0,r.avail_in=r.input.length;;){for(0===r.avail_out&&(r.output=new Uint8Array(o),r.next_out=0,r.avail_out=o),(i=Y.inflate(r,n))===de&&s&&((i=Y.inflateSetDictionary(r,s))===le?i=Y.inflate(r,n):i===ce&&(i=de));r.avail_in>0&&i===fe&&r.state.wrap>0&&0!==e[r.next_in];)Y.inflateReset(r),i=Y.inflate(r,n);switch(i){case he:case ce:case de:case ue:return this.onEnd(i),this.ended=!0,!1}if(a=r.avail_out,r.next_out&&(0===r.avail_out||i===fe))if("string"===this.options.to){var l=te(r.output,r.next_out),f=r.next_out-l,d=ee(r.output,l);r.next_out=f,r.avail_out=o-f,f&&r.output.set(r.output.subarray(l,l+f),0),this.onData(d)}else this.onData(r.output.length===r.next_out?r.output:r.output.subarray(0,r.next_out));if(i!==le||0!==a){if(i===fe)return i=Y.inflateEnd(this.strm),this.onEnd(i),this.ended=!0,!0;if(0===r.avail_in)break}}return!0},we.prototype.onData=function(e){this.chunks.push(e)},we.prototype.onEnd=function(e){e===le&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=q(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg};var me=we,ke=be,_e=function(e,t){return(t=t||{}).raw=!0,be(e,t)},ve=be,ge=c,pe={Inflate:me,inflate:ke,inflateRaw:_e,ungzip:ve,constants:ge};e.Inflate=me,e.constants=ge,e.default=pe,e.inflate=ke,e.inflateRaw=_e,e.ungzip=ve,Object.defineProperty(e,"__esModule",{value:!0})}));
addEventListener("message", function(o) { try { postMessage({ status: "success", data: pako.inflate(o.data, { to: "arraybuffer" }) }); } catch(ex) { logger.error(ex); postMessage({ status: "error" }); } });
postMessage({ status: "ready" });";
+			if(soSupported) {
+				theWorkerObj = new Worker(URL.createObjectURL(new Blob([base64js.toByteArray(workerSrc).buffer], { type: "text/javascript" })));
+			}else {
+				theWorkerObj = new Worker("data:text/javascript;base64," + workerSrc);
+			}
+			theWorkerObj.addEventListener("message", function(evt) {
+				if(evt.data.status === "ready") {
+					decodeBase64URL(window.eaglercraftXClientBundle, function(cbData) {
+						if(cbData) {
+							theWorkerObj.postMessage(cbData);
+						}else {
+							alert("Failed to decode eaglercraftXClientBundle base64!");
+						}
+					});
+				}else if(evt.data.status === "success") {
+					if(soSupported) {
+						window.clientScriptSrcURL = URL.createObjectURL(new Blob([evt.data.data.buffer], { type: "text/javascript;charset=utf-8" }));
+					}else {
+						window.clientScriptSrcURL = "data:text/javascript;charset=utf-8;base64," + base64js.fromByteArray(evt.data.data);
+					}
+				}else {
+					alert("Failed to decompress classes.js via legacy javascript implementation!");
+				}
+			});
+			theWorkerObj.addEventListener("error", function(evt) {
+				console.error(evt.error);
+			});
+		});
+	}else {
+		var ds = new window.DecompressionStream("gzip");
+		var result = [];
+		var fetchStream = function(reader) {
+			var processData;
+			reader.read().then(processData = function(evt) {
+				if (evt.done) {
+					(function(blobObj){
+						checkSameOriginSupport(function(supported) {
+							if(supported) {
+								window.clientScriptSrcURL = URL.createObjectURL(blobObj);
+							}else {
+								blobToArrayBuffer(blobObj, function(arr) {
+									console.log(arr);
+									window.clientScriptSrcURL = "data:text/javascript;charset=utf-8;base64," + base64js.fromByteArray(new Uint8Array(arr));
+								});
+							}
+						});
+					})(new Blob(result, { type: "text/javascript;charset=utf-8" }));
+					result = [];
+					ds = null;
+					return;
+				}
+				result.push(evt.value);
+				return reader.read().then(processData);
+			});
+		};
+		decodeBase64URL(window.eaglercraftXClientBundle, function(cbData) {
+			if(cbData) {
+				fetchStream((new Blob([cbData])).stream().pipeThrough(ds).getReader());
+			}else {
+				alert("Failed to decode eaglercraftXClientBundle base64!");
 			}
-			result.push(value);
-			return reader.read().then(processData);
 		});
 	}
-	fetchB64PayloadSafe().then((blob) => fetchStream(blob.stream().pipeThrough(ds).getReader()));
 })();
 </script>
 <script type="text/javascript">
@@ -89,13 +208,15 @@ window.eaglercraftXOptsHints = {
 	var launchCounter = 1;
 	var launchCountdownNumberElement = null;
 	var launchCountdownProgressElement = null;
-	function launchTick() {
-		if(launchCounter > 100) {
+	var launchSkipCountdown = false;
+	var launchTick = function() {
+		if(launchCounter > 100 || launchSkipCountdown) {
 			if(window.clientScriptSrcURL) {
 				clearInterval(launchInterval);
-				setTimeout(() => {
-					document.getElementById("launch_countdown_screen").remove();
-					const script = document.createElement("script");
+				setTimeout(function() {
+					document.body.removeChild(document.getElementById("launch_countdown_screen"));
+					document.body.style.backgroundColor = "black";
+					var script = document.createElement("script");
 					script.type = "text/javascript";
 					script.src = window.clientScriptSrcURL;
 					window.clientScriptSrcURL = null;
@@ -104,25 +225,40 @@ window.eaglercraftXOptsHints = {
 			}
 			return;
 		}
-		launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
+		if(launchCounter === 100) {
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+		}else {
+			launchCountdownNumberElement.innerText = "" + Math.floor(6.0 - launchCounter * 0.06);
+		}
 		launchCountdownProgressElement.style.width = "" + launchCounter + "%";
 		++launchCounter;
-	}
-	window.addEventListener("load", () => {
+	};
+	window.addEventListener("load", function() {
 		launchCountdownNumberElement = document.getElementById("launchCountdownNumber");
 		launchCountdownProgressElement = document.getElementById("launchCountdownProgress");
 		launchInterval = setInterval(launchTick, 50);
+		document.getElementById("skipCountdown").addEventListener("click", function() {
+			launchSkipCountdown = true;
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+		});
+		document.getElementById("bootMenu").addEventListener("click", function() {
+			launchSkipCountdown = true;
+			document.getElementById("gameWillLaunchIn").innerText = "Decompressing...";
+			window.eaglercraftXOptsHints.showBootMenuOnLaunch = true;
+		});
 	});
 })();
 </script>
 <link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
 </head>
-<body style="margin:0px;width:100vw;height:100vh;overflow:hidden;" id="game_frame">
+<body style="margin:0px;width:100%;height:100%;overflow:hidden;background-color:white;" id="game_frame">
 <div style="margin:0px;width:100%;height:100%;font-family:sans-serif;display:flex;align-items:center;user-select:none;" id="launch_countdown_screen">
 <div style="margin:auto;text-align:center;">
 <h1>This file is from <span style="color:#AA0000;">${date}</span></h1>
-<h2>Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
-<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div></div>
+<h3>Get the latest version at <a href="https://eaglercraft.com"><span style="color:#AA0000;">eaglercraft.com</span></a></h1>
+<h2 id="gameWillLaunchIn">Game will launch in <span id="launchCountdownNumber">5</span>...</h2>
+<div style="border:2px solid black;width:100%;height:15px;padding:1px;margin-bottom:20vh;"><div id="launchCountdownProgress" style="background-color:#555555;width:0%;height:100%;"></div>
+<p style="margin-top:30px;"><button id="skipCountdown" autofocus>Skip Countdown</button>&emsp;<button id="bootMenu">Enter Boot Menu</button></p></div>
 </div>
 </div>
 </body>
diff --git a/javascript/UpdateDownloadSources.txt b/javascript/UpdateDownloadSources.txt
index 3c59fe2..27e82b0 100755
--- a/javascript/UpdateDownloadSources.txt
+++ b/javascript/UpdateDownloadSources.txt
@@ -6,3 +6,22 @@
 # url: url here
 # ipfs: cid here
 # list: url to another list
+
+list: https://eaglercraft.com/dl/cors/u35_backup.list
+url: https://eaglercraft.com/dl/cors/u35_backup.dat
+
+ipfs: bafybeibolco2rlnyiiweipoarwf6kw235xdv7jbbpcwpmm5wksnh4agx5e
+
+use-gateway: https://gateway.ipfs.io/ipfs/$cid$/$path$
+use-gateway: https://4everland.io/ipfs/$cid$/$path$
+use-gateway: https://dweb.link/ipfs/$cid$/$path$
+use-gateway: https://cloudflare-ipfs.com/ipfs/$cid$/$path$
+use-gateway: https://cf-ipfs.com/ipfs/$cid$/$path$
+use-gateway: https://w3s.link/ipfs/$cid$/$path$
+use-gateway: https://ipfs.eth.aragon.network/ipfs/$cid$/$path$
+use-gateway: https://nftstorage.link/ipfs/$cid$/$path$
+
+use-gateway: https://$cid$.ipfs.gateway.ipfs.io/$path$
+use-gateway: https://$cid$.ipfs.dweb.link/$path$
+use-gateway: https://$cid$.ipfs.cf-ipfs.com/$path$
+use-gateway: https://$cid$.ipfs.nftstorage.link/$path$
diff --git a/javascript/index.html b/javascript/index.html
index 7c055c9..270b17e 100755
--- a/javascript/index.html
+++ b/javascript/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
-<html>
+<html style="width:100%;height:100%;background-color:black;">
 	<head>
 		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
 		<meta name="description" content="EaglercraftX 1.8 test directory HTML page" />
 		<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
 		<title>EaglercraftX 1.8</title>
@@ -14,11 +14,11 @@
 		<script type="text/javascript" src="classes.js"></script>
 		<script type="text/javascript">
 			"use strict";
-			window.addEventListener("load", () => {
-				if(document.location.href.startsWith("file:")) {
+			window.addEventListener("load", function() {
+				if(window.location.href.indexOf("file:") === 0) {
 					alert("HTTP please, do not open this file locally, run a local HTTP server and load it via HTTP");
 				}else {
-					const relayId = Math.floor(Math.random() * 3);
+					var relayId = Math.floor(Math.random() * 3);
 					window.eaglercraftXOpts = {
 						demoMode: false,
 						container: "game_frame",
@@ -26,28 +26,29 @@
 						localesURI: "lang/",
 						worldsDB: "worlds",
 						logInvalidCerts: true,
+						crashOnUncaughtExceptions: true,
 						servers: [
 							{ addr: "ws://localhost:8081/", name: "Local test server" }
 						],
 						relays: [
-							{ addr: "wss://relay.deev.is/", comment: "lax1dude relay #1", primary: relayId == 0 },
-							{ addr: "wss://relay.lax1dude.net/", comment: "lax1dude relay #2", primary: relayId == 1 },
-							{ addr: "wss://relay.shhnowisnottheti.me/", comment: "ayunami relay #1", primary: relayId == 2 }
+							{ addr: "wss://relay.deev.is/", comment: "lax1dude relay #1", primary: relayId === 0 },
+							{ addr: "wss://relay.lax1dude.net/", comment: "lax1dude relay #2", primary: relayId === 1 },
+							{ addr: "wss://relay.shhnowisnottheti.me/", comment: "ayunami relay #1", primary: relayId === 2 }
 						]
 					};
-					
+
 					var q = window.location.search;
-					if(typeof q === "string" && q.startsWith("?")) {
-						q = new URLSearchParams(q);
+					if((typeof q === "string") && q[0] === "?" && (typeof window.URLSearchParams !== "undefined")) {
+						q = new window.URLSearchParams(q);
 						var s = q.get("server");
 						if(s) window.eaglercraftXOpts.joinServer = s;
 					}
-					
+
 					main();
 				}
 			});
 		</script>
 	</head>
-	<body style="margin:0px;width:100vw;height:100vh;overflow:hidden;" id="game_frame">
+	<body style="margin:0px;width:100%;height:100%;overflow:hidden;background-color:black;" id="game_frame">
 	</body>
 </html>
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/block/Block.java b/src/game/java/net/minecraft/block/Block.java
similarity index 100%
rename from src/main/java/net/minecraft/block/Block.java
rename to src/game/java/net/minecraft/block/Block.java
diff --git a/src/main/java/net/minecraft/block/BlockAir.java b/src/game/java/net/minecraft/block/BlockAir.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockAir.java
rename to src/game/java/net/minecraft/block/BlockAir.java
diff --git a/src/main/java/net/minecraft/block/BlockAnvil.java b/src/game/java/net/minecraft/block/BlockAnvil.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockAnvil.java
rename to src/game/java/net/minecraft/block/BlockAnvil.java
diff --git a/src/main/java/net/minecraft/block/BlockBanner.java b/src/game/java/net/minecraft/block/BlockBanner.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockBanner.java
rename to src/game/java/net/minecraft/block/BlockBanner.java
diff --git a/src/main/java/net/minecraft/block/BlockBarrier.java b/src/game/java/net/minecraft/block/BlockBarrier.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockBarrier.java
rename to src/game/java/net/minecraft/block/BlockBarrier.java
diff --git a/src/main/java/net/minecraft/block/BlockBasePressurePlate.java b/src/game/java/net/minecraft/block/BlockBasePressurePlate.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockBasePressurePlate.java
rename to src/game/java/net/minecraft/block/BlockBasePressurePlate.java
diff --git a/src/main/java/net/minecraft/block/BlockBeacon.java b/src/game/java/net/minecraft/block/BlockBeacon.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockBeacon.java
rename to src/game/java/net/minecraft/block/BlockBeacon.java
diff --git a/src/main/java/net/minecraft/block/BlockBed.java b/src/game/java/net/minecraft/block/BlockBed.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockBed.java
rename to src/game/java/net/minecraft/block/BlockBed.java
diff --git a/src/main/java/net/minecraft/block/BlockBookshelf.java b/src/game/java/net/minecraft/block/BlockBookshelf.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockBookshelf.java
rename to src/game/java/net/minecraft/block/BlockBookshelf.java
diff --git a/src/main/java/net/minecraft/block/BlockBreakable.java b/src/game/java/net/minecraft/block/BlockBreakable.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockBreakable.java
rename to src/game/java/net/minecraft/block/BlockBreakable.java
diff --git a/src/main/java/net/minecraft/block/BlockBrewingStand.java b/src/game/java/net/minecraft/block/BlockBrewingStand.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockBrewingStand.java
rename to src/game/java/net/minecraft/block/BlockBrewingStand.java
diff --git a/src/main/java/net/minecraft/block/BlockBush.java b/src/game/java/net/minecraft/block/BlockBush.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockBush.java
rename to src/game/java/net/minecraft/block/BlockBush.java
diff --git a/src/main/java/net/minecraft/block/BlockButton.java b/src/game/java/net/minecraft/block/BlockButton.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockButton.java
rename to src/game/java/net/minecraft/block/BlockButton.java
diff --git a/src/main/java/net/minecraft/block/BlockButtonStone.java b/src/game/java/net/minecraft/block/BlockButtonStone.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockButtonStone.java
rename to src/game/java/net/minecraft/block/BlockButtonStone.java
diff --git a/src/main/java/net/minecraft/block/BlockButtonWood.java b/src/game/java/net/minecraft/block/BlockButtonWood.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockButtonWood.java
rename to src/game/java/net/minecraft/block/BlockButtonWood.java
diff --git a/src/main/java/net/minecraft/block/BlockCactus.java b/src/game/java/net/minecraft/block/BlockCactus.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockCactus.java
rename to src/game/java/net/minecraft/block/BlockCactus.java
diff --git a/src/main/java/net/minecraft/block/BlockCake.java b/src/game/java/net/minecraft/block/BlockCake.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockCake.java
rename to src/game/java/net/minecraft/block/BlockCake.java
diff --git a/src/main/java/net/minecraft/block/BlockCarpet.java b/src/game/java/net/minecraft/block/BlockCarpet.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockCarpet.java
rename to src/game/java/net/minecraft/block/BlockCarpet.java
diff --git a/src/main/java/net/minecraft/block/BlockCarrot.java b/src/game/java/net/minecraft/block/BlockCarrot.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockCarrot.java
rename to src/game/java/net/minecraft/block/BlockCarrot.java
diff --git a/src/main/java/net/minecraft/block/BlockCauldron.java b/src/game/java/net/minecraft/block/BlockCauldron.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockCauldron.java
rename to src/game/java/net/minecraft/block/BlockCauldron.java
diff --git a/src/main/java/net/minecraft/block/BlockChest.java b/src/game/java/net/minecraft/block/BlockChest.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockChest.java
rename to src/game/java/net/minecraft/block/BlockChest.java
diff --git a/src/main/java/net/minecraft/block/BlockClay.java b/src/game/java/net/minecraft/block/BlockClay.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockClay.java
rename to src/game/java/net/minecraft/block/BlockClay.java
diff --git a/src/main/java/net/minecraft/block/BlockCocoa.java b/src/game/java/net/minecraft/block/BlockCocoa.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockCocoa.java
rename to src/game/java/net/minecraft/block/BlockCocoa.java
diff --git a/src/main/java/net/minecraft/block/BlockColored.java b/src/game/java/net/minecraft/block/BlockColored.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockColored.java
rename to src/game/java/net/minecraft/block/BlockColored.java
diff --git a/src/main/java/net/minecraft/block/BlockCommandBlock.java b/src/game/java/net/minecraft/block/BlockCommandBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockCommandBlock.java
rename to src/game/java/net/minecraft/block/BlockCommandBlock.java
diff --git a/src/main/java/net/minecraft/block/BlockCompressedPowered.java b/src/game/java/net/minecraft/block/BlockCompressedPowered.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockCompressedPowered.java
rename to src/game/java/net/minecraft/block/BlockCompressedPowered.java
diff --git a/src/main/java/net/minecraft/block/BlockContainer.java b/src/game/java/net/minecraft/block/BlockContainer.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockContainer.java
rename to src/game/java/net/minecraft/block/BlockContainer.java
diff --git a/src/main/java/net/minecraft/block/BlockCrops.java b/src/game/java/net/minecraft/block/BlockCrops.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockCrops.java
rename to src/game/java/net/minecraft/block/BlockCrops.java
diff --git a/src/main/java/net/minecraft/block/BlockDaylightDetector.java b/src/game/java/net/minecraft/block/BlockDaylightDetector.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDaylightDetector.java
rename to src/game/java/net/minecraft/block/BlockDaylightDetector.java
diff --git a/src/main/java/net/minecraft/block/BlockDeadBush.java b/src/game/java/net/minecraft/block/BlockDeadBush.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDeadBush.java
rename to src/game/java/net/minecraft/block/BlockDeadBush.java
diff --git a/src/main/java/net/minecraft/block/BlockDirectional.java b/src/game/java/net/minecraft/block/BlockDirectional.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDirectional.java
rename to src/game/java/net/minecraft/block/BlockDirectional.java
diff --git a/src/main/java/net/minecraft/block/BlockDirt.java b/src/game/java/net/minecraft/block/BlockDirt.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDirt.java
rename to src/game/java/net/minecraft/block/BlockDirt.java
diff --git a/src/main/java/net/minecraft/block/BlockDispenser.java b/src/game/java/net/minecraft/block/BlockDispenser.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDispenser.java
rename to src/game/java/net/minecraft/block/BlockDispenser.java
diff --git a/src/main/java/net/minecraft/block/BlockDoor.java b/src/game/java/net/minecraft/block/BlockDoor.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDoor.java
rename to src/game/java/net/minecraft/block/BlockDoor.java
diff --git a/src/main/java/net/minecraft/block/BlockDoublePlant.java b/src/game/java/net/minecraft/block/BlockDoublePlant.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDoublePlant.java
rename to src/game/java/net/minecraft/block/BlockDoublePlant.java
diff --git a/src/main/java/net/minecraft/block/BlockDoubleStoneSlab.java b/src/game/java/net/minecraft/block/BlockDoubleStoneSlab.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDoubleStoneSlab.java
rename to src/game/java/net/minecraft/block/BlockDoubleStoneSlab.java
diff --git a/src/main/java/net/minecraft/block/BlockDoubleStoneSlabNew.java b/src/game/java/net/minecraft/block/BlockDoubleStoneSlabNew.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDoubleStoneSlabNew.java
rename to src/game/java/net/minecraft/block/BlockDoubleStoneSlabNew.java
diff --git a/src/main/java/net/minecraft/block/BlockDoubleWoodSlab.java b/src/game/java/net/minecraft/block/BlockDoubleWoodSlab.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDoubleWoodSlab.java
rename to src/game/java/net/minecraft/block/BlockDoubleWoodSlab.java
diff --git a/src/main/java/net/minecraft/block/BlockDragonEgg.java b/src/game/java/net/minecraft/block/BlockDragonEgg.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDragonEgg.java
rename to src/game/java/net/minecraft/block/BlockDragonEgg.java
diff --git a/src/main/java/net/minecraft/block/BlockDropper.java b/src/game/java/net/minecraft/block/BlockDropper.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDropper.java
rename to src/game/java/net/minecraft/block/BlockDropper.java
diff --git a/src/main/java/net/minecraft/block/BlockDynamicLiquid.java b/src/game/java/net/minecraft/block/BlockDynamicLiquid.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockDynamicLiquid.java
rename to src/game/java/net/minecraft/block/BlockDynamicLiquid.java
diff --git a/src/main/java/net/minecraft/block/BlockEnchantmentTable.java b/src/game/java/net/minecraft/block/BlockEnchantmentTable.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockEnchantmentTable.java
rename to src/game/java/net/minecraft/block/BlockEnchantmentTable.java
diff --git a/src/main/java/net/minecraft/block/BlockEndPortal.java b/src/game/java/net/minecraft/block/BlockEndPortal.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockEndPortal.java
rename to src/game/java/net/minecraft/block/BlockEndPortal.java
diff --git a/src/main/java/net/minecraft/block/BlockEndPortalFrame.java b/src/game/java/net/minecraft/block/BlockEndPortalFrame.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockEndPortalFrame.java
rename to src/game/java/net/minecraft/block/BlockEndPortalFrame.java
diff --git a/src/main/java/net/minecraft/block/BlockEnderChest.java b/src/game/java/net/minecraft/block/BlockEnderChest.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockEnderChest.java
rename to src/game/java/net/minecraft/block/BlockEnderChest.java
diff --git a/src/main/java/net/minecraft/block/BlockEventData.java b/src/game/java/net/minecraft/block/BlockEventData.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockEventData.java
rename to src/game/java/net/minecraft/block/BlockEventData.java
diff --git a/src/main/java/net/minecraft/block/BlockFalling.java b/src/game/java/net/minecraft/block/BlockFalling.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockFalling.java
rename to src/game/java/net/minecraft/block/BlockFalling.java
diff --git a/src/main/java/net/minecraft/block/BlockFarmland.java b/src/game/java/net/minecraft/block/BlockFarmland.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockFarmland.java
rename to src/game/java/net/minecraft/block/BlockFarmland.java
diff --git a/src/main/java/net/minecraft/block/BlockFence.java b/src/game/java/net/minecraft/block/BlockFence.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockFence.java
rename to src/game/java/net/minecraft/block/BlockFence.java
diff --git a/src/main/java/net/minecraft/block/BlockFenceGate.java b/src/game/java/net/minecraft/block/BlockFenceGate.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockFenceGate.java
rename to src/game/java/net/minecraft/block/BlockFenceGate.java
diff --git a/src/main/java/net/minecraft/block/BlockFire.java b/src/game/java/net/minecraft/block/BlockFire.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockFire.java
rename to src/game/java/net/minecraft/block/BlockFire.java
diff --git a/src/main/java/net/minecraft/block/BlockFlower.java b/src/game/java/net/minecraft/block/BlockFlower.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockFlower.java
rename to src/game/java/net/minecraft/block/BlockFlower.java
diff --git a/src/main/java/net/minecraft/block/BlockFlowerPot.java b/src/game/java/net/minecraft/block/BlockFlowerPot.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockFlowerPot.java
rename to src/game/java/net/minecraft/block/BlockFlowerPot.java
diff --git a/src/main/java/net/minecraft/block/BlockFurnace.java b/src/game/java/net/minecraft/block/BlockFurnace.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockFurnace.java
rename to src/game/java/net/minecraft/block/BlockFurnace.java
diff --git a/src/main/java/net/minecraft/block/BlockGlass.java b/src/game/java/net/minecraft/block/BlockGlass.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockGlass.java
rename to src/game/java/net/minecraft/block/BlockGlass.java
diff --git a/src/main/java/net/minecraft/block/BlockGlowstone.java b/src/game/java/net/minecraft/block/BlockGlowstone.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockGlowstone.java
rename to src/game/java/net/minecraft/block/BlockGlowstone.java
diff --git a/src/main/java/net/minecraft/block/BlockGrass.java b/src/game/java/net/minecraft/block/BlockGrass.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockGrass.java
rename to src/game/java/net/minecraft/block/BlockGrass.java
diff --git a/src/main/java/net/minecraft/block/BlockGravel.java b/src/game/java/net/minecraft/block/BlockGravel.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockGravel.java
rename to src/game/java/net/minecraft/block/BlockGravel.java
diff --git a/src/main/java/net/minecraft/block/BlockHalfStoneSlab.java b/src/game/java/net/minecraft/block/BlockHalfStoneSlab.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockHalfStoneSlab.java
rename to src/game/java/net/minecraft/block/BlockHalfStoneSlab.java
diff --git a/src/main/java/net/minecraft/block/BlockHalfStoneSlabNew.java b/src/game/java/net/minecraft/block/BlockHalfStoneSlabNew.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockHalfStoneSlabNew.java
rename to src/game/java/net/minecraft/block/BlockHalfStoneSlabNew.java
diff --git a/src/main/java/net/minecraft/block/BlockHalfWoodSlab.java b/src/game/java/net/minecraft/block/BlockHalfWoodSlab.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockHalfWoodSlab.java
rename to src/game/java/net/minecraft/block/BlockHalfWoodSlab.java
diff --git a/src/main/java/net/minecraft/block/BlockHardenedClay.java b/src/game/java/net/minecraft/block/BlockHardenedClay.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockHardenedClay.java
rename to src/game/java/net/minecraft/block/BlockHardenedClay.java
diff --git a/src/main/java/net/minecraft/block/BlockHay.java b/src/game/java/net/minecraft/block/BlockHay.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockHay.java
rename to src/game/java/net/minecraft/block/BlockHay.java
diff --git a/src/main/java/net/minecraft/block/BlockHopper.java b/src/game/java/net/minecraft/block/BlockHopper.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockHopper.java
rename to src/game/java/net/minecraft/block/BlockHopper.java
diff --git a/src/main/java/net/minecraft/block/BlockHugeMushroom.java b/src/game/java/net/minecraft/block/BlockHugeMushroom.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockHugeMushroom.java
rename to src/game/java/net/minecraft/block/BlockHugeMushroom.java
diff --git a/src/main/java/net/minecraft/block/BlockIce.java b/src/game/java/net/minecraft/block/BlockIce.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockIce.java
rename to src/game/java/net/minecraft/block/BlockIce.java
diff --git a/src/main/java/net/minecraft/block/BlockJukebox.java b/src/game/java/net/minecraft/block/BlockJukebox.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockJukebox.java
rename to src/game/java/net/minecraft/block/BlockJukebox.java
diff --git a/src/main/java/net/minecraft/block/BlockLadder.java b/src/game/java/net/minecraft/block/BlockLadder.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockLadder.java
rename to src/game/java/net/minecraft/block/BlockLadder.java
diff --git a/src/main/java/net/minecraft/block/BlockLeaves.java b/src/game/java/net/minecraft/block/BlockLeaves.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockLeaves.java
rename to src/game/java/net/minecraft/block/BlockLeaves.java
diff --git a/src/main/java/net/minecraft/block/BlockLeavesBase.java b/src/game/java/net/minecraft/block/BlockLeavesBase.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockLeavesBase.java
rename to src/game/java/net/minecraft/block/BlockLeavesBase.java
diff --git a/src/main/java/net/minecraft/block/BlockLever.java b/src/game/java/net/minecraft/block/BlockLever.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockLever.java
rename to src/game/java/net/minecraft/block/BlockLever.java
diff --git a/src/main/java/net/minecraft/block/BlockLilyPad.java b/src/game/java/net/minecraft/block/BlockLilyPad.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockLilyPad.java
rename to src/game/java/net/minecraft/block/BlockLilyPad.java
diff --git a/src/main/java/net/minecraft/block/BlockLiquid.java b/src/game/java/net/minecraft/block/BlockLiquid.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockLiquid.java
rename to src/game/java/net/minecraft/block/BlockLiquid.java
diff --git a/src/main/java/net/minecraft/block/BlockLog.java b/src/game/java/net/minecraft/block/BlockLog.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockLog.java
rename to src/game/java/net/minecraft/block/BlockLog.java
diff --git a/src/main/java/net/minecraft/block/BlockMelon.java b/src/game/java/net/minecraft/block/BlockMelon.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockMelon.java
rename to src/game/java/net/minecraft/block/BlockMelon.java
diff --git a/src/main/java/net/minecraft/block/BlockMobSpawner.java b/src/game/java/net/minecraft/block/BlockMobSpawner.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockMobSpawner.java
rename to src/game/java/net/minecraft/block/BlockMobSpawner.java
diff --git a/src/main/java/net/minecraft/block/BlockMushroom.java b/src/game/java/net/minecraft/block/BlockMushroom.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockMushroom.java
rename to src/game/java/net/minecraft/block/BlockMushroom.java
diff --git a/src/main/java/net/minecraft/block/BlockMycelium.java b/src/game/java/net/minecraft/block/BlockMycelium.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockMycelium.java
rename to src/game/java/net/minecraft/block/BlockMycelium.java
diff --git a/src/main/java/net/minecraft/block/BlockNetherBrick.java b/src/game/java/net/minecraft/block/BlockNetherBrick.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockNetherBrick.java
rename to src/game/java/net/minecraft/block/BlockNetherBrick.java
diff --git a/src/main/java/net/minecraft/block/BlockNetherWart.java b/src/game/java/net/minecraft/block/BlockNetherWart.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockNetherWart.java
rename to src/game/java/net/minecraft/block/BlockNetherWart.java
diff --git a/src/main/java/net/minecraft/block/BlockNetherrack.java b/src/game/java/net/minecraft/block/BlockNetherrack.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockNetherrack.java
rename to src/game/java/net/minecraft/block/BlockNetherrack.java
diff --git a/src/main/java/net/minecraft/block/BlockNewLeaf.java b/src/game/java/net/minecraft/block/BlockNewLeaf.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockNewLeaf.java
rename to src/game/java/net/minecraft/block/BlockNewLeaf.java
diff --git a/src/main/java/net/minecraft/block/BlockNewLog.java b/src/game/java/net/minecraft/block/BlockNewLog.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockNewLog.java
rename to src/game/java/net/minecraft/block/BlockNewLog.java
diff --git a/src/main/java/net/minecraft/block/BlockNote.java b/src/game/java/net/minecraft/block/BlockNote.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockNote.java
rename to src/game/java/net/minecraft/block/BlockNote.java
diff --git a/src/main/java/net/minecraft/block/BlockObsidian.java b/src/game/java/net/minecraft/block/BlockObsidian.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockObsidian.java
rename to src/game/java/net/minecraft/block/BlockObsidian.java
diff --git a/src/main/java/net/minecraft/block/BlockOldLeaf.java b/src/game/java/net/minecraft/block/BlockOldLeaf.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockOldLeaf.java
rename to src/game/java/net/minecraft/block/BlockOldLeaf.java
diff --git a/src/main/java/net/minecraft/block/BlockOldLog.java b/src/game/java/net/minecraft/block/BlockOldLog.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockOldLog.java
rename to src/game/java/net/minecraft/block/BlockOldLog.java
diff --git a/src/main/java/net/minecraft/block/BlockOre.java b/src/game/java/net/minecraft/block/BlockOre.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockOre.java
rename to src/game/java/net/minecraft/block/BlockOre.java
diff --git a/src/main/java/net/minecraft/block/BlockPackedIce.java b/src/game/java/net/minecraft/block/BlockPackedIce.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPackedIce.java
rename to src/game/java/net/minecraft/block/BlockPackedIce.java
diff --git a/src/main/java/net/minecraft/block/BlockPane.java b/src/game/java/net/minecraft/block/BlockPane.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPane.java
rename to src/game/java/net/minecraft/block/BlockPane.java
diff --git a/src/main/java/net/minecraft/block/BlockPistonBase.java b/src/game/java/net/minecraft/block/BlockPistonBase.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPistonBase.java
rename to src/game/java/net/minecraft/block/BlockPistonBase.java
diff --git a/src/main/java/net/minecraft/block/BlockPistonExtension.java b/src/game/java/net/minecraft/block/BlockPistonExtension.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPistonExtension.java
rename to src/game/java/net/minecraft/block/BlockPistonExtension.java
diff --git a/src/main/java/net/minecraft/block/BlockPistonMoving.java b/src/game/java/net/minecraft/block/BlockPistonMoving.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPistonMoving.java
rename to src/game/java/net/minecraft/block/BlockPistonMoving.java
diff --git a/src/main/java/net/minecraft/block/BlockPlanks.java b/src/game/java/net/minecraft/block/BlockPlanks.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPlanks.java
rename to src/game/java/net/minecraft/block/BlockPlanks.java
diff --git a/src/main/java/net/minecraft/block/BlockPortal.java b/src/game/java/net/minecraft/block/BlockPortal.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPortal.java
rename to src/game/java/net/minecraft/block/BlockPortal.java
diff --git a/src/main/java/net/minecraft/block/BlockPotato.java b/src/game/java/net/minecraft/block/BlockPotato.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPotato.java
rename to src/game/java/net/minecraft/block/BlockPotato.java
diff --git a/src/main/java/net/minecraft/block/BlockPressurePlate.java b/src/game/java/net/minecraft/block/BlockPressurePlate.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPressurePlate.java
rename to src/game/java/net/minecraft/block/BlockPressurePlate.java
diff --git a/src/main/java/net/minecraft/block/BlockPressurePlateWeighted.java b/src/game/java/net/minecraft/block/BlockPressurePlateWeighted.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPressurePlateWeighted.java
rename to src/game/java/net/minecraft/block/BlockPressurePlateWeighted.java
diff --git a/src/main/java/net/minecraft/block/BlockPrismarine.java b/src/game/java/net/minecraft/block/BlockPrismarine.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPrismarine.java
rename to src/game/java/net/minecraft/block/BlockPrismarine.java
diff --git a/src/main/java/net/minecraft/block/BlockPumpkin.java b/src/game/java/net/minecraft/block/BlockPumpkin.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockPumpkin.java
rename to src/game/java/net/minecraft/block/BlockPumpkin.java
diff --git a/src/main/java/net/minecraft/block/BlockQuartz.java b/src/game/java/net/minecraft/block/BlockQuartz.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockQuartz.java
rename to src/game/java/net/minecraft/block/BlockQuartz.java
diff --git a/src/main/java/net/minecraft/block/BlockRail.java b/src/game/java/net/minecraft/block/BlockRail.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRail.java
rename to src/game/java/net/minecraft/block/BlockRail.java
diff --git a/src/main/java/net/minecraft/block/BlockRailBase.java b/src/game/java/net/minecraft/block/BlockRailBase.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRailBase.java
rename to src/game/java/net/minecraft/block/BlockRailBase.java
diff --git a/src/main/java/net/minecraft/block/BlockRailDetector.java b/src/game/java/net/minecraft/block/BlockRailDetector.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRailDetector.java
rename to src/game/java/net/minecraft/block/BlockRailDetector.java
diff --git a/src/main/java/net/minecraft/block/BlockRailPowered.java b/src/game/java/net/minecraft/block/BlockRailPowered.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRailPowered.java
rename to src/game/java/net/minecraft/block/BlockRailPowered.java
diff --git a/src/main/java/net/minecraft/block/BlockRedFlower.java b/src/game/java/net/minecraft/block/BlockRedFlower.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRedFlower.java
rename to src/game/java/net/minecraft/block/BlockRedFlower.java
diff --git a/src/main/java/net/minecraft/block/BlockRedSandstone.java b/src/game/java/net/minecraft/block/BlockRedSandstone.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRedSandstone.java
rename to src/game/java/net/minecraft/block/BlockRedSandstone.java
diff --git a/src/main/java/net/minecraft/block/BlockRedstoneComparator.java b/src/game/java/net/minecraft/block/BlockRedstoneComparator.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRedstoneComparator.java
rename to src/game/java/net/minecraft/block/BlockRedstoneComparator.java
diff --git a/src/main/java/net/minecraft/block/BlockRedstoneDiode.java b/src/game/java/net/minecraft/block/BlockRedstoneDiode.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRedstoneDiode.java
rename to src/game/java/net/minecraft/block/BlockRedstoneDiode.java
diff --git a/src/main/java/net/minecraft/block/BlockRedstoneLight.java b/src/game/java/net/minecraft/block/BlockRedstoneLight.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRedstoneLight.java
rename to src/game/java/net/minecraft/block/BlockRedstoneLight.java
diff --git a/src/main/java/net/minecraft/block/BlockRedstoneOre.java b/src/game/java/net/minecraft/block/BlockRedstoneOre.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRedstoneOre.java
rename to src/game/java/net/minecraft/block/BlockRedstoneOre.java
diff --git a/src/main/java/net/minecraft/block/BlockRedstoneRepeater.java b/src/game/java/net/minecraft/block/BlockRedstoneRepeater.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRedstoneRepeater.java
rename to src/game/java/net/minecraft/block/BlockRedstoneRepeater.java
diff --git a/src/main/java/net/minecraft/block/BlockRedstoneTorch.java b/src/game/java/net/minecraft/block/BlockRedstoneTorch.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRedstoneTorch.java
rename to src/game/java/net/minecraft/block/BlockRedstoneTorch.java
diff --git a/src/main/java/net/minecraft/block/BlockRedstoneWire.java b/src/game/java/net/minecraft/block/BlockRedstoneWire.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRedstoneWire.java
rename to src/game/java/net/minecraft/block/BlockRedstoneWire.java
diff --git a/src/main/java/net/minecraft/block/BlockReed.java b/src/game/java/net/minecraft/block/BlockReed.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockReed.java
rename to src/game/java/net/minecraft/block/BlockReed.java
diff --git a/src/main/java/net/minecraft/block/BlockRotatedPillar.java b/src/game/java/net/minecraft/block/BlockRotatedPillar.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockRotatedPillar.java
rename to src/game/java/net/minecraft/block/BlockRotatedPillar.java
diff --git a/src/main/java/net/minecraft/block/BlockSand.java b/src/game/java/net/minecraft/block/BlockSand.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSand.java
rename to src/game/java/net/minecraft/block/BlockSand.java
diff --git a/src/main/java/net/minecraft/block/BlockSandStone.java b/src/game/java/net/minecraft/block/BlockSandStone.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSandStone.java
rename to src/game/java/net/minecraft/block/BlockSandStone.java
diff --git a/src/main/java/net/minecraft/block/BlockSapling.java b/src/game/java/net/minecraft/block/BlockSapling.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSapling.java
rename to src/game/java/net/minecraft/block/BlockSapling.java
diff --git a/src/main/java/net/minecraft/block/BlockSeaLantern.java b/src/game/java/net/minecraft/block/BlockSeaLantern.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSeaLantern.java
rename to src/game/java/net/minecraft/block/BlockSeaLantern.java
diff --git a/src/main/java/net/minecraft/block/BlockSign.java b/src/game/java/net/minecraft/block/BlockSign.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSign.java
rename to src/game/java/net/minecraft/block/BlockSign.java
diff --git a/src/main/java/net/minecraft/block/BlockSilverfish.java b/src/game/java/net/minecraft/block/BlockSilverfish.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSilverfish.java
rename to src/game/java/net/minecraft/block/BlockSilverfish.java
diff --git a/src/main/java/net/minecraft/block/BlockSkull.java b/src/game/java/net/minecraft/block/BlockSkull.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSkull.java
rename to src/game/java/net/minecraft/block/BlockSkull.java
diff --git a/src/main/java/net/minecraft/block/BlockSlab.java b/src/game/java/net/minecraft/block/BlockSlab.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSlab.java
rename to src/game/java/net/minecraft/block/BlockSlab.java
diff --git a/src/main/java/net/minecraft/block/BlockSlime.java b/src/game/java/net/minecraft/block/BlockSlime.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSlime.java
rename to src/game/java/net/minecraft/block/BlockSlime.java
diff --git a/src/main/java/net/minecraft/block/BlockSnow.java b/src/game/java/net/minecraft/block/BlockSnow.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSnow.java
rename to src/game/java/net/minecraft/block/BlockSnow.java
diff --git a/src/main/java/net/minecraft/block/BlockSnowBlock.java b/src/game/java/net/minecraft/block/BlockSnowBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSnowBlock.java
rename to src/game/java/net/minecraft/block/BlockSnowBlock.java
diff --git a/src/main/java/net/minecraft/block/BlockSoulSand.java b/src/game/java/net/minecraft/block/BlockSoulSand.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSoulSand.java
rename to src/game/java/net/minecraft/block/BlockSoulSand.java
diff --git a/src/main/java/net/minecraft/block/BlockSourceImpl.java b/src/game/java/net/minecraft/block/BlockSourceImpl.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSourceImpl.java
rename to src/game/java/net/minecraft/block/BlockSourceImpl.java
diff --git a/src/main/java/net/minecraft/block/BlockSponge.java b/src/game/java/net/minecraft/block/BlockSponge.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockSponge.java
rename to src/game/java/net/minecraft/block/BlockSponge.java
diff --git a/src/main/java/net/minecraft/block/BlockStainedGlass.java b/src/game/java/net/minecraft/block/BlockStainedGlass.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockStainedGlass.java
rename to src/game/java/net/minecraft/block/BlockStainedGlass.java
diff --git a/src/main/java/net/minecraft/block/BlockStainedGlassPane.java b/src/game/java/net/minecraft/block/BlockStainedGlassPane.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockStainedGlassPane.java
rename to src/game/java/net/minecraft/block/BlockStainedGlassPane.java
diff --git a/src/main/java/net/minecraft/block/BlockStairs.java b/src/game/java/net/minecraft/block/BlockStairs.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockStairs.java
rename to src/game/java/net/minecraft/block/BlockStairs.java
diff --git a/src/main/java/net/minecraft/block/BlockStandingSign.java b/src/game/java/net/minecraft/block/BlockStandingSign.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockStandingSign.java
rename to src/game/java/net/minecraft/block/BlockStandingSign.java
diff --git a/src/main/java/net/minecraft/block/BlockStaticLiquid.java b/src/game/java/net/minecraft/block/BlockStaticLiquid.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockStaticLiquid.java
rename to src/game/java/net/minecraft/block/BlockStaticLiquid.java
diff --git a/src/main/java/net/minecraft/block/BlockStem.java b/src/game/java/net/minecraft/block/BlockStem.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockStem.java
rename to src/game/java/net/minecraft/block/BlockStem.java
diff --git a/src/main/java/net/minecraft/block/BlockStone.java b/src/game/java/net/minecraft/block/BlockStone.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockStone.java
rename to src/game/java/net/minecraft/block/BlockStone.java
diff --git a/src/main/java/net/minecraft/block/BlockStoneBrick.java b/src/game/java/net/minecraft/block/BlockStoneBrick.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockStoneBrick.java
rename to src/game/java/net/minecraft/block/BlockStoneBrick.java
diff --git a/src/main/java/net/minecraft/block/BlockStoneSlab.java b/src/game/java/net/minecraft/block/BlockStoneSlab.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockStoneSlab.java
rename to src/game/java/net/minecraft/block/BlockStoneSlab.java
diff --git a/src/main/java/net/minecraft/block/BlockStoneSlabNew.java b/src/game/java/net/minecraft/block/BlockStoneSlabNew.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockStoneSlabNew.java
rename to src/game/java/net/minecraft/block/BlockStoneSlabNew.java
diff --git a/src/main/java/net/minecraft/block/BlockTNT.java b/src/game/java/net/minecraft/block/BlockTNT.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockTNT.java
rename to src/game/java/net/minecraft/block/BlockTNT.java
diff --git a/src/main/java/net/minecraft/block/BlockTallGrass.java b/src/game/java/net/minecraft/block/BlockTallGrass.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockTallGrass.java
rename to src/game/java/net/minecraft/block/BlockTallGrass.java
diff --git a/src/main/java/net/minecraft/block/BlockTorch.java b/src/game/java/net/minecraft/block/BlockTorch.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockTorch.java
rename to src/game/java/net/minecraft/block/BlockTorch.java
diff --git a/src/main/java/net/minecraft/block/BlockTrapDoor.java b/src/game/java/net/minecraft/block/BlockTrapDoor.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockTrapDoor.java
rename to src/game/java/net/minecraft/block/BlockTrapDoor.java
diff --git a/src/main/java/net/minecraft/block/BlockTripWire.java b/src/game/java/net/minecraft/block/BlockTripWire.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockTripWire.java
rename to src/game/java/net/minecraft/block/BlockTripWire.java
diff --git a/src/main/java/net/minecraft/block/BlockTripWireHook.java b/src/game/java/net/minecraft/block/BlockTripWireHook.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockTripWireHook.java
rename to src/game/java/net/minecraft/block/BlockTripWireHook.java
diff --git a/src/main/java/net/minecraft/block/BlockVine.java b/src/game/java/net/minecraft/block/BlockVine.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockVine.java
rename to src/game/java/net/minecraft/block/BlockVine.java
diff --git a/src/main/java/net/minecraft/block/BlockWall.java b/src/game/java/net/minecraft/block/BlockWall.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockWall.java
rename to src/game/java/net/minecraft/block/BlockWall.java
diff --git a/src/main/java/net/minecraft/block/BlockWallSign.java b/src/game/java/net/minecraft/block/BlockWallSign.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockWallSign.java
rename to src/game/java/net/minecraft/block/BlockWallSign.java
diff --git a/src/main/java/net/minecraft/block/BlockWeb.java b/src/game/java/net/minecraft/block/BlockWeb.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockWeb.java
rename to src/game/java/net/minecraft/block/BlockWeb.java
diff --git a/src/main/java/net/minecraft/block/BlockWoodSlab.java b/src/game/java/net/minecraft/block/BlockWoodSlab.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockWoodSlab.java
rename to src/game/java/net/minecraft/block/BlockWoodSlab.java
diff --git a/src/main/java/net/minecraft/block/BlockWorkbench.java b/src/game/java/net/minecraft/block/BlockWorkbench.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockWorkbench.java
rename to src/game/java/net/minecraft/block/BlockWorkbench.java
diff --git a/src/main/java/net/minecraft/block/BlockYellowFlower.java b/src/game/java/net/minecraft/block/BlockYellowFlower.java
similarity index 100%
rename from src/main/java/net/minecraft/block/BlockYellowFlower.java
rename to src/game/java/net/minecraft/block/BlockYellowFlower.java
diff --git a/src/main/java/net/minecraft/block/IGrowable.java b/src/game/java/net/minecraft/block/IGrowable.java
similarity index 100%
rename from src/main/java/net/minecraft/block/IGrowable.java
rename to src/game/java/net/minecraft/block/IGrowable.java
diff --git a/src/main/java/net/minecraft/block/ITileEntityProvider.java b/src/game/java/net/minecraft/block/ITileEntityProvider.java
similarity index 100%
rename from src/main/java/net/minecraft/block/ITileEntityProvider.java
rename to src/game/java/net/minecraft/block/ITileEntityProvider.java
diff --git a/src/main/java/net/minecraft/block/material/MapColor.java b/src/game/java/net/minecraft/block/material/MapColor.java
similarity index 100%
rename from src/main/java/net/minecraft/block/material/MapColor.java
rename to src/game/java/net/minecraft/block/material/MapColor.java
diff --git a/src/main/java/net/minecraft/block/material/Material.java b/src/game/java/net/minecraft/block/material/Material.java
similarity index 100%
rename from src/main/java/net/minecraft/block/material/Material.java
rename to src/game/java/net/minecraft/block/material/Material.java
diff --git a/src/main/java/net/minecraft/block/material/MaterialLiquid.java b/src/game/java/net/minecraft/block/material/MaterialLiquid.java
similarity index 100%
rename from src/main/java/net/minecraft/block/material/MaterialLiquid.java
rename to src/game/java/net/minecraft/block/material/MaterialLiquid.java
diff --git a/src/main/java/net/minecraft/block/material/MaterialLogic.java b/src/game/java/net/minecraft/block/material/MaterialLogic.java
similarity index 100%
rename from src/main/java/net/minecraft/block/material/MaterialLogic.java
rename to src/game/java/net/minecraft/block/material/MaterialLogic.java
diff --git a/src/main/java/net/minecraft/block/material/MaterialPortal.java b/src/game/java/net/minecraft/block/material/MaterialPortal.java
similarity index 100%
rename from src/main/java/net/minecraft/block/material/MaterialPortal.java
rename to src/game/java/net/minecraft/block/material/MaterialPortal.java
diff --git a/src/main/java/net/minecraft/block/material/MaterialTransparent.java b/src/game/java/net/minecraft/block/material/MaterialTransparent.java
similarity index 100%
rename from src/main/java/net/minecraft/block/material/MaterialTransparent.java
rename to src/game/java/net/minecraft/block/material/MaterialTransparent.java
diff --git a/src/main/java/net/minecraft/block/properties/IProperty.java b/src/game/java/net/minecraft/block/properties/IProperty.java
similarity index 100%
rename from src/main/java/net/minecraft/block/properties/IProperty.java
rename to src/game/java/net/minecraft/block/properties/IProperty.java
diff --git a/src/main/java/net/minecraft/block/properties/PropertyBool.java b/src/game/java/net/minecraft/block/properties/PropertyBool.java
similarity index 100%
rename from src/main/java/net/minecraft/block/properties/PropertyBool.java
rename to src/game/java/net/minecraft/block/properties/PropertyBool.java
diff --git a/src/main/java/net/minecraft/block/properties/PropertyDirection.java b/src/game/java/net/minecraft/block/properties/PropertyDirection.java
similarity index 100%
rename from src/main/java/net/minecraft/block/properties/PropertyDirection.java
rename to src/game/java/net/minecraft/block/properties/PropertyDirection.java
diff --git a/src/main/java/net/minecraft/block/properties/PropertyEnum.java b/src/game/java/net/minecraft/block/properties/PropertyEnum.java
similarity index 100%
rename from src/main/java/net/minecraft/block/properties/PropertyEnum.java
rename to src/game/java/net/minecraft/block/properties/PropertyEnum.java
diff --git a/src/main/java/net/minecraft/block/properties/PropertyHelper.java b/src/game/java/net/minecraft/block/properties/PropertyHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/block/properties/PropertyHelper.java
rename to src/game/java/net/minecraft/block/properties/PropertyHelper.java
diff --git a/src/main/java/net/minecraft/block/properties/PropertyInteger.java b/src/game/java/net/minecraft/block/properties/PropertyInteger.java
similarity index 100%
rename from src/main/java/net/minecraft/block/properties/PropertyInteger.java
rename to src/game/java/net/minecraft/block/properties/PropertyInteger.java
diff --git a/src/main/java/net/minecraft/block/state/BlockPistonStructureHelper.java b/src/game/java/net/minecraft/block/state/BlockPistonStructureHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/block/state/BlockPistonStructureHelper.java
rename to src/game/java/net/minecraft/block/state/BlockPistonStructureHelper.java
diff --git a/src/main/java/net/minecraft/block/state/BlockState.java b/src/game/java/net/minecraft/block/state/BlockState.java
similarity index 100%
rename from src/main/java/net/minecraft/block/state/BlockState.java
rename to src/game/java/net/minecraft/block/state/BlockState.java
diff --git a/src/main/java/net/minecraft/block/state/BlockStateBase.java b/src/game/java/net/minecraft/block/state/BlockStateBase.java
similarity index 100%
rename from src/main/java/net/minecraft/block/state/BlockStateBase.java
rename to src/game/java/net/minecraft/block/state/BlockStateBase.java
diff --git a/src/main/java/net/minecraft/block/state/BlockWorldState.java b/src/game/java/net/minecraft/block/state/BlockWorldState.java
similarity index 100%
rename from src/main/java/net/minecraft/block/state/BlockWorldState.java
rename to src/game/java/net/minecraft/block/state/BlockWorldState.java
diff --git a/src/main/java/net/minecraft/block/state/IBlockState.java b/src/game/java/net/minecraft/block/state/IBlockState.java
similarity index 100%
rename from src/main/java/net/minecraft/block/state/IBlockState.java
rename to src/game/java/net/minecraft/block/state/IBlockState.java
diff --git a/src/main/java/net/minecraft/block/state/pattern/BlockHelper.java b/src/game/java/net/minecraft/block/state/pattern/BlockHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/block/state/pattern/BlockHelper.java
rename to src/game/java/net/minecraft/block/state/pattern/BlockHelper.java
diff --git a/src/main/java/net/minecraft/block/state/pattern/BlockPattern.java b/src/game/java/net/minecraft/block/state/pattern/BlockPattern.java
similarity index 100%
rename from src/main/java/net/minecraft/block/state/pattern/BlockPattern.java
rename to src/game/java/net/minecraft/block/state/pattern/BlockPattern.java
diff --git a/src/main/java/net/minecraft/block/state/pattern/BlockStateHelper.java b/src/game/java/net/minecraft/block/state/pattern/BlockStateHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/block/state/pattern/BlockStateHelper.java
rename to src/game/java/net/minecraft/block/state/pattern/BlockStateHelper.java
diff --git a/src/main/java/net/minecraft/block/state/pattern/FactoryBlockPattern.java b/src/game/java/net/minecraft/block/state/pattern/FactoryBlockPattern.java
similarity index 100%
rename from src/main/java/net/minecraft/block/state/pattern/FactoryBlockPattern.java
rename to src/game/java/net/minecraft/block/state/pattern/FactoryBlockPattern.java
diff --git a/src/main/java/net/minecraft/client/ClientBrandRetriever.java b/src/game/java/net/minecraft/client/ClientBrandRetriever.java
similarity index 100%
rename from src/main/java/net/minecraft/client/ClientBrandRetriever.java
rename to src/game/java/net/minecraft/client/ClientBrandRetriever.java
diff --git a/src/main/java/net/minecraft/client/LoadingScreenRenderer.java b/src/game/java/net/minecraft/client/LoadingScreenRenderer.java
similarity index 90%
rename from src/main/java/net/minecraft/client/LoadingScreenRenderer.java
rename to src/game/java/net/minecraft/client/LoadingScreenRenderer.java
index b831f10..9749ecc 100755
--- a/src/main/java/net/minecraft/client/LoadingScreenRenderer.java
+++ b/src/game/java/net/minecraft/client/LoadingScreenRenderer.java
@@ -45,11 +45,9 @@ public class LoadingScreenRenderer implements IProgressUpdate {
 	 */
 	private long systemTime = Minecraft.getSystemTime();
 	private boolean field_73724_e;
-	private ScaledResolution scaledResolution;
 
 	public LoadingScreenRenderer(Minecraft mcIn) {
 		this.mc = mcIn;
-		this.scaledResolution = new ScaledResolution(mcIn);
 	}
 
 	/**+
@@ -80,9 +78,8 @@ public class LoadingScreenRenderer implements IProgressUpdate {
 			GlStateManager.clear(GL_DEPTH_BUFFER_BIT);
 			GlStateManager.matrixMode(GL_PROJECTION);
 			GlStateManager.loadIdentity();
-			ScaledResolution scaledresolution = new ScaledResolution(this.mc);
-			GlStateManager.ortho(0.0D, scaledresolution.getScaledWidth_double(),
-					scaledresolution.getScaledHeight_double(), 0.0D, 100.0D, 300.0D);
+			GlStateManager.ortho(0.0D, mc.scaledResolution.getScaledWidth_double(),
+					mc.scaledResolution.getScaledHeight_double(), 0.0D, 100.0D, 300.0D);
 			GlStateManager.matrixMode(GL_MODELVIEW);
 			GlStateManager.loadIdentity();
 			GlStateManager.translate(0.0F, 0.0F, -200.0F);
@@ -137,7 +134,7 @@ public class LoadingScreenRenderer implements IProgressUpdate {
 			long i = Minecraft.getSystemTime();
 			if (i - this.systemTime >= 100L) {
 				this.systemTime = i;
-				ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+				ScaledResolution scaledresolution = mc.scaledResolution;
 				int j = scaledresolution.getScaleFactor();
 				int k = scaledresolution.getScaledWidth();
 				int l = scaledresolution.getScaledHeight();
@@ -192,9 +189,11 @@ public class LoadingScreenRenderer implements IProgressUpdate {
 				this.mc.fontRendererObj.drawStringWithShadow(this.currentlyDisplayedText,
 						(float) ((k - this.mc.fontRendererObj.getStringWidth(this.currentlyDisplayedText)) / 2),
 						(float) (l / 2 - 4 - 16), 16777215);
-				this.mc.fontRendererObj.drawStringWithShadow(this.message,
-						(float) ((k - this.mc.fontRendererObj.getStringWidth(this.message)) / 2),
-						(float) (l / 2 - 4 + 8), 16777215);
+				if (this.message != null) {
+					this.mc.fontRendererObj.drawStringWithShadow(this.message,
+							(float) ((k - this.mc.fontRendererObj.getStringWidth(this.message)) / 2),
+							(float) (l / 2 - 4 + 8), 16777215);
+				}
 				this.mc.updateDisplay();
 
 				try {
diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/game/java/net/minecraft/client/Minecraft.java
similarity index 80%
rename from src/main/java/net/minecraft/client/Minecraft.java
rename to src/game/java/net/minecraft/client/Minecraft.java
index 870b84f..65ff8ab 100755
--- a/src/main/java/net/minecraft/client/Minecraft.java
+++ b/src/game/java/net/minecraft/client/Minecraft.java
@@ -6,19 +6,13 @@ import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL._wglBindFram
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Callable;
 
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
-
-import org.apache.commons.lang3.Validate;
-
-import com.google.common.collect.Lists;
-
+import net.lax1dude.eaglercraft.v1_8.ClientUUIDLoadingCache;
 import net.lax1dude.eaglercraft.v1_8.Display;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
@@ -27,16 +21,30 @@ import net.lax1dude.eaglercraft.v1_8.HString;
 import net.lax1dude.eaglercraft.v1_8.IOUtils;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PauseMenuCustomizeState;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
+import net.lax1dude.eaglercraft.v1_8.Touch;
+import net.lax1dude.eaglercraft.v1_8.cookie.ServerCookieDataStore;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
+
+import org.apache.commons.lang3.Validate;
+
+import com.google.common.collect.Lists;
+
 import net.lax1dude.eaglercraft.v1_8.futures.Executors;
 import net.lax1dude.eaglercraft.v1_8.futures.FutureTask;
 import net.lax1dude.eaglercraft.v1_8.futures.ListenableFuture;
 import net.lax1dude.eaglercraft.v1_8.futures.ListenableFutureTask;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFontRenderer;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
+import net.lax1dude.eaglercraft.v1_8.notifications.ServerNotificationRenderer;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglerMeshLoader;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
@@ -51,6 +59,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture.EmissiveItems;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture.MetalsLUT;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture.PBRTextureMapUtils;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture.TemperaturesLUT;
+import net.lax1dude.eaglercraft.v1_8.profanity_filter.GuiScreenContentWarning;
 import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
 import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenEditProfile;
 import net.lax1dude.eaglercraft.v1_8.profile.SkinPreviewRenderer;
@@ -64,9 +73,17 @@ import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenDemoIntegratedServerStartup
 import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenIntegratedServerBusy;
 import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenSingleplayerConnecting;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;
+import net.lax1dude.eaglercraft.v1_8.touch_gui.TouchControls;
+import net.lax1dude.eaglercraft.v1_8.touch_gui.TouchOverlayRenderer;
+import net.lax1dude.eaglercraft.v1_8.update.GuiUpdateDownloadSuccess;
+import net.lax1dude.eaglercraft.v1_8.update.GuiUpdateInstallOptions;
 import net.lax1dude.eaglercraft.v1_8.update.RelayUpdateChecker;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateDataObj;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateResultObj;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
 import net.lax1dude.eaglercraft.v1_8.voice.GuiVoiceOverlay;
 import net.lax1dude.eaglercraft.v1_8.voice.VoiceClientController;
+import net.lax1dude.eaglercraft.v1_8.webview.WebViewOverlayController;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.audio.MusicTicker;
@@ -152,7 +169,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.nbt.NBTTagString;
 import net.minecraft.network.play.client.C16PacketClientStatus;
-import net.minecraft.profiler.Profiler;
 import net.minecraft.stats.AchievementList;
 import net.minecraft.stats.IStatStringFormat;
 import net.minecraft.stats.StatFileWriter;
@@ -169,6 +185,7 @@ import net.minecraft.util.MinecraftError;
 import net.minecraft.util.MouseHelper;
 import net.minecraft.util.MovementInputFromOptions;
 import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.MovingObjectPosition.MovingObjectType;
 import net.minecraft.util.ReportedException;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.ScreenShotHelper;
@@ -216,6 +233,7 @@ public class Minecraft implements IThreadListener {
 	private CrashReport crashReporter;
 	public int displayWidth;
 	public int displayHeight;
+	public float displayDPI;
 	private boolean field_181541_X = false;
 	private Timer timer = new Timer(20.0F);
 	public WorldClient theWorld;
@@ -257,10 +275,6 @@ public class Minecraft implements IThreadListener {
 	private final boolean jvm64bit;
 	private EaglercraftNetworkManager myNetworkManager;
 	private boolean integratedServerIsRunning;
-	/**+
-	 * The profiler instance
-	 */
-	public final Profiler mcProfiler = new Profiler();
 	/**+
 	 * Keeps track of how long the debug crash keycombo (F3+C) has
 	 * been pressed for, in order to crash after 10 seconds.
@@ -276,7 +290,7 @@ public class Minecraft implements IThreadListener {
 	private SoundHandler mcSoundHandler;
 	private MusicTicker mcMusicTicker;
 	private ResourceLocation mojangLogo;
-	private final List<FutureTask<?>> scheduledTasks = new LinkedList();
+	private final List<FutureTask<?>> scheduledTasks = new LinkedList<>();
 	private long field_175615_aJ = 0L;
 	private final Thread mcThread = Thread.currentThread();
 	private ModelManager modelManager;
@@ -309,10 +323,15 @@ public class Minecraft implements IThreadListener {
 	public SkullCommand eagskullCommand;
 
 	public GuiVoiceOverlay voiceOverlay;
+	public ServerNotificationRenderer notifRenderer;
+	public TouchOverlayRenderer touchOverlayRenderer;
 
 	public float startZoomValue = 18.0f;
 	public float adjustedZoomValue = 18.0f;
 	public boolean isZoomKey = false;
+	private String reconnectURI = null;
+	public boolean mouseGrabSupported = false;
+	public ScaledResolution scaledResolution = null;
 
 	public Minecraft(GameConfiguration gameConfig) {
 		theMinecraft = this;
@@ -323,6 +342,7 @@ public class Minecraft implements IThreadListener {
 		logger.info("Setting user: " + this.session.getProfile().getName());
 		this.displayWidth = gameConfig.displayInfo.width > 0 ? gameConfig.displayInfo.width : 1;
 		this.displayHeight = gameConfig.displayInfo.height > 0 ? gameConfig.displayInfo.height : 1;
+		this.displayDPI = 1.0f;
 		this.tempDisplayWidth = gameConfig.displayInfo.width;
 		this.tempDisplayHeight = gameConfig.displayInfo.height;
 		this.fullscreen = gameConfig.displayInfo.fullscreen;
@@ -400,6 +420,7 @@ public class Minecraft implements IThreadListener {
 		this.mcResourceManager = new SimpleReloadableResourceManager(this.metadataSerializer_);
 		this.mcLanguageManager = new LanguageManager(this.metadataSerializer_, this.gameSettings.language);
 		this.mcResourceManager.registerReloadListener(this.mcLanguageManager);
+		this.scaledResolution = new ScaledResolution(this);
 		this.refreshResources();
 		this.renderEngine = new TextureManager(this.mcResourceManager);
 		this.mcResourceManager.registerReloadListener(this.renderEngine);
@@ -407,14 +428,14 @@ public class Minecraft implements IThreadListener {
 		this.mcSoundHandler = new SoundHandler(this.mcResourceManager, this.gameSettings);
 		this.mcResourceManager.registerReloadListener(this.mcSoundHandler);
 		this.mcMusicTicker = new MusicTicker(this);
-		this.fontRendererObj = new EaglerFontRenderer(this.gameSettings,
+		this.fontRendererObj = EaglerFontRenderer.createSupportedFontRenderer(this.gameSettings,
 				new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false);
 		if (this.gameSettings.language != null) {
 			this.fontRendererObj.setUnicodeFlag(this.isUnicode());
 			this.fontRendererObj.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional());
 		}
 
-		this.standardGalacticFontRenderer = new EaglerFontRenderer(this.gameSettings,
+		this.standardGalacticFontRenderer = EaglerFontRenderer.createSupportedFontRenderer(this.gameSettings,
 				new ResourceLocation("textures/font/ascii_sga.png"), this.renderEngine, false);
 		this.mcResourceManager.registerReloadListener(this.fontRendererObj);
 		this.mcResourceManager.registerReloadListener(this.standardGalacticFontRenderer);
@@ -476,13 +497,23 @@ public class Minecraft implements IThreadListener {
 		SkinPreviewRenderer.initialize();
 		this.checkGLError("Post startup");
 		this.ingameGUI = new GuiIngame(this);
+
+		this.mouseGrabSupported = Mouse.isMouseGrabSupported();
+		PointerInputAbstraction.init(this);
+
 		this.eagskullCommand = new SkullCommand(this);
 		this.voiceOverlay = new GuiVoiceOverlay(this);
-		ScaledResolution voiceRes = new ScaledResolution(this);
-		this.voiceOverlay.setResolution(voiceRes.getScaledWidth(), voiceRes.getScaledHeight());
+		this.voiceOverlay.setResolution(scaledResolution.getScaledWidth(), scaledResolution.getScaledHeight());
+
+		this.notifRenderer = new ServerNotificationRenderer();
+		this.notifRenderer.init();
+		this.notifRenderer.setResolution(this, scaledResolution.getScaledWidth(), scaledResolution.getScaledHeight(),
+				scaledResolution.getScaleFactor());
+		this.touchOverlayRenderer = new TouchOverlayRenderer(this);
 
 		ServerList.initServerList(this);
 		EaglerProfile.read();
+		ServerCookieDataStore.load();
 
 		GuiScreen mainMenu = new GuiMainMenu();
 		if (isDemo()) {
@@ -492,11 +523,24 @@ public class Minecraft implements IThreadListener {
 			mainMenu = new GuiConnecting(mainMenu, this, this.serverName, this.serverPort);
 		}
 
-		this.displayGuiScreen(new GuiScreenEditProfile(mainMenu));
+		mainMenu = new GuiScreenEditProfile(mainMenu);
+
+		if (!EagRuntime.getConfiguration().isForceProfanityFilter() && !gameSettings.hasShownProfanityFilter) {
+			mainMenu = new GuiScreenContentWarning(mainMenu);
+		}
+
+		this.displayGuiScreen(mainMenu);
 
 		this.renderEngine.deleteTexture(this.mojangLogo);
 		this.mojangLogo = null;
 		this.loadingScreen = new LoadingScreenRenderer(this);
+
+		while (Mouse.next())
+			;
+		while (Keyboard.next())
+			;
+		while (Touch.next())
+			;
 	}
 
 	private void registerMetadataSerializers() {
@@ -512,10 +556,6 @@ public class Minecraft implements IThreadListener {
 				LanguageMetadataSection.class);
 	}
 
-	private void initStream() {
-		throw new UnsupportedOperationException("wtf u trying to twitch stream in a browser game?");
-	}
-
 	private void createDisplay() {
 		Display.create();
 		Display.setTitle("Eaglercraft 1.8.8");
@@ -598,18 +638,18 @@ public class Minecraft implements IThreadListener {
 	private void updateDisplayMode() {
 		this.displayWidth = Display.getWidth();
 		this.displayHeight = Display.getHeight();
+		this.displayDPI = Display.getDPI();
+		this.scaledResolution = new ScaledResolution(this);
 	}
 
 	private void drawSplashScreen(TextureManager textureManagerInstance) {
 		Display.update();
 		updateDisplayMode();
 		GlStateManager.viewport(0, 0, displayWidth, displayHeight);
-		ScaledResolution scaledresolution = new ScaledResolution(this);
-		int i = scaledresolution.getScaleFactor();
 		GlStateManager.matrixMode(GL_PROJECTION);
 		GlStateManager.loadIdentity();
-		GlStateManager.ortho(0.0D, (double) scaledresolution.getScaledWidth(),
-				(double) scaledresolution.getScaledHeight(), 0.0D, 1000.0D, 3000.0D);
+		GlStateManager.ortho(0.0D, (double) scaledResolution.getScaledWidth(),
+				(double) scaledResolution.getScaledHeight(), 0.0D, 1000.0D, 3000.0D);
 		GlStateManager.matrixMode(GL_MODELVIEW);
 		GlStateManager.loadIdentity();
 		GlStateManager.translate(0.0F, 0.0F, -2000.0F);
@@ -643,8 +683,8 @@ public class Minecraft implements IThreadListener {
 		GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
 		short short1 = 256;
 		short short2 = 256;
-		this.func_181536_a((scaledresolution.getScaledWidth() - short1) / 2,
-				(scaledresolution.getScaledHeight() - short2) / 2, 0, 0, short1, short2, 255, 255, 255, 255);
+		this.func_181536_a((scaledResolution.getScaledWidth() - short1) / 2,
+				(scaledResolution.getScaledHeight() - short2) / 2, 0, 0, short1, short2, 255, 255, 255, 255);
 		GlStateManager.disableLighting();
 		GlStateManager.disableFog();
 		GlStateManager.enableAlpha();
@@ -694,18 +734,19 @@ public class Minecraft implements IThreadListener {
 		}
 
 		this.currentScreen = (GuiScreen) guiScreenIn;
+		this.scaledResolution = new ScaledResolution(this);
 		if (guiScreenIn != null) {
 			this.setIngameNotInFocus();
-			ScaledResolution scaledresolution = new ScaledResolution(this);
-			int i = scaledresolution.getScaledWidth();
-			int j = scaledresolution.getScaledHeight();
-			((GuiScreen) guiScreenIn).setWorldAndResolution(this, i, j);
+			((GuiScreen) guiScreenIn).setWorldAndResolution(this, scaledResolution.getScaledWidth(),
+					scaledResolution.getScaledHeight());
 			this.skipRenderWorld = false;
 		} else {
 			this.mcSoundHandler.resumeSounds();
 			this.setIngameFocus();
 		}
-
+		EagRuntime.getConfiguration().getHooks().callScreenChangedHook(
+				currentScreen != null ? currentScreen.getClass().getName() : null, scaledResolution.getScaledWidth(),
+				scaledResolution.getScaledHeight(), displayWidth, displayHeight, scaledResolution.getScaleFactor());
 	}
 
 	public void shutdownIntegratedServer(GuiScreen cont) {
@@ -777,11 +818,13 @@ public class Minecraft implements IThreadListener {
 	 */
 	private void runGameLoop() throws IOException {
 		long i = System.nanoTime();
-		this.mcProfiler.startSection("root");
 		if (Display.isCloseRequested()) {
 			this.shutdown();
 		}
 
+		PointerInputAbstraction.runGameLoop();
+		this.gameSettings.touchscreen = PointerInputAbstraction.isTouchMode();
+
 		if (this.isGamePaused && this.theWorld != null) {
 			float f = this.timer.renderPartialTicks;
 			this.timer.updateTimer();
@@ -790,80 +833,56 @@ public class Minecraft implements IThreadListener {
 			this.timer.updateTimer();
 		}
 
-		this.mcProfiler.startSection("scheduledExecutables");
 		synchronized (this.scheduledTasks) {
 			while (!this.scheduledTasks.isEmpty()) {
 				Util.func_181617_a((FutureTask) this.scheduledTasks.remove(0), logger);
 			}
 		}
 
-		this.mcProfiler.endSection();
 		long l = System.nanoTime();
-		this.mcProfiler.startSection("tick");
 
 		if (this.timer.elapsedTicks > 1) {
-			long watchdog = System.currentTimeMillis();
+			long watchdog = EagRuntime.steadyTimeMillis();
 			for (int j = 0; j < this.timer.elapsedTicks; ++j) {
 				this.runTick();
-				long millis = System.currentTimeMillis();
+				if (j < this.timer.elapsedTicks - 1) {
+					PointerInputAbstraction.runGameLoop();
+				}
+				long millis = EagRuntime.steadyTimeMillis();
 				if (millis - watchdog > 50l) {
 					watchdog = millis;
-					EagUtils.sleep(0l);
+					EagRuntime.immediateContinue();
 				}
 			}
 		} else if (this.timer.elapsedTicks == 1) {
 			this.runTick();
 		}
 
-		this.mcProfiler.endStartSection("preRenderErrors");
 		long i1 = System.nanoTime() - l;
 		this.checkGLError("Pre render");
-		this.mcProfiler.endStartSection("sound");
 		this.mcSoundHandler.setListener(this.thePlayer, this.timer.renderPartialTicks);
-		this.mcProfiler.endSection();
-		this.mcProfiler.startSection("render");
 
 		if (!Display.contextLost()) {
-			this.mcProfiler.startSection("EaglercraftGPU_optimize");
 			EaglercraftGPU.optimize();
-			this.mcProfiler.endSection();
 			_wglBindFramebuffer(0x8D40, null);
 			GlStateManager.viewport(0, 0, this.displayWidth, this.displayHeight);
 			GlStateManager.clearColor(0.0f, 0.0f, 0.0f, 1.0f);
 			GlStateManager.pushMatrix();
 			GlStateManager.clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-			this.mcProfiler.startSection("display");
 			GlStateManager.enableTexture2D();
 			if (this.thePlayer != null && this.thePlayer.isEntityInsideOpaqueBlock()) {
 				this.gameSettings.thirdPersonView = 0;
 			}
 
-			this.mcProfiler.endSection();
 			if (!this.skipRenderWorld) {
-				this.mcProfiler.endStartSection("gameRenderer");
 				this.entityRenderer.func_181560_a(this.timer.renderPartialTicks, i);
-				this.mcProfiler.endSection();
-			}
-
-			this.mcProfiler.endSection();
-			if (this.gameSettings.showDebugInfo && this.gameSettings.showDebugProfilerChart
-					&& !this.gameSettings.hideGUI) {
-				if (!this.mcProfiler.profilingEnabled) {
-					this.mcProfiler.clearProfiling();
-				}
-
-				this.mcProfiler.profilingEnabled = true;
-				this.displayDebugInfo(i1);
-			} else {
-				this.mcProfiler.profilingEnabled = false;
-				this.prevFrameTime = System.nanoTime();
 			}
 
 			this.guiAchievement.updateAchievementWindow();
+			this.touchOverlayRenderer.render(displayWidth, displayHeight, scaledResolution);
 			GlStateManager.popMatrix();
 		}
 
-		this.mcProfiler.startSection("root");
 		this.updateDisplay();
 		this.checkGLError("Post render");
 
@@ -888,34 +907,33 @@ public class Minecraft implements IThreadListener {
 		}
 
 		if (this.isFramerateLimitBelowMax()) {
-			this.mcProfiler.startSection("fpslimit_wait");
 			Display.sync(this.getLimitFramerate());
-			this.mcProfiler.endSection();
 		}
 
 		Mouse.tickCursorShape();
-		this.mcProfiler.endSection();
 	}
 
 	public void updateDisplay() {
-		this.mcProfiler.startSection("display_update");
 		if (Display.isVSyncSupported()) {
 			Display.setVSync(this.gameSettings.enableVsync);
 		} else {
 			this.gameSettings.enableVsync = false;
 		}
 		Display.update();
-		this.mcProfiler.endSection();
 		this.checkWindowResize();
 	}
 
 	protected void checkWindowResize() {
-		if (!this.fullscreen && Display.wasResized()) {
+		float dpiFetch = -1.0f;
+		if (!this.fullscreen
+				&& (Display.wasResized() || (dpiFetch = Math.max(Display.getDPI(), 1.0f)) != this.displayDPI)) {
 			int i = this.displayWidth;
 			int j = this.displayHeight;
+			float f = this.displayDPI;
 			this.displayWidth = Display.getWidth();
 			this.displayHeight = Display.getHeight();
-			if (this.displayWidth != i || this.displayHeight != j) {
+			this.displayDPI = dpiFetch == -1.0f ? Math.max(Display.getDPI(), 1.0f) : dpiFetch;
+			if (this.displayWidth != i || this.displayHeight != j || this.displayDPI != f) {
 				if (this.displayWidth <= 0) {
 					this.displayWidth = 1;
 				}
@@ -938,153 +956,6 @@ public class Minecraft implements IThreadListener {
 		return (float) this.getLimitFramerate() < GameSettings.Options.FRAMERATE_LIMIT.getValueMax();
 	}
 
-	/**+
-	 * Update debugProfilerName in response to number keys in debug
-	 * screen
-	 */
-	private void updateDebugProfilerName(int keyCount) {
-		List list = this.mcProfiler.getProfilingData(this.debugProfilerName);
-		if (list != null && !list.isEmpty()) {
-			Profiler.Result profiler$result = (Profiler.Result) list.remove(0);
-			if (keyCount == 0) {
-				if (profiler$result.field_76331_c.length() > 0) {
-					int i = this.debugProfilerName.lastIndexOf(".");
-					if (i >= 0) {
-						this.debugProfilerName = this.debugProfilerName.substring(0, i);
-					}
-				}
-			} else {
-				--keyCount;
-				if (keyCount < list.size()
-						&& !((Profiler.Result) list.get(keyCount)).field_76331_c.equals("unspecified")) {
-					if (this.debugProfilerName.length() > 0) {
-						this.debugProfilerName = this.debugProfilerName + ".";
-					}
-
-					this.debugProfilerName = this.debugProfilerName
-							+ ((Profiler.Result) list.get(keyCount)).field_76331_c;
-				}
-			}
-
-		}
-	}
-
-	/**+
-	 * Parameter appears to be unused
-	 */
-	private void displayDebugInfo(long elapsedTicksTime) {
-		if (this.mcProfiler.profilingEnabled) {
-			List list = this.mcProfiler.getProfilingData(this.debugProfilerName);
-			Profiler.Result profiler$result = (Profiler.Result) list.remove(0);
-			GlStateManager.clear(GL_DEPTH_BUFFER_BIT);
-			GlStateManager.matrixMode(GL_PROJECTION);
-			GlStateManager.enableColorMaterial();
-			GlStateManager.loadIdentity();
-			GlStateManager.ortho(0.0D, (double) this.displayWidth, (double) this.displayHeight, 0.0D, 1000.0D, 3000.0D);
-			GlStateManager.matrixMode(GL_MODELVIEW);
-			GlStateManager.loadIdentity();
-			GlStateManager.translate(0.0F, 0.0F, -2000.0F);
-			EaglercraftGPU.glLineWidth(1.0F);
-			GlStateManager.disableTexture2D();
-			Tessellator tessellator = Tessellator.getInstance();
-			WorldRenderer worldrenderer = tessellator.getWorldRenderer();
-			short short1 = 160;
-			int i = this.displayWidth - short1 - 10;
-			int j = this.displayHeight - short1 * 2;
-			GlStateManager.enableBlend();
-			worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
-			worldrenderer.pos((double) ((float) i - (float) short1 * 1.1F),
-					(double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
-			worldrenderer.pos((double) ((float) i - (float) short1 * 1.1F), (double) (j + short1 * 2), 0.0D)
-					.color(0, 0, 0, 100).endVertex();
-			worldrenderer.pos((double) ((float) i + (float) short1 * 1.1F), (double) (j + short1 * 2), 0.0D)
-					.color(0, 0, 0, 100).endVertex();
-			worldrenderer.pos((double) ((float) i + (float) short1 * 1.1F),
-					(double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
-			tessellator.draw();
-			GlStateManager.disableBlend();
-			double d0 = 0.0D;
-
-			for (int k = 0; k < list.size(); ++k) {
-				Profiler.Result profiler$result1 = (Profiler.Result) list.get(k);
-				int l = MathHelper.floor_double(profiler$result1.field_76332_a / 4.0D) + 1;
-				worldrenderer.begin(6, DefaultVertexFormats.POSITION_COLOR);
-				int i1 = profiler$result1.func_76329_a();
-				int j1 = i1 >> 16 & 255;
-				int k1 = i1 >> 8 & 255;
-				int l1 = i1 & 255;
-				worldrenderer.pos((double) i, (double) j, 0.0D).color(j1, k1, l1, 255).endVertex();
-
-				for (int i2 = l; i2 >= 0; --i2) {
-					float f = (float) ((d0 + profiler$result1.field_76332_a * (double) i2 / (double) l)
-							* 3.1415927410125732D * 2.0D / 100.0D);
-					float f1 = MathHelper.sin(f) * (float) short1;
-					float f2 = MathHelper.cos(f) * (float) short1 * 0.5F;
-					worldrenderer.pos((double) ((float) i + f1), (double) ((float) j - f2), 0.0D).color(j1, k1, l1, 255)
-							.endVertex();
-				}
-
-				tessellator.draw();
-				worldrenderer.begin(5, DefaultVertexFormats.POSITION_COLOR);
-
-				for (int l2 = l; l2 >= 0; --l2) {
-					float f3 = (float) ((d0 + profiler$result1.field_76332_a * (double) l2 / (double) l)
-							* 3.1415927410125732D * 2.0D / 100.0D);
-					float f4 = MathHelper.sin(f3) * (float) short1;
-					float f5 = MathHelper.cos(f3) * (float) short1 * 0.5F;
-					worldrenderer.pos((double) ((float) i + f4), (double) ((float) j - f5), 0.0D)
-							.color(j1 >> 1, k1 >> 1, l1 >> 1, 255).endVertex();
-					worldrenderer.pos((double) ((float) i + f4), (double) ((float) j - f5 + 10.0F), 0.0D)
-							.color(j1 >> 1, k1 >> 1, l1 >> 1, 255).endVertex();
-				}
-
-				tessellator.draw();
-				d0 += profiler$result1.field_76332_a;
-			}
-
-			DecimalFormat decimalformat = new DecimalFormat("##0.00");
-			GlStateManager.enableTexture2D();
-			String s = "";
-			if (!profiler$result.field_76331_c.equals("unspecified")) {
-				s = s + "[0] ";
-			}
-
-			if (profiler$result.field_76331_c.length() == 0) {
-				s = s + "ROOT ";
-			} else {
-				s = s + profiler$result.field_76331_c + " ";
-			}
-
-			int k2 = 16777215;
-			this.fontRendererObj.drawStringWithShadow(s, (float) (i - short1), (float) (j - short1 / 2 - 16), k2);
-			this.fontRendererObj.drawStringWithShadow(s = decimalformat.format(profiler$result.field_76330_b) + "%",
-					(float) (i + short1 - this.fontRendererObj.getStringWidth(s)), (float) (j - short1 / 2 - 16), k2);
-
-			for (int j2 = 0; j2 < list.size(); ++j2) {
-				Profiler.Result profiler$result2 = (Profiler.Result) list.get(j2);
-				String s1 = "";
-				if (profiler$result2.field_76331_c.equals("unspecified")) {
-					s1 = s1 + "[?] ";
-				} else {
-					s1 = s1 + "[" + (j2 + 1) + "] ";
-				}
-
-				s1 = s1 + profiler$result2.field_76331_c;
-				this.fontRendererObj.drawStringWithShadow(s1, (float) (i - short1),
-						(float) (j + short1 / 2 + j2 * 8 + 20), profiler$result2.func_76329_a());
-				this.fontRendererObj.drawStringWithShadow(
-						s1 = decimalformat.format(profiler$result2.field_76332_a) + "%",
-						(float) (i + short1 - 50 - this.fontRendererObj.getStringWidth(s1)),
-						(float) (j + short1 / 2 + j2 * 8 + 20), profiler$result2.func_76329_a());
-				this.fontRendererObj.drawStringWithShadow(
-						s1 = decimalformat.format(profiler$result2.field_76330_b) + "%",
-						(float) (i + short1 - this.fontRendererObj.getStringWidth(s1)),
-						(float) (j + short1 / 2 + j2 * 8 + 20), profiler$result2.func_76329_a());
-			}
-
-		}
-	}
-
 	/**+
 	 * Called when the window is closing. Sets 'running' to false
 	 * which allows the game loop to exit cleanly.
@@ -1099,10 +970,13 @@ public class Minecraft implements IThreadListener {
 	 * displayed
 	 */
 	public void setIngameFocus() {
-		if (Display.isActive()) {
+		boolean touch = PointerInputAbstraction.isTouchMode();
+		if (touch || Display.isActive()) {
 			if (!this.inGameHasFocus) {
 				this.inGameHasFocus = true;
-				this.mouseHelper.grabMouseCursor();
+				if (!touch && mouseGrabSupported) {
+					this.mouseHelper.grabMouseCursor();
+				}
 				this.displayGuiScreen((GuiScreen) null);
 				this.leftClickCounter = 10000;
 			}
@@ -1117,7 +991,9 @@ public class Minecraft implements IThreadListener {
 		if (this.inGameHasFocus) {
 			KeyBinding.unPressAllKeys();
 			this.inGameHasFocus = false;
-			this.mouseHelper.ungrabMouseCursor();
+			if (!PointerInputAbstraction.isTouchMode() && mouseGrabSupported) {
+				this.mouseHelper.ungrabMouseCursor();
+			}
 		}
 	}
 
@@ -1185,7 +1061,7 @@ public class Minecraft implements IThreadListener {
 	/**+
 	 * Called when user clicked he's mouse right button (place)
 	 */
-	private void rightClickMouse() {
+	public void rightClickMouse() {
 		if (!this.playerController.func_181040_m()) {
 			this.rightClickDelayTimer = 4;
 			boolean flag = true;
@@ -1250,14 +1126,24 @@ public class Minecraft implements IThreadListener {
 	private void resize(int width, int height) {
 		this.displayWidth = Math.max(1, width);
 		this.displayHeight = Math.max(1, height);
-		ScaledResolution scaledresolution = new ScaledResolution(this);
+		this.scaledResolution = new ScaledResolution(this);
 		if (this.currentScreen != null) {
-			this.currentScreen.onResize(this, scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight());
+			this.currentScreen.onResize(this, scaledResolution.getScaledWidth(), scaledResolution.getScaledHeight());
 		}
 
 		this.loadingScreen = new LoadingScreenRenderer(this);
 
-		this.voiceOverlay.setResolution(scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight());
+		if (voiceOverlay != null) {
+			voiceOverlay.setResolution(scaledResolution.getScaledWidth(), scaledResolution.getScaledHeight());
+		}
+		if (notifRenderer != null) {
+			notifRenderer.setResolution(this, scaledResolution.getScaledWidth(), scaledResolution.getScaledHeight(),
+					scaledResolution.getScaleFactor());
+		}
+
+		EagRuntime.getConfiguration().getHooks().callScreenChangedHook(
+				currentScreen != null ? currentScreen.getClass().getName() : null, scaledResolution.getScaledWidth(),
+				scaledResolution.getScaledHeight(), displayWidth, displayHeight, scaledResolution.getScaleFactor());
 	}
 
 	public MusicTicker func_181535_r() {
@@ -1288,28 +1174,48 @@ public class Minecraft implements IThreadListener {
 			wasPaused = isGamePaused;
 		}
 
+		PlatformWebRTC.runScheduledTasks();
+		WebViewOverlayController.runTick();
 		SingleplayerServerController.runTick();
 		RelayUpdateChecker.runTick();
 
-		this.mcProfiler.startSection("gui");
+		UpdateResultObj update = UpdateService.getUpdateResult();
+		if (update != null) {
+			if (update.isSuccess()) {
+				UpdateDataObj updateSuccess = update.getSuccess();
+				if (EagRuntime.getConfiguration().isAllowBootMenu()) {
+					if (currentScreen == null || (!(currentScreen instanceof GuiUpdateDownloadSuccess)
+							&& !(currentScreen instanceof GuiUpdateInstallOptions))) {
+						displayGuiScreen(new GuiUpdateDownloadSuccess(currentScreen, updateSuccess));
+					}
+				} else {
+					UpdateService.quine(updateSuccess.clientSignature, updateSuccess.clientBundle);
+				}
+			} else {
+				displayGuiScreen(
+						new GuiScreenGenericErrorMessage("updateFailed.title", update.getFailure(), currentScreen));
+			}
+		}
+
 		if (!this.isGamePaused) {
 			this.ingameGUI.updateTick();
 		}
 
-		this.mcProfiler.endStartSection("eaglerVoice");
 		VoiceClientController.tickVoiceClient(this);
 
-		this.mcProfiler.endSection();
 		this.entityRenderer.getMouseOver(1.0F);
-		this.mcProfiler.startSection("gameMode");
 		if (!this.isGamePaused && this.theWorld != null) {
 			this.playerController.updateController();
 		}
 
-		this.mcProfiler.endStartSection("textures");
+		if (this.thePlayer != null && this.thePlayer.sendQueue != null) {
+			this.thePlayer.sendQueue.getEaglerMessageController().flush();
+		}
+
 		if (!this.isGamePaused) {
 			this.renderEngine.tick();
 			GlStateManager.viewport(0, 0, displayWidth, displayHeight); // to be safe
+			GlStateManager.enableAlpha();
 		}
 
 		if (this.currentScreen == null && this.thePlayer != null) {
@@ -1318,7 +1224,7 @@ public class Minecraft implements IThreadListener {
 			} else if (this.thePlayer.isPlayerSleeping() && this.theWorld != null) {
 				this.displayGuiScreen(new GuiSleepMP());
 			}
-			if (this.currentScreen == null && this.dontPauseTimer <= 0) {
+			if (this.currentScreen == null && this.dontPauseTimer <= 0 && !PointerInputAbstraction.isTouchMode()) {
 				if (!Mouse.isMouseGrabbed()) {
 					this.setIngameNotInFocus();
 					this.displayInGameMenu();
@@ -1338,6 +1244,13 @@ public class Minecraft implements IThreadListener {
 			}
 		}
 
+		String pastedStr;
+		while ((pastedStr = Touch.getPastedString()) != null) {
+			if (this.currentScreen != null) {
+				this.currentScreen.fireInputEvent(EnumInputEvent.CLIPBOARD_PASTE, pastedStr);
+			}
+		}
+
 		if (this.currentScreen != null) {
 			try {
 				this.currentScreen.handleInput();
@@ -1369,46 +1282,100 @@ public class Minecraft implements IThreadListener {
 		}
 
 		if (this.currentScreen == null || this.currentScreen.allowUserInput) {
-			this.mcProfiler.endStartSection("mouse");
 
-			while (Mouse.next()) {
-				int i = Mouse.getEventButton();
-				KeyBinding.setKeyBindState(i - 100, Mouse.getEventButtonState());
-				if (Mouse.getEventButtonState()) {
-					if (this.thePlayer.isSpectator() && i == 2) {
-						this.ingameGUI.getSpectatorGui().func_175261_b();
+			boolean touched;
+			boolean moused = false;
+
+			while ((touched = Touch.next()) || (moused = Mouse.next())) {
+				boolean touch = false;
+				if (touched) {
+					PointerInputAbstraction.enterTouchModeHook();
+					boolean mouse = moused;
+					moused = false;
+					int tc = Touch.getEventTouchPointCount();
+					if (tc > 0) {
+						for (int i = 0; i < tc; ++i) {
+							final int uid = Touch.getEventTouchPointUID(i);
+							int x = Touch.getEventTouchX(i);
+							int y = Touch.getEventTouchY(i);
+							switch (Touch.getEventType()) {
+							case TOUCHSTART:
+								if (TouchControls.handleTouchBegin(uid, x, y)) {
+									break;
+								}
+								touch = true;
+								handlePlaceTouchStart();
+								break;
+							case TOUCHEND:
+								if (TouchControls.handleTouchEnd(uid, x, y)) {
+									touch = true;
+									break;
+								}
+								handlePlaceTouchEnd();
+								break;
+							default:
+								break;
+							}
+						}
+						TouchControls.handleInput();
+						if (!touch) {
+							continue;
+						}
 					} else {
-						KeyBinding.onTick(i - 100);
+						if (!mouse) {
+							continue;
+						}
+					}
+				}
+
+				if (!touch) {
+					int i = Mouse.getEventButton();
+					KeyBinding.setKeyBindState(i - 100, Mouse.getEventButtonState());
+					if (Mouse.getEventButtonState()) {
+						PointerInputAbstraction.enterMouseModeHook();
+						if (this.thePlayer.isSpectator() && i == 2) {
+							this.ingameGUI.getSpectatorGui().func_175261_b();
+						} else {
+							KeyBinding.onTick(i - 100);
+						}
 					}
 				}
 
 				long i1 = getSystemTime() - this.systemTime;
 				if (i1 <= 200L) {
-					int j = Mouse.getEventDWheel();
-					if (j != 0) {
-						if (this.isZoomKey) {
-							this.adjustedZoomValue = MathHelper.clamp_float(adjustedZoomValue - j * 4.0f, 5.0f, 32.0f);
-						} else if (this.thePlayer.isSpectator()) {
-							j = j < 0 ? -1 : 1;
-							if (this.ingameGUI.getSpectatorGui().func_175262_a()) {
-								this.ingameGUI.getSpectatorGui().func_175259_b(-j);
+					if (!touch) {
+						int j = Mouse.getEventDWheel();
+						if (j != 0) {
+							if (this.isZoomKey) {
+								this.adjustedZoomValue = MathHelper.clamp_float(adjustedZoomValue - j * 4.0f, 5.0f,
+										32.0f);
+							} else if (this.thePlayer.isSpectator()) {
+								j = j < 0 ? -1 : 1;
+								if (this.ingameGUI.getSpectatorGui().func_175262_a()) {
+									this.ingameGUI.getSpectatorGui().func_175259_b(-j);
+								} else {
+									float f = MathHelper.clamp_float(
+											this.thePlayer.capabilities.getFlySpeed() + (float) j * 0.005F, 0.0F, 0.2F);
+									this.thePlayer.capabilities.setFlySpeed(f);
+								}
 							} else {
-								float f = MathHelper.clamp_float(
-										this.thePlayer.capabilities.getFlySpeed() + (float) j * 0.005F, 0.0F, 0.2F);
-								this.thePlayer.capabilities.setFlySpeed(f);
+								this.thePlayer.inventory.changeCurrentItem(j);
 							}
-						} else {
-							this.thePlayer.inventory.changeCurrentItem(j);
 						}
 					}
 
 					if (this.currentScreen == null) {
-						if ((!this.inGameHasFocus || !Mouse.isActuallyGrabbed()) && Mouse.getEventButtonState()) {
+						if ((!this.inGameHasFocus || !(touch || Mouse.isActuallyGrabbed()))
+								&& (touch || Mouse.getEventButtonState())) {
 							this.inGameHasFocus = false;
 							this.setIngameFocus();
 						}
 					} else if (this.currentScreen != null) {
-						this.currentScreen.handleMouseInput();
+						if (touch) {
+							this.currentScreen.handleTouchInput();
+						} else {
+							this.currentScreen.handleMouseInput();
+						}
 					}
 				}
 			}
@@ -1417,7 +1384,7 @@ public class Minecraft implements IThreadListener {
 				--this.leftClickCounter;
 			}
 
-			this.mcProfiler.endStartSection("keyboard");
+			processTouchMine();
 
 			while (Keyboard.next()) {
 				int k = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() + 256 : Keyboard.getEventKey();
@@ -1534,36 +1501,13 @@ public class Minecraft implements IThreadListener {
 						}
 
 						if (this.gameSettings.keyBindTogglePerspective.isPressed()) {
-							++this.gameSettings.thirdPersonView;
-							if (this.gameSettings.thirdPersonView > 2) {
-								this.gameSettings.thirdPersonView = 0;
-							}
-
-							if (this.gameSettings.thirdPersonView == 0) {
-								this.entityRenderer.loadEntityShader(this.getRenderViewEntity());
-							} else if (this.gameSettings.thirdPersonView == 1) {
-								this.entityRenderer.loadEntityShader((Entity) null);
-							}
-
-							this.renderGlobal.setDisplayListEntitiesDirty();
+							togglePerspective();
 						}
 
 						if (this.gameSettings.keyBindSmoothCamera.isPressed()) {
 							this.gameSettings.smoothCamera = !this.gameSettings.smoothCamera;
 						}
 					}
-
-					if (this.gameSettings.showDebugInfo && this.gameSettings.showDebugProfilerChart) {
-						if (k == 11) {
-							this.updateDebugProfilerName(0);
-						}
-
-						for (int j1 = 0; j1 < 9; ++j1) {
-							if (k == 2 + j1) {
-								this.updateDebugProfilerName(j1 + 1);
-							}
-						}
-					}
 				}
 			}
 
@@ -1609,8 +1553,10 @@ public class Minecraft implements IThreadListener {
 				this.displayGuiScreen(new GuiChat("/"));
 			}
 
+			boolean miningTouch = isMiningTouch();
+			boolean useTouch = thePlayer.getItemShouldUseOnTouchEagler();
 			if (this.thePlayer.isUsingItem()) {
-				if (!this.gameSettings.keyBindUseItem.isKeyDown()) {
+				if (!this.gameSettings.keyBindUseItem.isKeyDown() && !miningTouch) {
 					this.playerController.onStoppedUsingItem(this.thePlayer);
 				}
 
@@ -1630,6 +1576,15 @@ public class Minecraft implements IThreadListener {
 					this.clickMouse();
 				}
 
+				if (miningTouch && !wasMiningTouch) {
+					if ((objectMouseOver != null && objectMouseOver.typeOfHit == MovingObjectType.ENTITY) || useTouch) {
+						this.rightClickMouse();
+					} else {
+						this.clickMouse();
+					}
+					wasMiningTouch = true;
+				}
+
 				while (this.gameSettings.keyBindUseItem.isPressed()) {
 					this.rightClickMouse();
 				}
@@ -1638,14 +1593,20 @@ public class Minecraft implements IThreadListener {
 					this.middleClickMouse();
 				}
 			}
+			wasMiningTouch = miningTouch;
 
 			if (this.gameSettings.keyBindUseItem.isKeyDown() && this.rightClickDelayTimer == 0
 					&& !this.thePlayer.isUsingItem()) {
 				this.rightClickMouse();
 			}
 
+			if (miningTouch && useTouch && this.rightClickDelayTimer == 0 && !this.thePlayer.isUsingItem()) {
+				this.rightClickMouse();
+			}
+
 			this.sendClickBlockToController(
-					this.currentScreen == null && this.gameSettings.keyBindAttack.isKeyDown() && this.inGameHasFocus);
+					this.currentScreen == null && (this.gameSettings.keyBindAttack.isKeyDown() || miningTouch)
+							&& this.inGameHasFocus && !useTouch);
 		}
 
 		if (this.theWorld != null) {
@@ -1657,17 +1618,14 @@ public class Minecraft implements IThreadListener {
 				}
 			}
 
-			this.mcProfiler.endStartSection("gameRenderer");
 			if (!this.isGamePaused) {
 				this.entityRenderer.updateRenderer();
 			}
 
-			this.mcProfiler.endStartSection("levelRenderer");
 			if (!this.isGamePaused) {
 				this.renderGlobal.updateClouds();
 			}
 
-			this.mcProfiler.endStartSection("level");
 			if (!this.isGamePaused) {
 				if (this.theWorld.getLastLightningBolt() > 0) {
 					this.theWorld.setLastLightningBolt(this.theWorld.getLastLightningBolt() - 1);
@@ -1704,18 +1662,15 @@ public class Minecraft implements IThreadListener {
 				}
 			}
 
-			this.mcProfiler.endStartSection("animateTick");
 			if (!this.isGamePaused && this.theWorld != null) {
 				this.theWorld.doVoidFogParticles(MathHelper.floor_double(this.thePlayer.posX),
 						MathHelper.floor_double(this.thePlayer.posY), MathHelper.floor_double(this.thePlayer.posZ));
 			}
 
-			this.mcProfiler.endStartSection("particles");
 			if (!this.isGamePaused) {
 				this.effectRenderer.updateEffects();
 			}
 		} else if (this.myNetworkManager != null) {
-			this.mcProfiler.endStartSection("pendingConnection");
 			this.myNetworkManager.processReceivedPackets();
 		}
 
@@ -1761,19 +1716,118 @@ public class Minecraft implements IThreadListener {
 							"singleplayer.failed.stoppingIntegratedServer", SingleplayerServerController::isReady));
 				}
 			}
+			TouchControls.resetSneak();
+		}
+
+		if (reconnectURI != null) {
+			String reconURI = reconnectURI;
+			reconnectURI = null;
+			if (EagRuntime.getConfiguration().isAllowServerRedirects()) {
+				boolean enableCookies;
+				boolean msg;
+				if (this.currentServerData != null) {
+					enableCookies = this.currentServerData.enableCookies;
+					msg = false;
+				} else {
+					enableCookies = EagRuntime.getConfiguration().isEnableServerCookies();
+					msg = true;
+				}
+				if (theWorld != null) {
+					theWorld.sendQuittingDisconnectingPacket();
+					loadWorld(null);
+				}
+				logger.info("Recieved SPacketRedirectClientV4EAG, reconnecting to: {}", reconURI);
+				if (msg) {
+					logger.warn("No existing server connection, cookies will default to {}!",
+							enableCookies ? "enabled" : "disabled");
+				}
+				ServerAddress addr = AddressResolver.resolveAddressFromURI(reconURI);
+				this.displayGuiScreen(
+						new GuiConnecting(new GuiMainMenu(), this, addr.getIP(), addr.getPort(), enableCookies));
+			} else {
+				logger.warn("Server redirect blocked: {}", reconURI);
+			}
 		}
 
-		this.mcProfiler.endSection();
 		this.systemTime = getSystemTime();
 	}
 
+	private long placeTouchStartTime = -1l;
+	private long mineTouchStartTime = -1l;
+	private boolean wasMiningTouch = false;
+
+	private void processTouchMine() {
+		if ((currentScreen == null || currentScreen.allowUserInput)
+				&& PointerInputAbstraction.isTouchingScreenNotButton()) {
+			if (PointerInputAbstraction.isDraggingNotTouching()) {
+				if (mineTouchStartTime != -1l) {
+					long l = EagRuntime.steadyTimeMillis();
+					if ((placeTouchStartTime == -1l || (l - placeTouchStartTime) < 350l)
+							|| (l - mineTouchStartTime) < 350l) {
+						mineTouchStartTime = -1l;
+					}
+				}
+			} else {
+				if (mineTouchStartTime == -1l) {
+					mineTouchStartTime = EagRuntime.steadyTimeMillis();
+				}
+			}
+		} else {
+			mineTouchStartTime = -1l;
+		}
+	}
+
+	private boolean isMiningTouch() {
+		if (mineTouchStartTime == -1l)
+			return false;
+		long l = EagRuntime.steadyTimeMillis();
+		return (placeTouchStartTime == -1l || (l - placeTouchStartTime) >= 350l) && (l - mineTouchStartTime) >= 350l;
+	}
+
+	private void handlePlaceTouchStart() {
+		if (placeTouchStartTime == -1l) {
+			placeTouchStartTime = EagRuntime.steadyTimeMillis();
+		}
+	}
+
+	private void handlePlaceTouchEnd() {
+		if (placeTouchStartTime != -1l) {
+			int len = (int) (EagRuntime.steadyTimeMillis() - placeTouchStartTime);
+			if (len < 350l && !PointerInputAbstraction.isDraggingNotTouching()) {
+				if (objectMouseOver != null && objectMouseOver.typeOfHit == MovingObjectType.ENTITY) {
+					clickMouse();
+				} else {
+					rightClickMouse();
+				}
+			}
+			placeTouchStartTime = -1l;
+		}
+	}
+
+	public void togglePerspective() {
+		++this.gameSettings.thirdPersonView;
+		if (this.gameSettings.thirdPersonView > 2) {
+			this.gameSettings.thirdPersonView = 0;
+		}
+
+		if (this.gameSettings.thirdPersonView == 0) {
+			this.entityRenderer.loadEntityShader(this.getRenderViewEntity());
+		} else if (this.gameSettings.thirdPersonView == 1) {
+			this.entityRenderer.loadEntityShader((Entity) null);
+		}
+
+		this.renderGlobal.setDisplayListEntitiesDirty();
+	}
+
 	/**+
 	 * Arguments: World foldername, World ingame name, WorldSettings
 	 */
 	public void launchIntegratedServer(String folderName, String worldName, WorldSettings worldSettingsIn) {
 		this.loadWorld((WorldClient) null);
-		Minecraft.getMinecraft().getRenderManager().setEnableFNAWSkins(this.gameSettings.enableFNAWSkins);
+		renderManager.setEnableFNAWSkins(this.gameSettings.enableFNAWSkins);
 		session.reset();
+		EaglerProfile.clearServerSkinOverride();
+		PauseMenuCustomizeState.reset();
 		SingleplayerServerController.launchEaglercraftServer(folderName, gameSettings.difficulty.getDifficultyId(),
 				Math.max(gameSettings.renderDistanceChunks, 2), worldSettingsIn);
 		EagRuntime.setMCServerWindowGlobal("singleplayer");
@@ -1803,6 +1857,10 @@ public class Minecraft implements IThreadListener {
 				nethandlerplayclient.cleanup();
 			}
 			session.reset();
+			EaglerProfile.clearServerSkinOverride();
+			PauseMenuCustomizeState.reset();
+			ClientUUIDLoadingCache.flushRequestCache();
+			WebViewOverlayController.setPacketSendCallback(null);
 
 			this.guiAchievement.clearAchievements();
 			this.entityRenderer.getMapItemRenderer().clearLoadedMaps();
@@ -1915,7 +1973,7 @@ public class Minecraft implements IThreadListener {
 	 * Called when user clicked he's mouse middle button (pick
 	 * block)
 	 */
-	private void middleClickMouse() {
+	public void middleClickMouse() {
 		if (this.objectMouseOver != null) {
 			boolean flag = this.thePlayer.capabilities.isCreativeMode;
 			int i = 0;
@@ -2072,6 +2130,46 @@ public class Minecraft implements IThreadListener {
 				return GlStateManager.isExtensionPipeline() ? "Yes" : "No";
 			}
 		});
+		theCrash.getCategory().addCrashSectionCallable("GPU Shader5 Capable", new Callable<String>() {
+			public String call() throws Exception {
+				return EaglercraftGPU.checkShader5Capable() ? "Yes" : "No";
+			}
+		});
+		theCrash.getCategory().addCrashSectionCallable("GPU TexStorage Capable", new Callable<String>() {
+			public String call() throws Exception {
+				return EaglercraftGPU.checkTexStorageCapable() ? "Yes" : "No";
+			}
+		});
+		theCrash.getCategory().addCrashSectionCallable("GPU TextureLOD Capable", new Callable<String>() {
+			public String call() throws Exception {
+				return EaglercraftGPU.checkTextureLODCapable() ? "Yes" : "No";
+			}
+		});
+		theCrash.getCategory().addCrashSectionCallable("GPU Instancing Capable", new Callable<String>() {
+			public String call() throws Exception {
+				return EaglercraftGPU.checkInstancingCapable() ? "Yes" : "No";
+			}
+		});
+		theCrash.getCategory().addCrashSectionCallable("GPU VAO Capable", new Callable<String>() {
+			public String call() throws Exception {
+				return EaglercraftGPU.checkVAOCapable() ? "Yes" : "No";
+			}
+		});
+		theCrash.getCategory().addCrashSectionCallable("Is Software VAOs", new Callable<String>() {
+			public String call() throws Exception {
+				return EaglercraftGPU.areVAOsEmulated() ? "Yes" : "No";
+			}
+		});
+		theCrash.getCategory().addCrashSectionCallable("GPU Render-to-MipMap", new Callable<String>() {
+			public String call() throws Exception {
+				return EaglercraftGPU.checkFBORenderMipmapCapable() ? "Yes" : "No";
+			}
+		});
+		theCrash.getCategory().addCrashSectionCallable("Touch Mode", new Callable<String>() {
+			public String call() throws Exception {
+				return PointerInputAbstraction.isTouchMode() ? "Yes" : "No";
+			}
+		});
 		theCrash.getCategory().addCrashSectionCallable("Is Modded", new Callable<String>() {
 			public String call() throws Exception {
 				return "Definitely Not; You're an eagler";
@@ -2107,8 +2205,7 @@ public class Minecraft implements IThreadListener {
 		});
 		theCrash.getCategory().addCrashSectionCallable("Profiler Position", new Callable<String>() {
 			public String call() throws Exception {
-				return Minecraft.this.mcProfiler.profilingEnabled ? Minecraft.this.mcProfiler.getNameOfLastSection()
-						: "N/A (disabled)";
+				return "N/A (disabled)";
 			}
 		});
 		if (this.theWorld != null) {
@@ -2178,7 +2275,7 @@ public class Minecraft implements IThreadListener {
 	 * Gets the system time in milliseconds.
 	 */
 	public static long getSystemTime() {
-		return System.currentTimeMillis();
+		return EagRuntime.steadyTimeMillis();
 	}
 
 	/**+
@@ -2338,8 +2435,21 @@ public class Minecraft implements IThreadListener {
 	public boolean getEnableFNAWSkins() {
 		boolean ret = this.gameSettings.enableFNAWSkins;
 		if (this.thePlayer != null) {
-			ret &= this.thePlayer.sendQueue.currentFNAWSkinAllowedState;
+			if (this.thePlayer.sendQueue.currentFNAWSkinForcedState) {
+				ret = true;
+			} else {
+				ret &= this.thePlayer.sendQueue.currentFNAWSkinAllowedState;
+			}
 		}
 		return ret;
 	}
+
+	public void handleReconnectPacket(String redirectURI) {
+		this.reconnectURI = redirectURI;
+	}
+
+	public boolean isEnableProfanityFilter() {
+		return EagRuntime.getConfiguration().isForceProfanityFilter() || gameSettings.enableProfanityFilter;
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/audio/GuardianSound.java b/src/game/java/net/minecraft/client/audio/GuardianSound.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/GuardianSound.java
rename to src/game/java/net/minecraft/client/audio/GuardianSound.java
diff --git a/src/main/java/net/minecraft/client/audio/ISound.java b/src/game/java/net/minecraft/client/audio/ISound.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/ISound.java
rename to src/game/java/net/minecraft/client/audio/ISound.java
diff --git a/src/main/java/net/minecraft/client/audio/ISoundEventAccessor.java b/src/game/java/net/minecraft/client/audio/ISoundEventAccessor.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/ISoundEventAccessor.java
rename to src/game/java/net/minecraft/client/audio/ISoundEventAccessor.java
diff --git a/src/main/java/net/minecraft/client/audio/ITickableSound.java b/src/game/java/net/minecraft/client/audio/ITickableSound.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/ITickableSound.java
rename to src/game/java/net/minecraft/client/audio/ITickableSound.java
diff --git a/src/main/java/net/minecraft/client/audio/MovingSound.java b/src/game/java/net/minecraft/client/audio/MovingSound.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/MovingSound.java
rename to src/game/java/net/minecraft/client/audio/MovingSound.java
diff --git a/src/main/java/net/minecraft/client/audio/MovingSoundMinecart.java b/src/game/java/net/minecraft/client/audio/MovingSoundMinecart.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/MovingSoundMinecart.java
rename to src/game/java/net/minecraft/client/audio/MovingSoundMinecart.java
diff --git a/src/main/java/net/minecraft/client/audio/MovingSoundMinecartRiding.java b/src/game/java/net/minecraft/client/audio/MovingSoundMinecartRiding.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/MovingSoundMinecartRiding.java
rename to src/game/java/net/minecraft/client/audio/MovingSoundMinecartRiding.java
diff --git a/src/main/java/net/minecraft/client/audio/MusicTicker.java b/src/game/java/net/minecraft/client/audio/MusicTicker.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/MusicTicker.java
rename to src/game/java/net/minecraft/client/audio/MusicTicker.java
diff --git a/src/main/java/net/minecraft/client/audio/PositionedSound.java b/src/game/java/net/minecraft/client/audio/PositionedSound.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/PositionedSound.java
rename to src/game/java/net/minecraft/client/audio/PositionedSound.java
diff --git a/src/main/java/net/minecraft/client/audio/PositionedSoundRecord.java b/src/game/java/net/minecraft/client/audio/PositionedSoundRecord.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/PositionedSoundRecord.java
rename to src/game/java/net/minecraft/client/audio/PositionedSoundRecord.java
diff --git a/src/main/java/net/minecraft/client/audio/SoundCategory.java b/src/game/java/net/minecraft/client/audio/SoundCategory.java
similarity index 95%
rename from src/main/java/net/minecraft/client/audio/SoundCategory.java
rename to src/game/java/net/minecraft/client/audio/SoundCategory.java
index 7bebd72..d9e22be 100755
--- a/src/main/java/net/minecraft/client/audio/SoundCategory.java
+++ b/src/game/java/net/minecraft/client/audio/SoundCategory.java
@@ -26,7 +26,7 @@ import com.google.common.collect.Maps;
  */
 public enum SoundCategory {
 	MASTER("master", 0), MUSIC("music", 1), RECORDS("record", 2), WEATHER("weather", 3), BLOCKS("block", 4),
-	MOBS("hostile", 5), ANIMALS("neutral", 6), PLAYERS("player", 7), AMBIENT("ambient", 8), VOICE("voice", 9);
+	MOBS("hostile", 5), ANIMALS("neutral", 6), PLAYERS("player", 7), AMBIENT("ambient", 8);
 
 	public static final SoundCategory[] _VALUES = values();
 
diff --git a/src/main/java/net/minecraft/client/audio/SoundEventAccessor.java b/src/game/java/net/minecraft/client/audio/SoundEventAccessor.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/SoundEventAccessor.java
rename to src/game/java/net/minecraft/client/audio/SoundEventAccessor.java
diff --git a/src/main/java/net/minecraft/client/audio/SoundEventAccessorComposite.java b/src/game/java/net/minecraft/client/audio/SoundEventAccessorComposite.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/SoundEventAccessorComposite.java
rename to src/game/java/net/minecraft/client/audio/SoundEventAccessorComposite.java
diff --git a/src/main/java/net/minecraft/client/audio/SoundHandler.java b/src/game/java/net/minecraft/client/audio/SoundHandler.java
similarity index 95%
rename from src/main/java/net/minecraft/client/audio/SoundHandler.java
rename to src/game/java/net/minecraft/client/audio/SoundHandler.java
index 0da27e5..445b9d3 100755
--- a/src/main/java/net/minecraft/client/audio/SoundHandler.java
+++ b/src/game/java/net/minecraft/client/audio/SoundHandler.java
@@ -9,8 +9,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformAudio;
-
 import com.google.common.collect.Lists;
 
 import net.lax1dude.eaglercraft.v1_8.EaglercraftSoundManager;
@@ -238,10 +236,6 @@ public class SoundHandler implements IResourceManagerReloadListener, ITickable {
 			this.stopSounds();
 		}
 
-		if (category == SoundCategory.VOICE) {
-			PlatformAudio.setMicVol(volume);
-		}
-
 		this.sndManager.setSoundCategoryVolume(category, volume);
 	}
 
diff --git a/src/main/java/net/minecraft/client/audio/SoundList.java b/src/game/java/net/minecraft/client/audio/SoundList.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/SoundList.java
rename to src/game/java/net/minecraft/client/audio/SoundList.java
diff --git a/src/main/java/net/minecraft/client/audio/SoundListSerializer.java b/src/game/java/net/minecraft/client/audio/SoundListSerializer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/SoundListSerializer.java
rename to src/game/java/net/minecraft/client/audio/SoundListSerializer.java
diff --git a/src/main/java/net/minecraft/client/audio/SoundPoolEntry.java b/src/game/java/net/minecraft/client/audio/SoundPoolEntry.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/SoundPoolEntry.java
rename to src/game/java/net/minecraft/client/audio/SoundPoolEntry.java
diff --git a/src/main/java/net/minecraft/client/audio/SoundRegistry.java b/src/game/java/net/minecraft/client/audio/SoundRegistry.java
similarity index 100%
rename from src/main/java/net/minecraft/client/audio/SoundRegistry.java
rename to src/game/java/net/minecraft/client/audio/SoundRegistry.java
diff --git a/src/main/java/net/minecraft/client/entity/AbstractClientPlayer.java b/src/game/java/net/minecraft/client/entity/AbstractClientPlayer.java
similarity index 75%
rename from src/main/java/net/minecraft/client/entity/AbstractClientPlayer.java
rename to src/game/java/net/minecraft/client/entity/AbstractClientPlayer.java
index 5b212b4..4259135 100755
--- a/src/main/java/net/minecraft/client/entity/AbstractClientPlayer.java
+++ b/src/game/java/net/minecraft/client/entity/AbstractClientPlayer.java
@@ -1,6 +1,9 @@
 package net.minecraft.client.entity;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
+import net.lax1dude.eaglercraft.v1_8.profanity_filter.ProfanityFilter;
 import net.lax1dude.eaglercraft.v1_8.profile.SkinModel;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetworkPlayerInfo;
@@ -8,7 +11,11 @@ import net.minecraft.client.resources.DefaultPlayerSkin;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.IAttributeInstance;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.event.ClickEvent;
 import net.minecraft.init.Items;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldSettings;
@@ -36,13 +43,15 @@ import net.minecraft.world.WorldSettings;
 public abstract class AbstractClientPlayer extends EntityPlayer {
 	private NetworkPlayerInfo playerInfo;
 
-	public long eaglerHighPolyAnimationTick = System.currentTimeMillis();
+	public long eaglerHighPolyAnimationTick = EagRuntime.steadyTimeMillis();
 	public float eaglerHighPolyAnimationFloat1 = 0.0f;
 	public float eaglerHighPolyAnimationFloat2 = 0.0f;
 	public float eaglerHighPolyAnimationFloat3 = 0.0f;
 	public float eaglerHighPolyAnimationFloat4 = 0.0f;
 	public float eaglerHighPolyAnimationFloat5 = 0.0f;
 	public float eaglerHighPolyAnimationFloat6 = 0.0f;
+	public EaglercraftUUID clientBrandUUIDCache = null;
+	private String nameProfanityFilter = null;
 
 	public AbstractClientPlayer(World worldIn, GameProfile playerProfile) {
 		super(worldIn, playerProfile);
@@ -133,4 +142,26 @@ public abstract class AbstractClientPlayer extends EntityPlayer {
 
 		return f;
 	}
+
+	public String getNameProfanityFilter() {
+		if (Minecraft.getMinecraft().isEnableProfanityFilter()) {
+			if (nameProfanityFilter == null) {
+				nameProfanityFilter = ProfanityFilter.getInstance()
+						.profanityFilterString(this.getGameProfile().getName());
+			}
+			return nameProfanityFilter;
+		} else {
+			return this.getGameProfile().getName();
+		}
+	}
+
+	public IChatComponent getDisplayNameProfanityFilter() {
+		ChatComponentText chatcomponenttext = new ChatComponentText(
+				ScorePlayerTeam.formatPlayerName(this.getTeam(), this.getNameProfanityFilter()));
+		chatcomponenttext.getChatStyle()
+				.setChatClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/msg " + this.getName() + " "));
+		chatcomponenttext.getChatStyle().setChatHoverEvent(this.getHoverEvent());
+		chatcomponenttext.getChatStyle().setInsertion(this.getName());
+		return chatcomponenttext;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/entity/EntityOtherPlayerMP.java b/src/game/java/net/minecraft/client/entity/EntityOtherPlayerMP.java
similarity index 100%
rename from src/main/java/net/minecraft/client/entity/EntityOtherPlayerMP.java
rename to src/game/java/net/minecraft/client/entity/EntityOtherPlayerMP.java
diff --git a/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java b/src/game/java/net/minecraft/client/entity/EntityPlayerSP.java
similarity index 96%
rename from src/main/java/net/minecraft/client/entity/EntityPlayerSP.java
rename to src/game/java/net/minecraft/client/entity/EntityPlayerSP.java
index 8810db5..9e8f30b 100755
--- a/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java
+++ b/src/game/java/net/minecraft/client/entity/EntityPlayerSP.java
@@ -1,5 +1,6 @@
 package net.minecraft.client.entity;
 
+import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANClientNetworkManager;
 import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkManager;
 import net.minecraft.client.Minecraft;
@@ -102,6 +103,7 @@ public class EntityPlayerSP extends AbstractClientPlayer {
 
 	public EntityPlayerSP(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandler, StatFileWriter statWriter) {
 		super(worldIn, netHandler.getGameProfile());
+		this.clientBrandUUIDCache = EaglercraftVersion.clientBrandUUID;
 		this.sendQueue = netHandler;
 		this.mc = mcIn;
 		this.dimension = 0;
diff --git a/src/main/java/net/minecraft/client/gui/ChatLine.java b/src/game/java/net/minecraft/client/gui/ChatLine.java
similarity index 77%
rename from src/main/java/net/minecraft/client/gui/ChatLine.java
rename to src/game/java/net/minecraft/client/gui/ChatLine.java
index a2e9fad..1bd8e16 100755
--- a/src/main/java/net/minecraft/client/gui/ChatLine.java
+++ b/src/game/java/net/minecraft/client/gui/ChatLine.java
@@ -1,5 +1,7 @@
 package net.minecraft.client.gui;
 
+import net.lax1dude.eaglercraft.v1_8.profanity_filter.ProfanityFilter;
+import net.minecraft.client.Minecraft;
 import net.minecraft.util.IChatComponent;
 
 /**+
@@ -25,6 +27,7 @@ import net.minecraft.util.IChatComponent;
 public class ChatLine {
 	private final int updateCounterCreated;
 	private final IChatComponent lineString;
+	private IChatComponent lineStringProfanityFilter;
 	private final int chatLineID;
 
 	public ChatLine(int parInt1, IChatComponent parIChatComponent, int parInt2) {
@@ -34,7 +37,14 @@ public class ChatLine {
 	}
 
 	public IChatComponent getChatComponent() {
-		return this.lineString;
+		if (Minecraft.getMinecraft().isEnableProfanityFilter()) {
+			if (lineStringProfanityFilter == null) {
+				lineStringProfanityFilter = ProfanityFilter.getInstance().profanityFilterChatComponent(lineString);
+			}
+			return lineStringProfanityFilter;
+		} else {
+			return lineString;
+		}
 	}
 
 	public int getUpdatedCounter() {
diff --git a/src/main/java/net/minecraft/client/gui/FontRenderer.java b/src/game/java/net/minecraft/client/gui/FontRenderer.java
similarity index 78%
rename from src/main/java/net/minecraft/client/gui/FontRenderer.java
rename to src/game/java/net/minecraft/client/gui/FontRenderer.java
index 6da85c2..7ec37e2 100755
--- a/src/main/java/net/minecraft/client/gui/FontRenderer.java
+++ b/src/game/java/net/minecraft/client/gui/FontRenderer.java
@@ -8,6 +8,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
 import net.lax1dude.eaglercraft.v1_8.HString;
 import net.lax1dude.eaglercraft.v1_8.IOUtils;
+import net.lax1dude.eaglercraft.v1_8.minecraft.FontMappingHelper;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
@@ -80,6 +81,20 @@ public class FontRenderer implements IResourceManagerReloadListener {
 	protected boolean underlineStyle;
 	protected boolean strikethroughStyle;
 
+	protected static char[] codepointLookup = new char[] { 192, 193, 194, 200, 202, 203, 205, 211, 212, 213, 218, 223,
+			227, 245, 287, 304, 305, 338, 339, 350, 351, 372, 373, 382, 519, 0, 0, 0, 0, 0, 0, 0, 32, 33, 34, 35, 36,
+			37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+			64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+			91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+			114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 0, 199, 252, 233, 226, 228, 224, 229, 231,
+			234, 235, 232, 239, 238, 236, 196, 197, 201, 230, 198, 244, 246, 242, 251, 249, 255, 214, 220, 248, 163,
+			216, 215, 402, 225, 237, 243, 250, 241, 209, 170, 186, 191, 174, 172, 189, 188, 161, 171, 187, 9617, 9618,
+			9619, 9474, 9508, 9569, 9570, 9558, 9557, 9571, 9553, 9559, 9565, 9564, 9563, 9488, 9492, 9524, 9516, 9500,
+			9472, 9532, 9566, 9567, 9562, 9556, 9577, 9574, 9568, 9552, 9580, 9575, 9576, 9572, 9573, 9561, 9560, 9554,
+			9555, 9579, 9578, 9496, 9484, 9608, 9604, 9612, 9616, 9600, 945, 946, 915, 960, 931, 963, 956, 964, 934,
+			920, 937, 948, 8734, 8709, 8712, 8745, 8801, 177, 8805, 8804, 8992, 8993, 247, 8776, 176, 8729, 183, 8730,
+			8319, 178, 9632, 0 };
+
 	public FontRenderer(GameSettings gameSettingsIn, ResourceLocation location, TextureManager textureManagerIn,
 			boolean unicode) {
 		this.locationFontTexture = location;
@@ -187,8 +202,7 @@ public class FontRenderer implements IResourceManagerReloadListener {
 		if (parChar1 == 32) {
 			return 4.0F;
 		} else {
-			int i = "\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000"
-					.indexOf(parChar1);
+			int i = FontMappingHelper.lookupChar(parChar1, false);
 			return i != -1 && !this.unicodeFlag ? this.renderDefaultChar(i, parFlag)
 					: this.renderUnicodeChar(parChar1, parFlag);
 		}
@@ -390,18 +404,15 @@ public class FontRenderer implements IResourceManagerReloadListener {
 
 				++i;
 			} else {
-				int j = "\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000"
-						.indexOf(c0);
+				int j = FontMappingHelper.lookupChar(c0, false);
 				if (this.randomStyle && j != -1) {
 					int k = this.getCharWidth(c0);
+					char[] chars = FontRenderer.codepointLookup;
 
 					char c1;
 					while (true) {
-						j = this.fontRandom.nextInt(
-								"\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000"
-										.length());
-						c1 = "\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000"
-								.charAt(j);
+						j = this.fontRandom.nextInt(chars.length);
+						c1 = chars[j];
 						if (k == this.getCharWidth(c1)) {
 							break;
 						}
@@ -577,8 +588,7 @@ public class FontRenderer implements IResourceManagerReloadListener {
 		} else if (character == 32) {
 			return 4;
 		} else {
-			int i = "\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000"
-					.indexOf(character);
+			int i = FontMappingHelper.lookupChar(character, false);
 			if (character > 0 && i != -1 && !this.unicodeFlag) {
 				return this.charWidth[i];
 			} else if (this.glyphWidth[character] != 0) {
diff --git a/src/main/java/net/minecraft/client/gui/Gui.java b/src/game/java/net/minecraft/client/gui/Gui.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/Gui.java
rename to src/game/java/net/minecraft/client/gui/Gui.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiButton.java b/src/game/java/net/minecraft/client/gui/GuiButton.java
similarity index 96%
rename from src/main/java/net/minecraft/client/gui/GuiButton.java
rename to src/game/java/net/minecraft/client/gui/GuiButton.java
index 19baa02..54dc4be 100755
--- a/src/main/java/net/minecraft/client/gui/GuiButton.java
+++ b/src/game/java/net/minecraft/client/gui/GuiButton.java
@@ -166,4 +166,9 @@ public class GuiButton extends Gui {
 	public void setWidth(int width) {
 		this.width = width;
 	}
+
+	public boolean isSliderTouchEvents() {
+		return false;
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiButtonLanguage.java b/src/game/java/net/minecraft/client/gui/GuiButtonLanguage.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiButtonLanguage.java
rename to src/game/java/net/minecraft/client/gui/GuiButtonLanguage.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiChat.java b/src/game/java/net/minecraft/client/gui/GuiChat.java
similarity index 83%
rename from src/main/java/net/minecraft/client/gui/GuiChat.java
rename to src/game/java/net/minecraft/client/gui/GuiChat.java
index 4108bc8..4589349 100755
--- a/src/main/java/net/minecraft/client/gui/GuiChat.java
+++ b/src/game/java/net/minecraft/client/gui/GuiChat.java
@@ -9,8 +9,13 @@ import com.google.common.collect.Lists;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenVisualViewport;
+import net.lax1dude.eaglercraft.v1_8.notifications.GuiButtonNotifBell;
+import net.lax1dude.eaglercraft.v1_8.notifications.GuiScreenNotifications;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.network.play.client.C14PacketTabComplete;
@@ -40,7 +45,7 @@ import net.minecraft.util.MovingObjectPosition;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class GuiChat extends GuiScreen {
+public class GuiChat extends GuiScreenVisualViewport {
 	private static final Logger logger = LogManager.getLogger();
 	private String historyBuffer = "";
 	/**+
@@ -61,6 +66,7 @@ public class GuiChat extends GuiScreen {
 	private String defaultInputFieldText = "";
 
 	private GuiButton exitButton;
+	private GuiButtonNotifBell notifBellButton;
 
 	public GuiChat() {
 	}
@@ -78,6 +84,11 @@ public class GuiChat extends GuiScreen {
 		Keyboard.enableRepeatEvents(true);
 		if (!(this instanceof GuiSleepMP)) {
 			this.buttonList.add(exitButton = new GuiButton(69, this.width - 100, 3, 97, 20, I18n.format("chat.exit")));
+			if (!this.mc.isIntegratedServerRunning() && this.mc.thePlayer != null
+					&& this.mc.thePlayer.sendQueue.getEaglerMessageProtocol().ver >= 4) {
+				this.buttonList.add(notifBellButton = new GuiButtonNotifBell(70, this.width - 122, 3));
+				notifBellButton.setUnread(mc.thePlayer.sendQueue.getNotifManager().getUnread());
+			}
 		}
 		this.sentHistoryCursor = this.mc.ingameGUI.getChatGUI().getSentMessages().size();
 		this.inputField = new GuiTextField(0, this.fontRendererObj, 4, this.height - 12, this.width - 4, 12);
@@ -97,11 +108,11 @@ public class GuiChat extends GuiScreen {
 		this.mc.ingameGUI.getChatGUI().resetScroll();
 	}
 
-	/**+
-	 * Called from the main game loop to update the screen.
-	 */
-	public void updateScreen() {
+	public void updateScreen0() {
 		this.inputField.updateCursorCounter();
+		if (notifBellButton != null && mc.thePlayer != null) {
+			notifBellButton.setUnread(mc.thePlayer.sendQueue.getNotifManager().getUnread());
+		}
 	}
 
 	/**+
@@ -169,25 +180,27 @@ public class GuiChat extends GuiScreen {
 
 	}
 
-	/**+
-	 * Called when the mouse is clicked. Args : mouseX, mouseY,
-	 * clickedButton
-	 */
-	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
+	protected void mouseClicked0(int parInt1, int parInt2, int parInt3) {
 		if (parInt3 == 0) {
-			IChatComponent ichatcomponent = this.mc.ingameGUI.getChatGUI().getChatComponent(Mouse.getX(), Mouse.getY());
+			IChatComponent ichatcomponent = this.mc.ingameGUI.getChatGUI()
+					.getChatComponent(PointerInputAbstraction.getVCursorX(), PointerInputAbstraction.getVCursorY());
 			if (this.handleComponentClick(ichatcomponent)) {
 				return;
 			}
+			if (mc.notifRenderer.handleClicked(this, parInt1, parInt2)) {
+				return;
+			}
 		}
 
 		this.inputField.mouseClicked(parInt1, parInt2, parInt3);
-		super.mouseClicked(parInt1, parInt2, parInt3);
+		super.mouseClicked0(parInt1, parInt2, parInt3);
 	}
 
 	protected void actionPerformed(GuiButton par1GuiButton) {
 		if (par1GuiButton.id == 69) {
 			this.mc.displayGuiScreen(null);
+		} else if (par1GuiButton.id == 70) {
+			this.mc.displayGuiScreen(new GuiScreenNotifications(this));
 		}
 	}
 
@@ -282,15 +295,12 @@ public class GuiChat extends GuiScreen {
 		}
 	}
 
-	/**+
-	 * Draws the screen and all the components in it. Args : mouseX,
-	 * mouseY, renderPartialTicks
-	 */
-	public void drawScreen(int i, int j, float f) {
+	public void drawScreen0(int i, int j, float f) {
 		drawRect(2, this.height - 14, this.width - 2, this.height - 2, Integer.MIN_VALUE);
 		this.inputField.drawTextBox();
 		GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
-		IChatComponent ichatcomponent = this.mc.ingameGUI.getChatGUI().getChatComponent(Mouse.getX(), Mouse.getY());
+		IChatComponent ichatcomponent = this.mc.ingameGUI.getChatGUI()
+				.getChatComponent(PointerInputAbstraction.getVCursorX(), PointerInputAbstraction.getVCursorY());
 		if (ichatcomponent != null && ichatcomponent.getChatStyle().getChatHoverEvent() != null) {
 			this.handleComponentHover(ichatcomponent, i, j);
 		}
@@ -299,7 +309,7 @@ public class GuiChat extends GuiScreen {
 			exitButton.yPosition = 3 + mc.guiAchievement.getHeight();
 		}
 
-		super.drawScreen(i, j, f);
+		super.drawScreen0(i, j, f);
 	}
 
 	public void onAutocompleteResponse(String[] parArrayOfString) {
@@ -341,4 +351,13 @@ public class GuiChat extends GuiScreen {
 	public boolean blockPTTKey() {
 		return true;
 	}
+
+	public boolean showCopyPasteButtons() {
+		return true;
+	}
+
+	public void fireInputEvent(EnumInputEvent event, String str) {
+		inputField.fireInputEvent(event, str);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiCommandBlock.java b/src/game/java/net/minecraft/client/gui/GuiCommandBlock.java
similarity index 92%
rename from src/main/java/net/minecraft/client/gui/GuiCommandBlock.java
rename to src/game/java/net/minecraft/client/gui/GuiCommandBlock.java
index 52272ff..78f9efb 100755
--- a/src/main/java/net/minecraft/client/gui/GuiCommandBlock.java
+++ b/src/game/java/net/minecraft/client/gui/GuiCommandBlock.java
@@ -4,6 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.command.server.CommandBlockLogic;
 import net.minecraft.network.PacketBuffer;
@@ -191,6 +192,18 @@ public class GuiCommandBlock extends GuiScreen {
 	}
 
 	public boolean blockPTTKey() {
-		return commandTextField.isFocused();
+		return commandTextField.isFocused() || previousOutputTextField.isFocused();
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return commandTextField.isFocused() || previousOutputTextField.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		commandTextField.fireInputEvent(event, param);
+		previousOutputTextField.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiConfirmOpenLink.java b/src/game/java/net/minecraft/client/gui/GuiConfirmOpenLink.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiConfirmOpenLink.java
rename to src/game/java/net/minecraft/client/gui/GuiConfirmOpenLink.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiControls.java b/src/game/java/net/minecraft/client/gui/GuiControls.java
similarity index 94%
rename from src/main/java/net/minecraft/client/gui/GuiControls.java
rename to src/game/java/net/minecraft/client/gui/GuiControls.java
index 5a9cbc0..da3fb4a 100755
--- a/src/main/java/net/minecraft/client/gui/GuiControls.java
+++ b/src/game/java/net/minecraft/client/gui/GuiControls.java
@@ -29,7 +29,8 @@ import net.minecraft.client.settings.KeyBinding;
  */
 public class GuiControls extends GuiScreen {
 	private static final GameSettings.Options[] optionsArr = new GameSettings.Options[] {
-			GameSettings.Options.INVERT_MOUSE, GameSettings.Options.SENSITIVITY, GameSettings.Options.TOUCHSCREEN };
+			GameSettings.Options.INVERT_MOUSE, GameSettings.Options.SENSITIVITY,
+			GameSettings.Options.EAGLER_TOUCH_CONTROL_OPACITY };
 	private GuiScreen parentScreen;
 	protected String screenTitle = "Controls";
 	private GameSettings options;
@@ -83,6 +84,11 @@ public class GuiControls extends GuiScreen {
 		this.keyBindingList.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.keyBindingList.handleTouchInput();
+	}
+
 	/**+
 	 * Called by the controls from the buttonList when activated.
 	 * (Mouse pressed for buttons)
diff --git a/src/main/java/net/minecraft/client/gui/GuiCreateFlatWorld.java b/src/game/java/net/minecraft/client/gui/GuiCreateFlatWorld.java
similarity index 96%
rename from src/main/java/net/minecraft/client/gui/GuiCreateFlatWorld.java
rename to src/game/java/net/minecraft/client/gui/GuiCreateFlatWorld.java
index e523c6e..bb66925 100755
--- a/src/main/java/net/minecraft/client/gui/GuiCreateFlatWorld.java
+++ b/src/game/java/net/minecraft/client/gui/GuiCreateFlatWorld.java
@@ -97,6 +97,11 @@ public class GuiCreateFlatWorld extends GuiScreen {
 		this.createFlatWorldListSlotGui.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.createFlatWorldListSlotGui.handleTouchInput();
+	}
+
 	/**+
 	 * Called by the controls from the buttonList when activated.
 	 * (Mouse pressed for buttons)
diff --git a/src/main/java/net/minecraft/client/gui/GuiCreateWorld.java b/src/game/java/net/minecraft/client/gui/GuiCreateWorld.java
similarity index 95%
rename from src/main/java/net/minecraft/client/gui/GuiCreateWorld.java
rename to src/game/java/net/minecraft/client/gui/GuiCreateWorld.java
index 8764534..16b1b6e 100755
--- a/src/main/java/net/minecraft/client/gui/GuiCreateWorld.java
+++ b/src/game/java/net/minecraft/client/gui/GuiCreateWorld.java
@@ -3,6 +3,7 @@ package net.minecraft.client.gui;
 import java.util.Random;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.ChatAllowedCharacters;
 import net.minecraft.world.WorldSettings;
@@ -463,4 +464,16 @@ public class GuiCreateWorld extends GuiScreen {
 		}
 
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return field_146333_g.isFocused() || field_146335_h.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		field_146333_g.fireInputEvent(event, param);
+		field_146335_h.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiCustomizeSkin.java b/src/game/java/net/minecraft/client/gui/GuiCustomizeSkin.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiCustomizeSkin.java
rename to src/game/java/net/minecraft/client/gui/GuiCustomizeSkin.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java b/src/game/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java
similarity index 96%
rename from src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java
rename to src/game/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java
index 1247311..5a12406 100755
--- a/src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java
+++ b/src/game/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java
@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.util.Random;
 
 import net.lax1dude.eaglercraft.v1_8.HString;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 import net.minecraft.client.renderer.Tessellator;
@@ -129,6 +130,11 @@ public class GuiCustomizeWorldScreen extends GuiScreen
 		this.field_175349_r.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.field_175349_r.handleTouchInput();
+	}
+
 	private void func_175325_f() {
 		GuiPageButtonList.GuiListEntry[] aguipagebuttonlist$guilistentry = new GuiPageButtonList.GuiListEntry[] {
 				new GuiPageButtonList.GuiSlideEntry(160,
@@ -1193,4 +1199,15 @@ public class GuiCustomizeWorldScreen extends GuiScreen
 		}
 
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return field_175349_r.isTextFieldFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		field_175349_r.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiDisconnected.java b/src/game/java/net/minecraft/client/gui/GuiDisconnected.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiDisconnected.java
rename to src/game/java/net/minecraft/client/gui/GuiDisconnected.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiDownloadTerrain.java b/src/game/java/net/minecraft/client/gui/GuiDownloadTerrain.java
similarity index 95%
rename from src/main/java/net/minecraft/client/gui/GuiDownloadTerrain.java
rename to src/game/java/net/minecraft/client/gui/GuiDownloadTerrain.java
index 98b6fa8..b530ba0 100755
--- a/src/main/java/net/minecraft/client/gui/GuiDownloadTerrain.java
+++ b/src/game/java/net/minecraft/client/gui/GuiDownloadTerrain.java
@@ -83,4 +83,9 @@ public class GuiDownloadTerrain extends GuiScreen {
 	public boolean shouldHangupIntegratedServer() {
 		return false;
 	}
+
+	public boolean canCloseGui() {
+		return false;
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiEnchantment.java b/src/game/java/net/minecraft/client/gui/GuiEnchantment.java
similarity index 96%
rename from src/main/java/net/minecraft/client/gui/GuiEnchantment.java
rename to src/game/java/net/minecraft/client/gui/GuiEnchantment.java
index 8a801bd..4475cec 100755
--- a/src/main/java/net/minecraft/client/gui/GuiEnchantment.java
+++ b/src/game/java/net/minecraft/client/gui/GuiEnchantment.java
@@ -137,7 +137,7 @@ public class GuiEnchantment extends GuiContainer {
 		GlStateManager.matrixMode(GL_PROJECTION);
 		GlStateManager.pushMatrix();
 		GlStateManager.loadIdentity();
-		ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+		ScaledResolution scaledresolution = mc.scaledResolution;
 		GlStateManager.viewport((scaledresolution.getScaledWidth() - 290 - 12) / 2 * scaledresolution.getScaleFactor(),
 				(scaledresolution.getScaledHeight() - 220 + 10) / 2 * scaledresolution.getScaleFactor(),
 				290 * scaledresolution.getScaleFactor(), 220 * scaledresolution.getScaleFactor());
diff --git a/src/main/java/net/minecraft/client/gui/GuiErrorScreen.java b/src/game/java/net/minecraft/client/gui/GuiErrorScreen.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiErrorScreen.java
rename to src/game/java/net/minecraft/client/gui/GuiErrorScreen.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiFlatPresets.java b/src/game/java/net/minecraft/client/gui/GuiFlatPresets.java
similarity index 94%
rename from src/main/java/net/minecraft/client/gui/GuiFlatPresets.java
rename to src/game/java/net/minecraft/client/gui/GuiFlatPresets.java
index 7105292..b261f8d 100755
--- a/src/main/java/net/minecraft/client/gui/GuiFlatPresets.java
+++ b/src/game/java/net/minecraft/client/gui/GuiFlatPresets.java
@@ -7,6 +7,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 import net.minecraft.block.BlockTallGrass;
@@ -86,6 +87,11 @@ public class GuiFlatPresets extends GuiScreen {
 		this.field_146435_s.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.field_146435_s.handleTouchInput();
+	}
+
 	/**+
 	 * Called when the screen is unloaded. Used to disable keyboard
 	 * repeat events
@@ -317,4 +323,15 @@ public class GuiFlatPresets extends GuiScreen {
 					16777215);
 		}
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return field_146433_u.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		field_146433_u.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiGameOver.java b/src/game/java/net/minecraft/client/gui/GuiGameOver.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiGameOver.java
rename to src/game/java/net/minecraft/client/gui/GuiGameOver.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiHopper.java b/src/game/java/net/minecraft/client/gui/GuiHopper.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiHopper.java
rename to src/game/java/net/minecraft/client/gui/GuiHopper.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiIngame.java b/src/game/java/net/minecraft/client/gui/GuiIngame.java
similarity index 77%
rename from src/main/java/net/minecraft/client/gui/GuiIngame.java
rename to src/game/java/net/minecraft/client/gui/GuiIngame.java
index 47f4cac..e848d6c 100755
--- a/src/main/java/net/minecraft/client/gui/GuiIngame.java
+++ b/src/game/java/net/minecraft/client/gui/GuiIngame.java
@@ -4,7 +4,12 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
+
+import net.lax1dude.eaglercraft.v1_8.Display;
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
+import net.lax1dude.eaglercraft.v1_8.Touch;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
 import com.google.common.base.Predicate;
@@ -14,8 +19,11 @@ import com.google.common.collect.Lists;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
+import net.lax1dude.eaglercraft.v1_8.touch_gui.TouchControls;
+import net.lax1dude.eaglercraft.v1_8.touch_gui.TouchOverlayRenderer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiInventory;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderItem;
@@ -33,6 +41,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.network.play.client.C16PacketClientStatus;
 import net.minecraft.potion.Potion;
 import net.minecraft.scoreboard.Score;
 import net.minecraft.scoreboard.ScoreObjective;
@@ -44,6 +53,7 @@ import net.minecraft.util.FoodStats;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.MovingObjectPosition.MovingObjectType;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StringUtils;
 import net.minecraft.world.border.WorldBorder;
@@ -127,7 +137,7 @@ public class GuiIngame extends Gui {
 	}
 
 	public void renderGameOverlay(float partialTicks) {
-		ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+		ScaledResolution scaledresolution = mc.scaledResolution;
 		int i = scaledresolution.getScaledWidth();
 		int j = scaledresolution.getScaledHeight();
 		this.mc.entityRenderer.setupOverlayRendering();
@@ -150,6 +160,8 @@ public class GuiIngame extends Gui {
 			}
 		}
 
+		onBeginHotbarDraw();
+
 		if (this.mc.playerController.isSpectator()) {
 			this.spectatorGui.renderTooltip(scaledresolution, partialTicks);
 		} else {
@@ -158,32 +170,13 @@ public class GuiIngame extends Gui {
 
 		this.mc.getTextureManager().bindTexture(icons);
 		GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0);
-		this.mc.mcProfiler.startSection("bossHealth");
 		this.renderBossHealth();
-		this.mc.mcProfiler.endSection();
 		if (this.mc.playerController.shouldDrawHUD()) {
 			this.renderPlayerStats(scaledresolution);
 		}
 
-		GlStateManager.disableBlend();
-		if (this.mc.thePlayer.getSleepTimer() > 0) {
-			this.mc.mcProfiler.startSection("sleep");
-			GlStateManager.disableDepth();
-			GlStateManager.disableAlpha();
-			int j1 = this.mc.thePlayer.getSleepTimer();
-			float f1 = (float) j1 / 100.0F;
-			if (f1 > 1.0F) {
-				f1 = 1.0F - (float) (j1 - 100) / 10.0F;
-			}
-
-			int k = (int) (220.0F * f1) << 24 | 1052704;
-			drawRect(0, 0, i, j, k);
-			GlStateManager.enableAlpha();
-			GlStateManager.enableDepth();
-			this.mc.mcProfiler.endSection();
-		}
-
 		GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+		GlStateManager.disableBlend();
 		int k1 = i / 2 - 91;
 		if (this.mc.thePlayer.isRidingHorse()) {
 			this.renderHorseJumpBar(scaledresolution, k1);
@@ -191,20 +184,17 @@ public class GuiIngame extends Gui {
 			this.renderExpBar(scaledresolution, k1);
 		}
 
+		GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+		GlStateManager.disableBlend();
 		if (this.mc.gameSettings.heldItemTooltips && !this.mc.playerController.isSpectator()) {
 			this.func_181551_a(scaledresolution);
 		} else if (this.mc.thePlayer.isSpectator()) {
 			this.spectatorGui.func_175263_a(scaledresolution);
 		}
 
-		if (this.mc.isDemo()) {
-			this.renderDemo(scaledresolution);
-		}
-
-		this.overlayDebug.renderDebugInfo(scaledresolution);
-
+		GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+		GlStateManager.disableBlend();
 		if (this.recordPlayingUpFor > 0) {
-			this.mc.mcProfiler.startSection("overlayMessage");
 			float f2 = (float) this.recordPlayingUpFor - partialTicks;
 			int l1 = (int) (f2 * 255.0F / 20.0F);
 			if (l1 > 255) {
@@ -226,12 +216,36 @@ public class GuiIngame extends Gui {
 				GlStateManager.disableBlend();
 				GlStateManager.popMatrix();
 			}
-
-			this.mc.mcProfiler.endSection();
 		}
 
+		GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+		drawEaglerInteractButton(scaledresolution);
+
+		onEndHotbarDraw();
+
+		GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+		if (this.mc.thePlayer.getSleepTimer() > 0) {
+			GlStateManager.disableDepth();
+			GlStateManager.disableAlpha();
+			int j1 = this.mc.thePlayer.getSleepTimer();
+			float f1 = (float) j1 / 100.0F;
+			if (f1 > 1.0F) {
+				f1 = 1.0F - (float) (j1 - 100) / 10.0F;
+			}
+
+			int k = (int) (220.0F * f1) << 24 | 1052704;
+			drawRect(0, 0, i, j, k);
+			GlStateManager.enableAlpha();
+			GlStateManager.enableDepth();
+		}
+
+		if (this.mc.isDemo()) {
+			this.renderDemo(scaledresolution);
+		}
+
+		this.overlayDebug.renderDebugInfo(scaledresolution);
+
 		if (this.field_175195_w > 0) {
-			this.mc.mcProfiler.startSection("titleAndSubtitle");
 			float f3 = (float) this.field_175195_w - partialTicks;
 			int i2 = 255;
 			if (this.field_175195_w > this.field_175193_B + this.field_175192_A) {
@@ -265,8 +279,6 @@ public class GuiIngame extends Gui {
 				GlStateManager.disableBlend();
 				GlStateManager.popMatrix();
 			}
-
-			this.mc.mcProfiler.endSection();
 		}
 
 		Scoreboard scoreboard = this.mc.theWorld.getScoreboard();
@@ -296,10 +308,10 @@ public class GuiIngame extends Gui {
 		if (this.mc.gameSettings.hudWorld && (mc.currentScreen == null || !(mc.currentScreen instanceof GuiChat))) {
 			j -= 10;
 		}
+		j -= (this.mc.displayHeight - (Display.getVisualViewportX() + Display.getVisualViewportH())) * j
+				/ this.mc.displayHeight;
 		GlStateManager.translate(0.0F, (float) (j - 48), 0.0F);
-		this.mc.mcProfiler.startSection("chat");
 		this.persistantChatGUI.drawChat(this.updateCounter);
-		this.mc.mcProfiler.endSection();
 		GlStateManager.popMatrix();
 		scoreobjective1 = scoreboard.getObjectiveInDisplaySlot(0);
 		if (!this.mc.gameSettings.keyBindPlayerList.isKeyDown() || this.mc.isIntegratedServerRunning()
@@ -311,6 +323,7 @@ public class GuiIngame extends Gui {
 		}
 
 		GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+
 		GlStateManager.disableLighting();
 		GlStateManager.enableAlpha();
 	}
@@ -335,6 +348,23 @@ public class GuiIngame extends Gui {
 			float f = this.zLevel;
 			this.zLevel = -90.0F;
 			this.drawTexturedModalRect(i - 91, sr.getScaledHeight() - 22, 0, 0, 182, 22);
+
+			if (PointerInputAbstraction.isTouchMode()) {
+				this.mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+				this.drawTexturedModalRect(i + 89, sr.getScaledHeight() - 22, 234, 0, 22, 22);
+				int areaHAdd = 12;
+				hotbarAreaX = (i - 91) * mc.displayWidth / sr.getScaledWidth();
+				hotbarAreaY = (sr.getScaledHeight() - 22 - areaHAdd) * mc.displayHeight / sr.getScaledHeight();
+				hotbarAreaW = 203 * mc.displayWidth / sr.getScaledWidth();
+				hotbarAreaH = (22 + areaHAdd) * mc.displayHeight / sr.getScaledHeight();
+			} else {
+				hotbarAreaX = -1;
+				hotbarAreaY = -1;
+				hotbarAreaW = -1;
+				hotbarAreaH = -1;
+			}
+
+			this.mc.getTextureManager().bindTexture(widgetsTexPath);
 			this.drawTexturedModalRect(i - 91 - 1 + entityplayer.inventory.currentItem * 20,
 					sr.getScaledHeight() - 22 - 1, 0, 22, 24, 22);
 			this.zLevel = f;
@@ -351,12 +381,12 @@ public class GuiIngame extends Gui {
 
 			RenderHelper.disableStandardItemLighting();
 			GlStateManager.disableRescaleNormal();
+
 			GlStateManager.disableBlend();
 		}
 	}
 
 	public void renderHorseJumpBar(ScaledResolution parScaledResolution, int parInt1) {
-		this.mc.mcProfiler.startSection("jumpBar");
 		this.mc.getTextureManager().bindTexture(Gui.icons);
 		float f = this.mc.thePlayer.getHorseJumpPower();
 		short short1 = 182;
@@ -366,12 +396,9 @@ public class GuiIngame extends Gui {
 		if (i > 0) {
 			this.drawTexturedModalRect(parInt1, j, 0, 89, i, 5);
 		}
-
-		this.mc.mcProfiler.endSection();
 	}
 
 	public void renderExpBar(ScaledResolution parScaledResolution, int parInt1) {
-		this.mc.mcProfiler.startSection("expBar");
 		this.mc.getTextureManager().bindTexture(Gui.icons);
 		int i = this.mc.thePlayer.xpBarCap();
 		if (i > 0) {
@@ -384,9 +411,7 @@ public class GuiIngame extends Gui {
 			}
 		}
 
-		this.mc.mcProfiler.endSection();
 		if (this.mc.thePlayer.experienceLevel > 0) {
-			this.mc.mcProfiler.startSection("expLevel");
 			int i1 = 8453920;
 			String s = "" + this.mc.thePlayer.experienceLevel;
 			int j1 = (parScaledResolution.getScaledWidth() - this.getFontRenderer().getStringWidth(s)) / 2;
@@ -397,15 +422,13 @@ public class GuiIngame extends Gui {
 			this.getFontRenderer().drawString(s, j1, l + 1, 0);
 			this.getFontRenderer().drawString(s, j1, l - 1, 0);
 			this.getFontRenderer().drawString(s, j1, l, i1);
-			this.mc.mcProfiler.endSection();
 		}
 
 	}
 
 	public void func_181551_a(ScaledResolution parScaledResolution) {
-		this.mc.mcProfiler.startSection("selectedItemName");
 		if (this.remainingHighlightTicks > 0 && this.highlightingItemStack != null) {
-			String s = this.highlightingItemStack.getDisplayName();
+			String s = this.highlightingItemStack.getDisplayNameProfanityFilter();
 			if (this.highlightingItemStack.hasDisplayName()) {
 				s = EnumChatFormatting.ITALIC + s;
 			}
@@ -431,11 +454,9 @@ public class GuiIngame extends Gui {
 			}
 		}
 
-		this.mc.mcProfiler.endSection();
 	}
 
 	public void renderDemo(ScaledResolution parScaledResolution) {
-		this.mc.mcProfiler.startSection("demo");
 		String s = "";
 		if (this.mc.theWorld.getTotalWorldTime() >= 120500L) {
 			s = I18n.format("demo.demoExpired", new Object[0]);
@@ -447,7 +468,6 @@ public class GuiIngame extends Gui {
 		int i = this.getFontRenderer().getStringWidth(s);
 		this.getFontRenderer().drawStringWithShadow(s, (float) (parScaledResolution.getScaledWidth() - i - 10), 5.0F,
 				16777215);
-		this.mc.mcProfiler.endSection();
 	}
 
 	protected boolean showCrosshair() {
@@ -571,8 +591,6 @@ public class GuiIngame extends Gui {
 				l2 = this.updateCounter % MathHelper.ceiling_float_int(f + 5.0F);
 			}
 
-			this.mc.mcProfiler.startSection("armor");
-
 			for (int i3 = 0; i3 < 10; ++i3) {
 				if (k2 > 0) {
 					int j3 = i1 + i3 * 8;
@@ -590,8 +608,6 @@ public class GuiIngame extends Gui {
 				}
 			}
 
-			this.mc.mcProfiler.endStartSection("health");
-
 			for (int i5 = MathHelper.ceiling_float_int((f + f1) / 2.0F) - 1; i5 >= 0; --i5) {
 				int j5 = 16;
 				if (entityplayer.isPotionActive(Potion.poison)) {
@@ -653,8 +669,6 @@ public class GuiIngame extends Gui {
 
 			Entity entity = entityplayer.ridingEntity;
 			if (entity == null) {
-				this.mc.mcProfiler.endStartSection("food");
-
 				for (int k5 = 0; k5 < 10; ++k5) {
 					int i6 = k1;
 					int l6 = 16;
@@ -694,7 +708,6 @@ public class GuiIngame extends Gui {
 					}
 				}
 			} else if (entity instanceof EntityLivingBase) {
-				this.mc.mcProfiler.endStartSection("mountHealth");
 				EntityLivingBase entitylivingbase = (EntityLivingBase) entity;
 				int j6 = (int) Math.ceil((double) entitylivingbase.getHealth());
 				float f3 = entitylivingbase.getMaxHealth();
@@ -731,7 +744,6 @@ public class GuiIngame extends Gui {
 				}
 			}
 
-			this.mc.mcProfiler.endStartSection("air");
 			if (entityplayer.isInsideOfMaterial(Material.water)) {
 				int l5 = this.mc.thePlayer.getAir();
 				int k6 = MathHelper.ceiling_double_int((double) (l5 - 2) * 10.0D / 300.0D);
@@ -746,7 +758,6 @@ public class GuiIngame extends Gui {
 				}
 			}
 
-			this.mc.mcProfiler.endSection();
 		}
 	}
 
@@ -756,9 +767,7 @@ public class GuiIngame extends Gui {
 	private void renderBossHealth() {
 		if (BossStatus.bossName != null && BossStatus.statusBarTime > 0) {
 			--BossStatus.statusBarTime;
-			FontRenderer fontrenderer = this.mc.fontRendererObj;
-			ScaledResolution scaledresolution = new ScaledResolution(this.mc);
-			int i = scaledresolution.getScaledWidth();
+			int i = mc.scaledResolution.getScaledWidth();
 			short short1 = 182;
 			int j = i / 2 - short1 / 2;
 			int k = (int) (BossStatus.healthScale * (float) (short1 + 1));
@@ -1062,4 +1071,220 @@ public class GuiIngame extends Gui {
 	public void func_181029_i() {
 		this.overlayPlayerList.func_181030_a();
 	}
+
+	private int hotbarAreaX = -1;
+	private int hotbarAreaY = -1;
+	private int hotbarAreaW = -1;
+	private int hotbarAreaH = -1;
+	private int currentHotbarSlotTouch = -1;
+	private long hotbarSlotTouchStart = -1l;
+	private boolean hotbarSlotTouchAlreadySelected = false;
+	private int interactButtonX = -1;
+	private int interactButtonY = -1;
+	private int interactButtonW = -1;
+	private int interactButtonH = -1;
+	private int touchVPosX = -1;
+	private int touchVPosY = -1;
+	private int touchEventUID = -1;
+
+	private void drawEaglerInteractButton(ScaledResolution parScaledResolution) {
+		if (PointerInputAbstraction.isTouchMode() && mc.objectMouseOver != null
+				&& mc.objectMouseOver.typeOfHit == MovingObjectType.ENTITY) {
+			int scale = parScaledResolution.getScaleFactor();
+			interactButtonW = 118 * scale;
+			interactButtonH = 20 * scale;
+			int xx = (parScaledResolution.getScaledWidth() - 118) / 2;
+			int yy = parScaledResolution.getScaledHeight() - 70;
+			interactButtonX = xx * scale;
+			interactButtonY = yy * scale;
+			mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+			boolean hover = touchVPosX >= interactButtonX && touchVPosY >= interactButtonY
+					&& touchVPosX < interactButtonX + interactButtonW && touchVPosY < interactButtonY + interactButtonH;
+			float f = MathHelper.clamp_float(mc.gameSettings.touchControlOpacity, 0.0f, 1.0f);
+			if (f > 0.0f) {
+				GlStateManager.color(1.0f, 1.0f, 1.0f, f);
+				drawTexturedModalRect(xx, yy, 0, hover ? 216 : 236, 118, 20);
+				GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+				drawCenteredString(mc.fontRendererObj, I18n.format("touch.interact.entity"),
+						parScaledResolution.getScaledWidth() / 2, yy + 6,
+						(hover ? 16777120 : 14737632) | ((int) (f * 255.0f) << 24));
+			}
+		} else {
+			interactButtonX = -1;
+			interactButtonY = -1;
+			interactButtonW = -1;
+			interactButtonH = -1;
+		}
+	}
+
+	private int applyTouchHotbarTransformX(int posX, boolean scaled) {
+		if (scaled) {
+			return (posX + mc.scaledResolution.getScaledWidth() / 4) * 2 / 3;
+		} else {
+			return (posX + mc.displayWidth / 4) * 2 / 3;
+		}
+	}
+
+	private int applyTouchHotbarTransformY(int posY, boolean scaled) {
+		if (scaled) {
+			return (posY + mc.scaledResolution.getScaledHeight() / 2) * 2 / 3;
+		} else {
+			return (posY + mc.displayHeight / 2) * 2 / 3;
+		}
+	}
+
+	private void onBeginHotbarDraw() {
+		if (PointerInputAbstraction.isTouchMode()) {
+			GlStateManager.pushMatrix();
+			ScaledResolution res = mc.scaledResolution;
+			GlStateManager.translate(res.getScaledWidth() / -4, res.getScaledHeight() / -2, field_175199_z);
+			GlStateManager.scale(1.5f, 1.5f, 1.5f);
+		}
+	}
+
+	private void onEndHotbarDraw() {
+		if (PointerInputAbstraction.isTouchMode()) {
+			GlStateManager.popMatrix();
+		}
+	}
+
+	private int getHotbarSlotTouched(int pointX) {
+		int xx = pointX - hotbarAreaX - 2;
+		xx /= 20 * mc.scaledResolution.getScaleFactor();
+		if (xx < 0)
+			xx = 0;
+		if (xx > 9)
+			xx = 9;
+		return xx;
+	}
+
+	public boolean handleTouchBeginEagler(int uid, int pointX, int pointY) {
+		if (mc.thePlayer == null) {
+			return false;
+		}
+		if (touchEventUID == -1) {
+			pointX = applyTouchHotbarTransformX(pointX, false);
+			pointY = applyTouchHotbarTransformY(pointY, false);
+			if (pointX >= hotbarAreaX && pointY >= hotbarAreaY && pointX < hotbarAreaX + hotbarAreaW
+					&& pointY < hotbarAreaY + hotbarAreaH) {
+				touchEventUID = uid;
+				currentHotbarSlotTouch = getHotbarSlotTouched(pointX);
+				hotbarSlotTouchStart = EagRuntime.steadyTimeMillis();
+				if (currentHotbarSlotTouch >= 0 && currentHotbarSlotTouch < 9) {
+					if (mc.thePlayer.isSpectator()) {
+						hotbarSlotTouchAlreadySelected = false;
+						mc.ingameGUI.getSpectatorGui().func_175260_a(currentHotbarSlotTouch);
+					} else {
+						hotbarSlotTouchAlreadySelected = (mc.thePlayer.inventory.currentItem == currentHotbarSlotTouch);
+						mc.thePlayer.inventory.currentItem = currentHotbarSlotTouch;
+					}
+				} else if (currentHotbarSlotTouch == 9) {
+					hotbarSlotTouchAlreadySelected = false;
+					currentHotbarSlotTouch = 69;
+					if (mc.playerController.isRidingHorse()) {
+						mc.thePlayer.sendHorseInventory();
+					} else {
+						mc.getNetHandler().addToSendQueue(
+								new C16PacketClientStatus(C16PacketClientStatus.EnumState.OPEN_INVENTORY_ACHIEVEMENT));
+						mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
+					}
+				}
+				return true;
+			}
+			if (pointX >= interactButtonX && pointY >= interactButtonY && pointX < interactButtonX + interactButtonW
+					&& pointY < interactButtonY + interactButtonH) {
+				touchEventUID = uid;
+				mc.rightClickMouse();
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public boolean handleTouchEndEagler(int uid, int pointX, int pointY) {
+		if (uid == touchEventUID) {
+			if (hotbarSlotTouchStart != -1l && currentHotbarSlotTouch != 69) {
+				if (EagRuntime.steadyTimeMillis() - hotbarSlotTouchStart < 350l) {
+					if (hotbarSlotTouchAlreadySelected) {
+						if (mc.thePlayer != null) {
+							mc.thePlayer.dropOneItem(false);
+						}
+					}
+				}
+			}
+			touchVPosX = -1;
+			touchVPosY = -1;
+			touchEventUID = -1;
+			currentHotbarSlotTouch = -1;
+			hotbarSlotTouchStart = -1l;
+			hotbarSlotTouchAlreadySelected = false;
+			return true;
+		}
+		return false;
+	}
+
+	public void updateTouchEagler(boolean screenTouched) {
+		if (screenTouched) {
+			int pointCount = Touch.touchPointCount();
+			for (int i = 0; i < pointCount; ++i) {
+				int uid = Touch.touchPointUID(i);
+				if (TouchControls.touchControls.containsKey(uid)) {
+					continue;
+				}
+				if (touchEventUID == -1 || touchEventUID == uid) {
+					touchVPosX = applyTouchHotbarTransformX(Touch.touchPointX(i), false);
+					touchVPosY = applyTouchHotbarTransformY(mc.displayHeight - Touch.touchPointY(i) - 1, false);
+					long millis = EagRuntime.steadyTimeMillis();
+					if (touchEventUID != -1 && hotbarSlotTouchStart != -1l) {
+						if (currentHotbarSlotTouch != 69) {
+							int slot = getHotbarSlotTouched(touchVPosX);
+							if (slot != currentHotbarSlotTouch) {
+								hotbarSlotTouchAlreadySelected = false;
+								currentHotbarSlotTouch = slot;
+								hotbarSlotTouchStart = millis;
+								if (slot >= 0 && slot < 9) {
+									if (mc.thePlayer.isSpectator()) {
+										mc.ingameGUI.getSpectatorGui().func_175260_a(slot);
+									} else {
+										mc.thePlayer.inventory.currentItem = slot;
+									}
+								}
+							} else {
+								if (millis - hotbarSlotTouchStart > 1200l) {
+									if (!mc.thePlayer.isSpectator()) {
+										hotbarSlotTouchStart = millis;
+										this.mc.thePlayer.dropOneItem(true);
+									}
+								}
+							}
+						}
+					}
+					return;
+				}
+			}
+		}
+		if (touchEventUID != -1) {
+			handleTouchEndEagler(touchEventUID, touchVPosX, touchVPosY);
+		}
+		touchVPosX = -1;
+		touchVPosY = -1;
+		touchEventUID = -1;
+		currentHotbarSlotTouch = -1;
+		hotbarSlotTouchStart = -1l;
+		hotbarSlotTouchAlreadySelected = false;
+	}
+
+	public boolean isTouchOverlapEagler(int uid, int tx, int ty) {
+		if (touchEventUID == uid) {
+			return true;
+		}
+		ty = mc.displayHeight - ty - 1;
+		tx = applyTouchHotbarTransformX(tx, false);
+		ty = applyTouchHotbarTransformY(ty, false);
+		return (tx >= hotbarAreaX && ty >= hotbarAreaY && tx < hotbarAreaX + hotbarAreaW
+				&& ty < hotbarAreaY + hotbarAreaH)
+				|| (tx >= interactButtonX && ty >= interactButtonY && tx < interactButtonX + interactButtonW
+						&& ty < interactButtonY + interactButtonH);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiIngameMenu.java b/src/game/java/net/minecraft/client/gui/GuiIngameMenu.java
similarity index 59%
rename from src/main/java/net/minecraft/client/gui/GuiIngameMenu.java
rename to src/game/java/net/minecraft/client/gui/GuiIngameMenu.java
index c70a350..c2b2eb7 100755
--- a/src/main/java/net/minecraft/client/gui/GuiIngameMenu.java
+++ b/src/game/java/net/minecraft/client/gui/GuiIngameMenu.java
@@ -2,6 +2,10 @@ package net.minecraft.client.gui;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PauseMenuCustomizeState;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiButtonWithStupidIcons;
+import net.lax1dude.eaglercraft.v1_8.notifications.GuiButtonNotifBell;
+import net.lax1dude.eaglercraft.v1_8.notifications.GuiScreenNotifications;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenLANInfo;
@@ -10,6 +14,9 @@ import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiShareToLan;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;
 import net.lax1dude.eaglercraft.v1_8.update.GuiUpdateCheckerOverlay;
 import net.lax1dude.eaglercraft.v1_8.voice.GuiVoiceMenu;
+import net.lax1dude.eaglercraft.v1_8.webview.GuiScreenPhishingWaring;
+import net.lax1dude.eaglercraft.v1_8.webview.GuiScreenRecieveServerInfo;
+import net.lax1dude.eaglercraft.v1_8.webview.GuiScreenServerInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.achievement.GuiAchievements;
@@ -48,6 +55,7 @@ public class GuiIngameMenu extends GuiScreen {
 
 	private GuiUpdateCheckerOverlay updateCheckerOverlay;
 	private GuiVoiceMenu voiceMenu;
+	private GuiButtonNotifBell notifBellButton;
 
 	public GuiIngameMenu() {
 		updateCheckerOverlay = new GuiUpdateCheckerOverlay(true, this);
@@ -66,23 +74,52 @@ public class GuiIngameMenu extends GuiScreen {
 		this.updateCheckerOverlay.setResolution(mc, width, height);
 		byte b0 = -16;
 		boolean flag = true;
-		this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 120 + b0,
-				I18n.format("menu.returnToMenu", new Object[0])));
+		this.buttonList.add(new GuiButtonWithStupidIcons(1, this.width / 2 - 100, this.height / 4 + 120 + b0,
+				I18n.format("menu.returnToMenu", new Object[0]), PauseMenuCustomizeState.icon_disconnect_L,
+				PauseMenuCustomizeState.icon_disconnect_L_aspect, PauseMenuCustomizeState.icon_disconnect_R,
+				PauseMenuCustomizeState.icon_disconnect_R_aspect));
 		if (!this.mc.isIntegratedServerRunning()) {
 			((GuiButton) this.buttonList.get(0)).displayString = I18n.format("menu.disconnect", new Object[0]);
+			if (this.mc.thePlayer != null && this.mc.thePlayer.sendQueue.getEaglerMessageProtocol().ver >= 4) {
+				this.buttonList.add(notifBellButton = new GuiButtonNotifBell(11, width - 22, height - 22));
+				notifBellButton.setUnread(mc.thePlayer.sendQueue.getNotifManager().getUnread());
+			}
 		}
 
-		this.buttonList.add(new GuiButton(4, this.width / 2 - 100, this.height / 4 + 24 + b0,
-				I18n.format("menu.returnToGame", new Object[0])));
-		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + b0, 98, 20,
-				I18n.format("menu.options", new Object[0])));
-		this.buttonList.add(lanButton = new GuiButton(7, this.width / 2 + 2, this.height / 4 + 96 + b0, 98, 20,
-				I18n.format(LANServerController.isLANOpen() ? "menu.closeLan" : "menu.openToLan", new Object[0])));
-		this.buttonList.add(new GuiButton(5, this.width / 2 - 100, this.height / 4 + 48 + b0, 98, 20,
-				I18n.format("gui.achievements", new Object[0])));
-		this.buttonList.add(new GuiButton(6, this.width / 2 + 2, this.height / 4 + 48 + b0, 98, 20,
-				I18n.format("gui.stats", new Object[0])));
+		this.buttonList.add(new GuiButtonWithStupidIcons(4, this.width / 2 - 100, this.height / 4 + 24 + b0,
+				I18n.format("menu.returnToGame", new Object[0]), PauseMenuCustomizeState.icon_backToGame_L,
+				PauseMenuCustomizeState.icon_backToGame_L_aspect, PauseMenuCustomizeState.icon_backToGame_R,
+				PauseMenuCustomizeState.icon_backToGame_R_aspect));
+		this.buttonList.add(new GuiButtonWithStupidIcons(0, this.width / 2 - 100, this.height / 4 + 96 + b0, 98, 20,
+				I18n.format("menu.options", new Object[0]), PauseMenuCustomizeState.icon_options_L,
+				PauseMenuCustomizeState.icon_options_L_aspect, PauseMenuCustomizeState.icon_options_R,
+				PauseMenuCustomizeState.icon_options_R_aspect));
+		this.buttonList
+				.add(lanButton = new GuiButtonWithStupidIcons(7, this.width / 2 + 2, this.height / 4 + 96 + b0, 98, 20,
+						I18n.format(LANServerController.isLANOpen() ? "menu.closeLan" : "menu.openToLan",
+								new Object[0]),
+						PauseMenuCustomizeState.icon_discord_L, PauseMenuCustomizeState.icon_discord_L_aspect,
+						PauseMenuCustomizeState.icon_discord_R, PauseMenuCustomizeState.icon_discord_R_aspect));
+		this.buttonList.add(new GuiButtonWithStupidIcons(5, this.width / 2 - 100, this.height / 4 + 48 + b0, 98, 20,
+				I18n.format("gui.achievements", new Object[0]), PauseMenuCustomizeState.icon_achievements_L,
+				PauseMenuCustomizeState.icon_achievements_L_aspect, PauseMenuCustomizeState.icon_achievements_R,
+				PauseMenuCustomizeState.icon_achievements_R_aspect));
+		this.buttonList.add(new GuiButtonWithStupidIcons(6, this.width / 2 + 2, this.height / 4 + 48 + b0, 98, 20,
+				I18n.format("gui.stats", new Object[0]), PauseMenuCustomizeState.icon_statistics_L,
+				PauseMenuCustomizeState.icon_statistics_L_aspect, PauseMenuCustomizeState.icon_statistics_R,
+				PauseMenuCustomizeState.icon_statistics_R_aspect));
 		lanButton.enabled = SingleplayerServerController.isWorldRunning();
+		if (PauseMenuCustomizeState.discordButtonMode != PauseMenuCustomizeState.DISCORD_MODE_NONE) {
+			lanButton.enabled = true;
+			lanButton.id = 8;
+			lanButton.displayString = "" + PauseMenuCustomizeState.discordButtonText;
+		}
+		if (PauseMenuCustomizeState.serverInfoMode != PauseMenuCustomizeState.DISCORD_MODE_NONE) {
+			this.buttonList.add(new GuiButtonWithStupidIcons(9, this.width / 2 - 100, this.height / 4 + 72 + b0,
+					PauseMenuCustomizeState.serverInfoButtonText, PauseMenuCustomizeState.icon_serverInfo_L,
+					PauseMenuCustomizeState.icon_serverInfo_L_aspect, PauseMenuCustomizeState.icon_serverInfo_R,
+					PauseMenuCustomizeState.icon_serverInfo_R_aspect));
+		}
 		if (!hasSentAutoSave) {
 			hasSentAutoSave = true;
 			SingleplayerServerController.autoSave();
@@ -137,6 +174,45 @@ public class GuiIngameMenu extends GuiScreen {
 						new GuiShareToLan(this, this.mc.playerController.getCurrentGameType().getName())));
 			}
 			break;
+		case 8:
+			if (PauseMenuCustomizeState.discordButtonMode == PauseMenuCustomizeState.DISCORD_MODE_INVITE_URL
+					&& PauseMenuCustomizeState.discordInviteURL != null) {
+				EagRuntime.openLink(PauseMenuCustomizeState.discordInviteURL);
+			}
+			break;
+		case 9:
+			switch (PauseMenuCustomizeState.serverInfoMode) {
+			case PauseMenuCustomizeState.SERVER_INFO_MODE_EXTERNAL_URL:
+				if (PauseMenuCustomizeState.serverInfoURL != null) {
+					EagRuntime.openLink(PauseMenuCustomizeState.serverInfoURL);
+				}
+				break;
+			case PauseMenuCustomizeState.SERVER_INFO_MODE_SHOW_EMBED_OVER_HTTP:
+				if (PauseMenuCustomizeState.serverInfoURL != null) {
+					GuiScreen screen = GuiScreenServerInfo.createForCurrentState(this,
+							PauseMenuCustomizeState.serverInfoURL);
+					if (!this.mc.gameSettings.hasHiddenPhishWarning && !GuiScreenPhishingWaring.hasShownMessage) {
+						screen = new GuiScreenPhishingWaring(screen);
+					}
+					this.mc.displayGuiScreen(screen);
+				}
+				break;
+			case PauseMenuCustomizeState.SERVER_INFO_MODE_SHOW_EMBED_OVER_WS:
+				if (PauseMenuCustomizeState.serverInfoHash != null) {
+					GuiScreen screen = new GuiScreenRecieveServerInfo(this, PauseMenuCustomizeState.serverInfoHash);
+					if (!this.mc.gameSettings.hasHiddenPhishWarning && !GuiScreenPhishingWaring.hasShownMessage) {
+						screen = new GuiScreenPhishingWaring(screen);
+					}
+					this.mc.displayGuiScreen(screen);
+				}
+				break;
+			default:
+				break;
+			}
+			break;
+		case 11:
+			this.mc.displayGuiScreen(new GuiScreenNotifications(this));
+			break;
 		}
 
 	}
@@ -153,6 +229,9 @@ public class GuiIngameMenu extends GuiScreen {
 		if (Mouse.isActuallyGrabbed()) {
 			Mouse.setGrabbed(false);
 		}
+		if (notifBellButton != null && mc.thePlayer != null) {
+			notifBellButton.setUnread(mc.thePlayer.sendQueue.getNotifManager().getUnread());
+		}
 	}
 
 	/**+
@@ -161,8 +240,28 @@ public class GuiIngameMenu extends GuiScreen {
 	 */
 	public void drawScreen(int i, int j, float f) {
 		this.drawDefaultBackground();
-		this.drawCenteredString(this.fontRendererObj, I18n.format("menu.game", new Object[0]), this.width / 2, 20,
-				16777215);
+		String titleStr = I18n.format("menu.game", new Object[0]);
+		int titleStrWidth = fontRendererObj.getStringWidth(titleStr);
+		this.drawString(this.fontRendererObj, titleStr, (this.width - titleStrWidth) / 2, 20, 16777215);
+		if (PauseMenuCustomizeState.icon_title_L != null) {
+			mc.getTextureManager().bindTexture(PauseMenuCustomizeState.icon_title_L);
+			GlStateManager.pushMatrix();
+			GlStateManager.translate(
+					(this.width - titleStrWidth) / 2 - 6 - 16 * PauseMenuCustomizeState.icon_title_L_aspect, 16, 0.0f);
+			float f2 = 16.0f / 256.0f;
+			GlStateManager.scale(f2 * PauseMenuCustomizeState.icon_title_L_aspect, f2, f2);
+			this.drawTexturedModalRect(0, 0, 0, 0, 256, 256);
+			GlStateManager.popMatrix();
+		}
+		if (PauseMenuCustomizeState.icon_title_R != null) {
+			mc.getTextureManager().bindTexture(PauseMenuCustomizeState.icon_title_L);
+			GlStateManager.pushMatrix();
+			GlStateManager.translate((this.width - titleStrWidth) / 2 + titleStrWidth + 6, 16, 0.0f);
+			float f2 = 16.0f / 256.0f;
+			GlStateManager.scale(f2 * PauseMenuCustomizeState.icon_title_R_aspect, f2, f2);
+			this.drawTexturedModalRect(0, 0, 0, 0, 256, 256);
+			GlStateManager.popMatrix();
+		}
 
 		this.updateCheckerOverlay.drawScreen(i, j, f);
 
@@ -297,4 +396,8 @@ public class GuiIngameMenu extends GuiScreen {
 		} catch (GuiVoiceMenu.AbortedException ex) {
 		}
 	}
+
+	protected boolean isPartOfPauseMenu() {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiKeyBindingList.java b/src/game/java/net/minecraft/client/gui/GuiKeyBindingList.java
similarity index 85%
rename from src/main/java/net/minecraft/client/gui/GuiKeyBindingList.java
rename to src/game/java/net/minecraft/client/gui/GuiKeyBindingList.java
index 32fe6ea..d5c3fba 100755
--- a/src/main/java/net/minecraft/client/gui/GuiKeyBindingList.java
+++ b/src/game/java/net/minecraft/client/gui/GuiKeyBindingList.java
@@ -3,6 +3,7 @@ package net.minecraft.client.gui;
 import java.util.Arrays;
 
 import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.settings.GameSettings;
@@ -36,7 +37,7 @@ public class GuiKeyBindingList extends GuiListExtended {
 	private int maxListLabelWidth = 0;
 
 	public GuiKeyBindingList(GuiControls controls, Minecraft mcIn) {
-		super(mcIn, controls.width, controls.height, 63, controls.height - 32, 20);
+		super(mcIn, controls.width, controls.height, 66, controls.height - 32, 20);
 		this.field_148191_k = controls;
 		this.mc = mcIn;
 		KeyBinding[] akeybinding = (KeyBinding[]) ArrayUtils.clone(mcIn.gameSettings.keyBindings);
@@ -161,10 +162,15 @@ public class GuiKeyBindingList extends GuiListExtended {
 		}
 
 		public boolean mousePressed(int var1, int i, int j, int var4, int var5, int var6) {
-			if (this.btnChangeKeyBinding.mousePressed(GuiKeyBindingList.this.mc, i, j)) {
+			if (var4 != 0 && var4 != 12345)
+				return false;
+			boolean touchMode = PointerInputAbstraction.isTouchMode();
+			if ((!touchMode || (this.btnChangeKeyBinding.isSliderTouchEvents() == (var4 == 12345)))
+					&& this.btnChangeKeyBinding.mousePressed(GuiKeyBindingList.this.mc, i, j)) {
 				GuiKeyBindingList.this.field_148191_k.buttonId = this.keybinding;
 				return true;
-			} else if (this.btnReset.mousePressed(GuiKeyBindingList.this.mc, i, j)) {
+			} else if ((!touchMode || (this.btnReset.isSliderTouchEvents() == (var4 == 12345)))
+					&& this.btnReset.mousePressed(GuiKeyBindingList.this.mc, i, j)) {
 				GuiKeyBindingList.this.mc.gameSettings.setOptionKeyBinding(this.keybinding,
 						this.keybinding.getKeyCodeDefault());
 				KeyBinding.resetKeyBindingArrayAndHash();
@@ -175,8 +181,13 @@ public class GuiKeyBindingList extends GuiListExtended {
 		}
 
 		public void mouseReleased(int var1, int i, int j, int var4, int var5, int var6) {
-			this.btnChangeKeyBinding.mouseReleased(i, j);
-			this.btnReset.mouseReleased(i, j);
+			if (var4 != 0 && var4 != 12345)
+				return;
+			boolean touchMode = PointerInputAbstraction.isTouchMode();
+			if (!touchMode || (this.btnChangeKeyBinding.isSliderTouchEvents() == (var4 == 12345)))
+				this.btnChangeKeyBinding.mouseReleased(i, j);
+			if (!touchMode || (this.btnReset.isSliderTouchEvents() == (var4 == 12345)))
+				this.btnReset.mouseReleased(i, j);
 		}
 
 		public void setSelected(int var1, int var2, int var3) {
diff --git a/src/main/java/net/minecraft/client/gui/GuiLabel.java b/src/game/java/net/minecraft/client/gui/GuiLabel.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiLabel.java
rename to src/game/java/net/minecraft/client/gui/GuiLabel.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiLanguage.java b/src/game/java/net/minecraft/client/gui/GuiLanguage.java
similarity index 94%
rename from src/main/java/net/minecraft/client/gui/GuiLanguage.java
rename to src/game/java/net/minecraft/client/gui/GuiLanguage.java
index f0ec435..f62de6b 100755
--- a/src/main/java/net/minecraft/client/gui/GuiLanguage.java
+++ b/src/game/java/net/minecraft/client/gui/GuiLanguage.java
@@ -69,6 +69,11 @@ public class GuiLanguage extends GuiScreen {
 		this.list.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.list.handleTouchInput();
+	}
+
 	/**+
 	 * Called by the controls from the buttonList when activated.
 	 * (Mouse pressed for buttons)
@@ -86,7 +91,7 @@ public class GuiLanguage extends GuiScreen {
 					this.game_settings_3.setOptionValue(((GuiOptionButton) parGuiButton).returnEnumOptions(), 1);
 					parGuiButton.displayString = this.game_settings_3
 							.getKeyBinding(GameSettings.Options.FORCE_UNICODE_FONT);
-					ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+					ScaledResolution scaledresolution = this.mc.scaledResolution;
 					int i = scaledresolution.getScaledWidth();
 					int j = scaledresolution.getScaledHeight();
 					this.setWorldAndResolution(this.mc, i, j);
diff --git a/src/main/java/net/minecraft/client/gui/GuiListButton.java b/src/game/java/net/minecraft/client/gui/GuiListButton.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiListButton.java
rename to src/game/java/net/minecraft/client/gui/GuiListButton.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiListExtended.java b/src/game/java/net/minecraft/client/gui/GuiListExtended.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiListExtended.java
rename to src/game/java/net/minecraft/client/gui/GuiListExtended.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiLockIconButton.java b/src/game/java/net/minecraft/client/gui/GuiLockIconButton.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiLockIconButton.java
rename to src/game/java/net/minecraft/client/gui/GuiLockIconButton.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiMainMenu.java b/src/game/java/net/minecraft/client/gui/GuiMainMenu.java
similarity index 97%
rename from src/main/java/net/minecraft/client/gui/GuiMainMenu.java
rename to src/game/java/net/minecraft/client/gui/GuiMainMenu.java
index a9cb794..8a470b8 100755
--- a/src/main/java/net/minecraft/client/gui/GuiMainMenu.java
+++ b/src/game/java/net/minecraft/client/gui/GuiMainMenu.java
@@ -256,7 +256,7 @@ public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback {
 			backgroundTexture = this.mc.getTextureManager().getDynamicTextureLocation("background", viewportTexture);
 		}
 		this.updateCheckerOverlay.setResolution(mc, width, height);
-		Calendar calendar = EagRuntime.getLocaleCalendar();
+		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(new Date());
 		if (calendar.get(2) + 1 == 12 && calendar.get(5) == 24) {
 			this.splashText = "Merry X-mas!";
diff --git a/src/main/java/net/minecraft/client/gui/GuiMemoryErrorScreen.java b/src/game/java/net/minecraft/client/gui/GuiMemoryErrorScreen.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiMemoryErrorScreen.java
rename to src/game/java/net/minecraft/client/gui/GuiMemoryErrorScreen.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiMerchant.java b/src/game/java/net/minecraft/client/gui/GuiMerchant.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiMerchant.java
rename to src/game/java/net/minecraft/client/gui/GuiMerchant.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiMultiplayer.java b/src/game/java/net/minecraft/client/gui/GuiMultiplayer.java
similarity index 93%
rename from src/main/java/net/minecraft/client/gui/GuiMultiplayer.java
rename to src/game/java/net/minecraft/client/gui/GuiMultiplayer.java
index ab08686..20b6cbc 100755
--- a/src/main/java/net/minecraft/client/gui/GuiMultiplayer.java
+++ b/src/game/java/net/minecraft/client/gui/GuiMultiplayer.java
@@ -5,9 +5,11 @@ import java.io.IOException;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglerXBungeeVersion;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.cookie.ServerCookieDataStore;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -116,6 +118,11 @@ public class GuiMultiplayer extends GuiScreen implements GuiYesNoCallback {
 		this.serverListSelector.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.serverListSelector.handleTouchInput();
+	}
+
 	public void createButtons() {
 		this.buttonList.add(this.btnEditServer = new GuiButton(7, this.width / 2 - 154, this.height - 28, 70, 20,
 				I18n.format("selectServer.edit", new Object[0])));
@@ -196,7 +203,7 @@ public class GuiMultiplayer extends GuiScreen implements GuiYesNoCallback {
 			} else if (parGuiButton.id == 0) {
 				this.mc.displayGuiScreen(this.parentScreen);
 			} else if (parGuiButton.id == 8) {
-				long millis = System.currentTimeMillis();
+				long millis = EagRuntime.steadyTimeMillis();
 				if (millis - lastRefreshCommit > 700l) {
 					lastRefreshCommit = millis;
 					this.refreshServerList();
@@ -221,7 +228,7 @@ public class GuiMultiplayer extends GuiScreen implements GuiYesNoCallback {
 				this.serverListSelector.setSelectedSlotIndex(-1);
 				this.serverListSelector.func_148195_a(this.savedServerList);
 			}
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			if (millis - lastRefreshCommit > 700l) {
 				lastRefreshCommit = millis;
 				this.refreshServerList();
@@ -236,12 +243,15 @@ public class GuiMultiplayer extends GuiScreen implements GuiYesNoCallback {
 		} else if (this.addingServer) {
 			this.addingServer = false;
 			if (flag) {
+				if (!this.selectedServer.enableCookies) {
+					ServerCookieDataStore.clearCookie(this.selectedServer.serverIP);
+				}
 				this.savedServerList.addServerData(this.selectedServer);
 				this.savedServerList.saveServerList();
 				this.serverListSelector.setSelectedSlotIndex(-1);
 				this.serverListSelector.func_148195_a(this.savedServerList);
 			}
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			if (millis - lastRefreshCommit > 700l) {
 				lastRefreshCommit = millis;
 				this.refreshServerList();
@@ -252,11 +262,14 @@ public class GuiMultiplayer extends GuiScreen implements GuiYesNoCallback {
 				ServerData serverdata = ((ServerListEntryNormal) guilistextended$iguilistentry).getServerData();
 				serverdata.serverName = this.selectedServer.serverName;
 				serverdata.serverIP = this.selectedServer.serverIP;
+				if (serverdata.enableCookies && !this.selectedServer.enableCookies) {
+					ServerCookieDataStore.clearCookie(this.selectedServer.serverIP);
+				}
 				serverdata.copyFrom(this.selectedServer);
 				this.savedServerList.saveServerList();
 				this.serverListSelector.func_148195_a(this.savedServerList);
 			}
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			if (millis - lastRefreshCommit > 700l) {
 				lastRefreshCommit = millis;
 				this.refreshServerList();
@@ -337,6 +350,7 @@ public class GuiMultiplayer extends GuiScreen implements GuiYesNoCallback {
 		drawPluginDownloadLink(i, j);
 		if (this.hoveringText != null) {
 			this.drawHoveringText(Lists.newArrayList(Splitter.on("\n").split(this.hoveringText)), i, j);
+			GlStateManager.disableLighting();
 		}
 	}
 
diff --git a/src/main/java/net/minecraft/client/gui/GuiNewChat.java b/src/game/java/net/minecraft/client/gui/GuiNewChat.java
similarity index 96%
rename from src/main/java/net/minecraft/client/gui/GuiNewChat.java
rename to src/game/java/net/minecraft/client/gui/GuiNewChat.java
index 422631f..5047cfa 100755
--- a/src/main/java/net/minecraft/client/gui/GuiNewChat.java
+++ b/src/game/java/net/minecraft/client/gui/GuiNewChat.java
@@ -241,7 +241,7 @@ public class GuiNewChat extends Gui {
 		if (!this.getChatOpen()) {
 			return null;
 		} else {
-			ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+			ScaledResolution scaledresolution = mc.scaledResolution;
 			int i = scaledresolution.getScaleFactor();
 			float f = this.getChatScale();
 			int j = parInt1 / i - 3;
diff --git a/src/main/java/net/minecraft/client/gui/GuiOptionButton.java b/src/game/java/net/minecraft/client/gui/GuiOptionButton.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiOptionButton.java
rename to src/game/java/net/minecraft/client/gui/GuiOptionButton.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiOptionSlider.java b/src/game/java/net/minecraft/client/gui/GuiOptionSlider.java
similarity index 94%
rename from src/main/java/net/minecraft/client/gui/GuiOptionSlider.java
rename to src/game/java/net/minecraft/client/gui/GuiOptionSlider.java
index 39486b7..0c97f19 100755
--- a/src/main/java/net/minecraft/client/gui/GuiOptionSlider.java
+++ b/src/game/java/net/minecraft/client/gui/GuiOptionSlider.java
@@ -26,7 +26,7 @@ import net.minecraft.util.MathHelper;
  * 
  */
 public class GuiOptionSlider extends GuiButton {
-	private float sliderValue;
+	public float sliderValue;
 	public boolean dragging;
 	private GameSettings.Options options;
 	private final float field_146132_r;
@@ -48,6 +48,10 @@ public class GuiOptionSlider extends GuiButton {
 		this.displayString = minecraft.gameSettings.getKeyBinding(parOptions);
 	}
 
+	public GameSettings.Options getEnumOptions() {
+		return options;
+	}
+
 	/**+
 	 * Returns 0 if the button is disabled, 1 if the mouse is NOT
 	 * hovering over this button and 2 if it IS hovering over this
@@ -105,4 +109,8 @@ public class GuiOptionSlider extends GuiButton {
 	public void mouseReleased(int var1, int var2) {
 		this.dragging = false;
 	}
+
+	public boolean isSliderTouchEvents() {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiOptions.java b/src/game/java/net/minecraft/client/gui/GuiOptions.java
similarity index 78%
rename from src/main/java/net/minecraft/client/gui/GuiOptions.java
rename to src/game/java/net/minecraft/client/gui/GuiOptions.java
index aba07c9..fdae380 100755
--- a/src/main/java/net/minecraft/client/gui/GuiOptions.java
+++ b/src/game/java/net/minecraft/client/gui/GuiOptions.java
@@ -2,14 +2,22 @@ package net.minecraft.client.gui;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.GuiScreenEnterBootMenu;
+import net.lax1dude.eaglercraft.v1_8.cookie.GuiScreenRevokeSessionToken;
+import net.lax1dude.eaglercraft.v1_8.cookie.ServerCookieDataStore;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType;
+import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.EaglerDeferredPipeline;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.gui.GuiShaderConfig;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.gui.GuiShadersNotSupported;
 import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenImportExportProfile;
+import net.lax1dude.eaglercraft.v1_8.recording.GuiScreenRecordingNote;
+import net.lax1dude.eaglercraft.v1_8.recording.GuiScreenRecordingSettings;
+import net.lax1dude.eaglercraft.v1_8.recording.ScreenRecordingController;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.resources.I18n;
@@ -105,9 +113,10 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback {
 				I18n.format("shaders.gui.optionsButton")));
 		this.buttonList.add(new GuiButton(106, this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20,
 				I18n.format("options.sounds", new Object[0])));
+		boolean support = ScreenRecordingController.isSupported();
 		this.buttonList.add(broadcastSettings = new GuiButton(107, this.width / 2 + 5, this.height / 6 + 72 - 6, 150,
-				20, I18n.format(EagRuntime.getRecText(), new Object[0])));
-		broadcastSettings.enabled = EagRuntime.recSupported();
+				20, I18n.format(support ? "options.screenRecording.button" : "options.screenRecording.unsupported")));
+		broadcastSettings.enabled = support;
 		this.buttonList.add(new GuiButton(101, this.width / 2 - 155, this.height / 6 + 96 - 6, 150, 20,
 				I18n.format("options.video", new Object[0])));
 		this.buttonList.add(new GuiButton(100, this.width / 2 + 5, this.height / 6 + 96 - 6, 150, 20,
@@ -231,8 +240,13 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback {
 			}
 
 			if (parGuiButton.id == 107) {
-				EagRuntime.toggleRec();
-				broadcastSettings.displayString = I18n.format(EagRuntime.getRecText(), new Object[0]);
+				if (ScreenRecordingController.isSupported()) {
+					GuiScreen screen = new GuiScreenRecordingSettings(this);
+					if (!GuiScreenRecordingNote.hasShown) {
+						screen = new GuiScreenRecordingNote(screen);
+					}
+					this.mc.displayGuiScreen(screen);
+				}
 			}
 
 			if (parGuiButton.id == 104) {
@@ -253,6 +267,7 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback {
 			GlStateManager.pushMatrix();
 			GlStateManager.scale(0.75f, 0.75f, 0.75f);
 			GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+
 			String text = I18n.format("editProfile.importExport");
 
 			int w = mc.fontRendererObj.getStringWidth(text);
@@ -266,9 +281,43 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback {
 			GlStateManager.popMatrix();
 		}
 
+		if (mc.theWorld == null && EagRuntime.getConfiguration().isAllowBootMenu()) {
+			drawCenteredString(mc.fontRendererObj, I18n.format("options.pressDeleteText"), width / 2, height / 6 + 22,
+					11184810);
+		}
+
+		if (EagRuntime.getConfiguration().isEnableServerCookies() && mc.thePlayer == null) {
+			GlStateManager.pushMatrix();
+			GlStateManager.scale(0.75f, 0.75f, 0.75f);
+			GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+
+			String text = I18n.format("revokeSessionToken.button");
+
+			int w = mc.fontRendererObj.getStringWidth(text);
+			boolean hover = i > width - 5 - (w + 5) * 3 / 4 && j > 1 && i < width - 2 && j < 12;
+			if (hover) {
+				Mouse.showCursor(EnumCursorType.HAND);
+			}
+
+			drawString(mc.fontRendererObj, EnumChatFormatting.UNDERLINE + text, (width - 1) * 4 / 3 - w - 5, 5,
+					hover ? 0xFFEEEE22 : 0xFFCCCCCC);
+
+			GlStateManager.popMatrix();
+		}
+
 		super.drawScreen(i, j, f);
 	}
 
+	@Override
+	protected void keyTyped(char parChar1, int parInt1) {
+		super.keyTyped(parChar1, parInt1);
+		if (parInt1 == KeyboardConstants.KEY_DELETE || parInt1 == KeyboardConstants.KEY_BACK) {
+			if (mc.theWorld == null && EagRuntime.getConfiguration().isAllowBootMenu()) {
+				mc.displayGuiScreen(new GuiScreenEnterBootMenu(this));
+			}
+		}
+	}
+
 	protected void mouseClicked(int mx, int my, int button) {
 		super.mouseClicked(mx, my, button);
 		if (mc.theWorld == null && !EagRuntime.getConfiguration().isDemo()) {
@@ -279,5 +328,16 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback {
 						.playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
 			}
 		}
+		if (EagRuntime.getConfiguration().isEnableServerCookies() && mc.thePlayer == null) {
+			int w = mc.fontRendererObj.getStringWidth(I18n.format("revokeSessionToken.button"));
+			if (mx > width - 5 - (w + 5) * 3 / 4 && my > 1 && mx < width - 2 && my < 12) {
+				ServerCookieDataStore.flush();
+				mc.displayGuiScreen(ServerCookieDataStore.numRevokable() == 0
+						? new GuiScreenGenericErrorMessage("errorNoSessions.title", "errorNoSessions.desc", this)
+						: new GuiScreenRevokeSessionToken(this));
+				mc.getSoundHandler()
+						.playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiOptionsRowList.java b/src/game/java/net/minecraft/client/gui/GuiOptionsRowList.java
similarity index 68%
rename from src/main/java/net/minecraft/client/gui/GuiOptionsRowList.java
rename to src/game/java/net/minecraft/client/gui/GuiOptionsRowList.java
index a5129f3..3c674cf 100755
--- a/src/main/java/net/minecraft/client/gui/GuiOptionsRowList.java
+++ b/src/game/java/net/minecraft/client/gui/GuiOptionsRowList.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.GameSettings;
 
@@ -103,7 +104,11 @@ public class GuiOptionsRowList extends GuiListExtended {
 		}
 
 		public boolean mousePressed(int var1, int i, int j, int var4, int var5, int var6) {
-			if (this.field_148323_b.mousePressed(this.field_148325_a, i, j)) {
+			if (var4 != 0 && var4 != 12345)
+				return false;
+			boolean touchMode = PointerInputAbstraction.isTouchMode();
+			if ((!touchMode || (this.field_148323_b.isSliderTouchEvents() == (var4 == 12345)))
+					&& this.field_148323_b.mousePressed(this.field_148325_a, i, j)) {
 				if (this.field_148323_b instanceof GuiOptionButton) {
 					this.field_148325_a.gameSettings
 							.setOptionValue(((GuiOptionButton) this.field_148323_b).returnEnumOptions(), 1);
@@ -112,7 +117,9 @@ public class GuiOptionsRowList extends GuiListExtended {
 				}
 
 				return true;
-			} else if (this.field_148324_c != null && this.field_148324_c.mousePressed(this.field_148325_a, i, j)) {
+			} else if (this.field_148324_c != null
+					&& (!touchMode || (this.field_148324_c.isSliderTouchEvents() == (var4 == 12345)))
+					&& this.field_148324_c.mousePressed(this.field_148325_a, i, j)) {
 				if (this.field_148324_c instanceof GuiOptionButton) {
 					this.field_148325_a.gameSettings
 							.setOptionValue(((GuiOptionButton) this.field_148324_c).returnEnumOptions(), 1);
@@ -127,11 +134,16 @@ public class GuiOptionsRowList extends GuiListExtended {
 		}
 
 		public void mouseReleased(int var1, int i, int j, int var4, int var5, int var6) {
-			if (this.field_148323_b != null) {
+			if (var4 != 0 && var4 != 12345)
+				return;
+			boolean touchMode = PointerInputAbstraction.isTouchMode();
+			if (this.field_148323_b != null
+					&& (!touchMode || (this.field_148323_b.isSliderTouchEvents() == (var4 == 12345)))) {
 				this.field_148323_b.mouseReleased(i, j);
 			}
 
-			if (this.field_148324_c != null) {
+			if (this.field_148324_c != null
+					&& (!touchMode || (this.field_148324_c.isSliderTouchEvents() == (var4 == 12345)))) {
 				this.field_148324_c.mouseReleased(i, j);
 			}
 
@@ -140,4 +152,49 @@ public class GuiOptionsRowList extends GuiListExtended {
 		public void setSelected(int var1, int var2, int var3) {
 		}
 	}
+
+	public GuiOptionButton getButtonFor(GameSettings.Options enumOption) {
+		for (Row r : field_148184_k) {
+			if (r.field_148323_b != null) {
+				if (r.field_148323_b instanceof GuiOptionButton) {
+					GuiOptionButton btn = (GuiOptionButton) r.field_148323_b;
+					if (btn.returnEnumOptions() == enumOption) {
+						return btn;
+					}
+				}
+			}
+			if (r.field_148324_c != null) {
+				if (r.field_148324_c instanceof GuiOptionButton) {
+					GuiOptionButton btn = (GuiOptionButton) r.field_148324_c;
+					if (btn.returnEnumOptions() == enumOption) {
+						return btn;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	public GuiOptionSlider getSliderFor(GameSettings.Options enumOption) {
+		for (Row r : field_148184_k) {
+			if (r.field_148323_b != null) {
+				if (r.field_148323_b instanceof GuiOptionSlider) {
+					GuiOptionSlider btn = (GuiOptionSlider) r.field_148323_b;
+					if (btn.getEnumOptions() == enumOption) {
+						return btn;
+					}
+				}
+			}
+			if (r.field_148324_c != null) {
+				if (r.field_148324_c instanceof GuiOptionSlider) {
+					GuiOptionSlider btn = (GuiOptionSlider) r.field_148324_c;
+					if (btn.getEnumOptions() == enumOption) {
+						return btn;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java b/src/game/java/net/minecraft/client/gui/GuiOverlayDebug.java
similarity index 93%
rename from src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java
rename to src/game/java/net/minecraft/client/gui/GuiOverlayDebug.java
index 0bb6f9f..ce4298e 100755
--- a/src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java
+++ b/src/game/java/net/minecraft/client/gui/GuiOverlayDebug.java
@@ -9,6 +9,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
+
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.TimeZone;
 
 import com.google.common.base.Strings;
@@ -75,7 +78,6 @@ public class GuiOverlayDebug extends Gui {
 		playerOffset = 0;
 		int ww = scaledResolutionIn.getScaledWidth();
 		int hh = scaledResolutionIn.getScaledHeight();
-		this.mc.mcProfiler.startSection("debug");
 		if (this.mc.gameSettings.showDebugInfo) {
 			GlStateManager.pushMatrix();
 			this.renderDebugInfoLeft();
@@ -122,8 +124,6 @@ public class GuiOverlayDebug extends Gui {
 				GlStateManager.disableBlend();
 			}
 		}
-
-		this.mc.mcProfiler.endSection();
 	}
 
 	private void drawFPS(int x, int y) {
@@ -220,7 +220,6 @@ public class GuiOverlayDebug extends Gui {
 		final double dticks = ticks - minutes * ticksPerMinute;
 		final long seconds = (long) Math.floor(dticks / ticksPerSecond);
 
-		// TODO: why does desktop JRE not apply "GMT" correctly?
 		final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ENGLISH);
 
 		cal.setLenient(true);
@@ -230,10 +229,10 @@ public class GuiOverlayDebug extends Gui {
 		cal.add(Calendar.MINUTE, (int) minutes);
 		cal.add(Calendar.SECOND, (int) seconds + 1);
 
+		SimpleDateFormat fmt = this.mc.gameSettings.hud24h ? SDFTwentyFour : SDFTwelve;
+		fmt.setCalendar(cal);
 		String timeString = EnumChatFormatting.WHITE + "Day " + ((totalTicks + 30000l) / 24000l) + " ("
-				+ EnumChatFormatting.YELLOW
-				+ (this.mc.gameSettings.hud24h ? SDFTwentyFour : SDFTwelve).format(cal.getTime())
-				+ EnumChatFormatting.WHITE + ")";
+				+ EnumChatFormatting.YELLOW + fmt.format(cal.getTime()) + EnumChatFormatting.WHITE + ")";
 
 		Entity e = mc.getRenderViewEntity();
 		BlockPos blockpos = new BlockPos(e.posX, MathHelper.clamp_double(e.getEntityBoundingBox().minY, 0.0D, 254.0D),
@@ -279,23 +278,30 @@ public class GuiOverlayDebug extends Gui {
 			if (tpsAge < 20000l) {
 				int color = tpsAge > 2000l ? 0x777777 : 0xFFFFFF;
 				List<String> strs = SingleplayerServerController.getTPS();
+				if (SingleplayerServerController.isRunningSingleThreadMode()) {
+					strs = Lists.newArrayList(strs);
+					strs.add("");
+					strs.add(I18n.format("singleplayer.tpscounter.singleThreadMode"));
+				}
 				int l;
 				boolean first = true;
 				for (int j = 0, m = strs.size(); j < m; ++j) {
 					String str = strs.get(j);
-					l = (int) (this.fontRenderer.getStringWidth(str) * (!first ? 0.5f : 1.0f));
-					GlStateManager.pushMatrix();
-					GlStateManager.translate(parScaledResolution.getScaledWidth() - 2 - l, i + 2, 0.0f);
-					if (!first) {
-						GlStateManager.scale(0.5f, 0.5f, 0.5f);
+					if (!StringUtils.isAllEmpty(str)) {
+						l = (int) (this.fontRenderer.getStringWidth(str) * (!first ? 0.5f : 1.0f));
+						GlStateManager.pushMatrix();
+						GlStateManager.translate(parScaledResolution.getScaledWidth() - 2 - l, i + 2, 0.0f);
+						if (!first) {
+							GlStateManager.scale(0.5f, 0.5f, 0.5f);
+						}
+						this.fontRenderer.drawStringWithShadow(str, 0, 0, color);
+						GlStateManager.popMatrix();
+						if (color == 0xFFFFFF) {
+							color = 14737632;
+						}
 					}
-					this.fontRenderer.drawStringWithShadow(str, 0, 0, color);
-					GlStateManager.popMatrix();
 					i += (int) (this.fontRenderer.FONT_HEIGHT * (!first ? 0.5f : 1.0f));
 					first = false;
-					if (color == 0xFFFFFF) {
-						color = 14737632;
-					}
 				}
 			}
 		}
@@ -484,7 +490,7 @@ public class GuiOverlayDebug extends Gui {
 		int i = frametimer.func_181749_a();
 		int j = frametimer.func_181750_b();
 		long[] along = frametimer.func_181746_c();
-		ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+		ScaledResolution scaledresolution = this.mc.scaledResolution;
 		int k = i;
 		int l = 0;
 		drawRect(0, scaledresolution.getScaledHeight() - 60, 240, scaledresolution.getScaledHeight(), -1873784752);
diff --git a/src/main/java/net/minecraft/client/gui/GuiPageButtonList.java b/src/game/java/net/minecraft/client/gui/GuiPageButtonList.java
similarity index 90%
rename from src/main/java/net/minecraft/client/gui/GuiPageButtonList.java
rename to src/game/java/net/minecraft/client/gui/GuiPageButtonList.java
index 79b4db2..68c937a 100755
--- a/src/main/java/net/minecraft/client/gui/GuiPageButtonList.java
+++ b/src/game/java/net/minecraft/client/gui/GuiPageButtonList.java
@@ -7,6 +7,8 @@ import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
 
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.IntHashMap;
 
@@ -332,6 +334,21 @@ public class GuiPageButtonList extends GuiListExtended {
 		return super.getScrollBarX() + 32;
 	}
 
+	public boolean isTextFieldFocused() {
+		for (GuiTextField txt : field_178072_w) {
+			if (txt.isFocused()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		for (GuiTextField txt : field_178072_w) {
+			txt.fireInputEvent(event, param);
+		}
+	}
+
 	public static class EditBoxEntry extends GuiPageButtonList.GuiListEntry {
 		private final Predicate<String> field_178951_a;
 
@@ -425,11 +442,24 @@ public class GuiPageButtonList extends GuiListExtended {
 		}
 
 		public boolean mousePressed(int var1, int i, int j, int k, int var5, int var6) {
-			boolean flag = this.func_178026_a(this.field_178029_b, i, j, k);
-			boolean flag1 = this.func_178026_a(this.field_178030_c, i, j, k);
+			if (k != 0 && k != 12345)
+				return false;
+			boolean touchMode = PointerInputAbstraction.isTouchMode();
+			boolean flag = this.field_178029_b != null && (!touchMode || stupidCheck(this.field_178029_b, k))
+					&& this.func_178026_a(this.field_178029_b, i, j, k);
+			boolean flag1 = this.field_178030_c != null && (!touchMode || stupidCheck(this.field_178030_c, k))
+					&& this.func_178026_a(this.field_178030_c, i, j, k);
 			return flag || flag1;
 		}
 
+		private static boolean stupidCheck(Gui gui, int k) {
+			if (gui instanceof GuiButton) {
+				return ((GuiButton) gui).isSliderTouchEvents() == (k == 12345);
+			} else {
+				return k != 12345;
+			}
+		}
+
 		private boolean func_178026_a(Gui parGui, int parInt1, int parInt2, int parInt3) {
 			if (parGui == null) {
 				return false;
@@ -462,8 +492,13 @@ public class GuiPageButtonList extends GuiListExtended {
 		}
 
 		public void mouseReleased(int var1, int i, int j, int k, int var5, int var6) {
-			this.func_178016_b(this.field_178029_b, i, j, k);
-			this.func_178016_b(this.field_178030_c, i, j, k);
+			if (k != 0 && k != 12345)
+				return;
+			boolean touchMode = PointerInputAbstraction.isTouchMode();
+			if (!touchMode || stupidCheck(field_178029_b, k))
+				this.func_178016_b(this.field_178029_b, i, j, k);
+			if (!touchMode || stupidCheck(field_178030_c, k))
+				this.func_178016_b(this.field_178030_c, i, j, k);
 		}
 
 		private void func_178016_b(Gui parGui, int parInt1, int parInt2, int parInt3) {
diff --git a/src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java b/src/game/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java
similarity index 96%
rename from src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java
rename to src/game/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java
index 3f664d9..7233bb3 100755
--- a/src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java
+++ b/src/game/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java
@@ -64,9 +64,10 @@ public class GuiPlayerTabOverlay extends Gui {
 	 * supplied
 	 */
 	public String getPlayerName(NetworkPlayerInfo networkPlayerInfoIn) {
-		return networkPlayerInfoIn.getDisplayName() != null ? networkPlayerInfoIn.getDisplayName().getFormattedText()
+		IChatComponent dname = networkPlayerInfoIn.getDisplayNameProfanityFilter();
+		return dname != null ? dname.getFormattedText()
 				: ScorePlayerTeam.formatPlayerName(networkPlayerInfoIn.getPlayerTeam(),
-						networkPlayerInfoIn.getGameProfile().getName());
+						networkPlayerInfoIn.getGameProfileNameProfanityFilter());
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/client/gui/GuiRenameWorld.java b/src/game/java/net/minecraft/client/gui/GuiRenameWorld.java
similarity index 92%
rename from src/main/java/net/minecraft/client/gui/GuiRenameWorld.java
rename to src/game/java/net/minecraft/client/gui/GuiRenameWorld.java
index bdd4a54..7322d16 100755
--- a/src/main/java/net/minecraft/client/gui/GuiRenameWorld.java
+++ b/src/game/java/net/minecraft/client/gui/GuiRenameWorld.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.gui;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenIntegratedServerBusy;
 import net.minecraft.client.resources.I18n;
@@ -146,4 +147,15 @@ public class GuiRenameWorld extends GuiScreen {
 		this.field_146583_f.drawTextBox();
 		super.drawScreen(i, j, f);
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return field_146583_f.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		field_146583_f.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiRepair.java b/src/game/java/net/minecraft/client/gui/GuiRepair.java
similarity index 94%
rename from src/main/java/net/minecraft/client/gui/GuiRepair.java
rename to src/game/java/net/minecraft/client/gui/GuiRepair.java
index 091a23c..9167e7c 100755
--- a/src/main/java/net/minecraft/client/gui/GuiRepair.java
+++ b/src/game/java/net/minecraft/client/gui/GuiRepair.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -228,4 +229,15 @@ public class GuiRepair extends GuiContainer implements ICrafting {
 	public boolean blockPTTKey() {
 		return nameField.isFocused();
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return nameField.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		nameField.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiResourcePackAvailable.java b/src/game/java/net/minecraft/client/gui/GuiResourcePackAvailable.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiResourcePackAvailable.java
rename to src/game/java/net/minecraft/client/gui/GuiResourcePackAvailable.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiResourcePackList.java b/src/game/java/net/minecraft/client/gui/GuiResourcePackList.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiResourcePackList.java
rename to src/game/java/net/minecraft/client/gui/GuiResourcePackList.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiResourcePackSelected.java b/src/game/java/net/minecraft/client/gui/GuiResourcePackSelected.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiResourcePackSelected.java
rename to src/game/java/net/minecraft/client/gui/GuiResourcePackSelected.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreen.java b/src/game/java/net/minecraft/client/gui/GuiScreen.java
similarity index 68%
rename from src/main/java/net/minecraft/client/gui/GuiScreen.java
rename to src/game/java/net/minecraft/client/gui/GuiScreen.java
index ba9f005..b4ab207 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreen.java
+++ b/src/game/java/net/minecraft/client/gui/GuiScreen.java
@@ -1,11 +1,16 @@
 package net.minecraft.client.gui;
 
+import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
+import net.lax1dude.eaglercraft.v1_8.internal.EnumTouchEvent;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Splitter;
@@ -16,11 +21,17 @@ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglerXBungeeVersion;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PauseMenuCustomizeState;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
+import net.lax1dude.eaglercraft.v1_8.Touch;
 import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
+import net.lax1dude.eaglercraft.v1_8.touch_gui.TouchControls;
+import net.lax1dude.eaglercraft.v1_8.webview.GuiScreenServerInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.RenderHelper;
@@ -41,6 +52,7 @@ import net.minecraft.stats.StatList;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -80,13 +92,17 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	protected List<GuiLabel> labelList = Lists.newArrayList();
 	public boolean allowUserInput;
 	protected FontRenderer fontRendererObj;
-	private GuiButton selectedButton;
+	protected GuiButton selectedButton;
 	private int eventButton;
 	private long lastMouseEvent;
 	private int touchValue;
 	private String clickedLinkURI;
 	protected long showingCloseKey = 0;
 
+	protected int touchModeCursorPosX = -1;
+	protected int touchModeCursorPosY = -1;
+	private long lastTouchEvent;
+
 	/**+
 	 * Draws the screen and all the components in it. Args : mouseX,
 	 * mouseY, renderPartialTicks
@@ -100,7 +116,7 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 			((GuiLabel) this.labelList.get(l)).drawLabel(this.mc, i, j);
 		}
 
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		long closeKeyTimeout = millis - showingCloseKey;
 		if (closeKeyTimeout < 3000l) {
 			int alpha1 = 0xC0000000;
@@ -147,6 +163,8 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	 * on the key), keyCode (lwjgl Keyboard key code)
 	 */
 	protected void keyTyped(char parChar1, int parInt1) {
+		if (!canCloseGui())
+			return;
 		if (((this.mc.theWorld == null || this.mc.thePlayer.getHealth() <= 0.0F) && parInt1 == 1)
 				|| parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode()
 				|| (parInt1 == 1 && (this.mc.gameSettings.keyBindClose.getKeyCode() == 0 || this.mc.areKeysLocked()))) {
@@ -155,7 +173,7 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 				this.mc.setIngameFocus();
 			}
 		} else if (parInt1 == 1) {
-			showingCloseKey = System.currentTimeMillis();
+			showingCloseKey = EagRuntime.steadyTimeMillis();
 		}
 	}
 
@@ -176,7 +194,11 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	}
 
 	protected void renderToolTip(ItemStack itemstack, int i, int j) {
-		List list = itemstack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
+		renderToolTip0(itemstack, i, j, false);
+	}
+
+	protected void renderToolTip0(ItemStack itemstack, int i, int j, boolean eagler) {
+		List list = itemstack.getTooltipProfanityFilter(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
 
 		for (int k = 0, l = list.size(); k < l; ++k) {
 			if (k == 0) {
@@ -186,7 +208,7 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 			}
 		}
 
-		this.drawHoveringText(list, i, j);
+		this.drawHoveringText0(list, i, j, eagler);
 	}
 
 	/**+
@@ -203,6 +225,10 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	 * a seperate line.
 	 */
 	protected void drawHoveringText(List<String> list, int i, int j) {
+		drawHoveringText0(list, i, j, false);
+	}
+
+	protected void drawHoveringText0(List<String> list, int i, int j, boolean eagler) {
 		if (!list.isEmpty()) {
 			GlStateManager.disableRescaleNormal();
 			RenderHelper.disableStandardItemLighting();
@@ -217,19 +243,26 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 				}
 			}
 
-			int j2 = i + 12;
-			int k2 = j - 12;
+			int j2 = i;
+			int k2 = j;
 			int i1 = 8;
 			if (list.size() > 1) {
 				i1 += 2 + (list.size() - 1) * 10;
 			}
 
-			if (j2 + k > this.width) {
-				j2 -= 28 + k;
-			}
+			if (!eagler) {
+				j2 += 12;
+				k2 -= 12;
 
-			if (k2 + i1 + 6 > this.height) {
-				k2 = this.height - i1 - 6;
+				if (j2 + k > this.width) {
+					j2 -= 28 + k;
+				}
+
+				if (k2 + i1 + 6 > this.height) {
+					k2 = this.height - i1 - 6;
+				}
+			} else {
+				j2 -= (k + 3) >> 1;
 			}
 
 			this.zLevel = 300.0F;
@@ -271,7 +304,7 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	/**+
 	 * Draws the hover event specified by the given chat component
 	 */
-	protected void handleComponentHover(IChatComponent parIChatComponent, int parInt1, int parInt2) {
+	public void handleComponentHover(IChatComponent parIChatComponent, int parInt1, int parInt2) {
 		if (parIChatComponent != null && parIChatComponent.getChatStyle().getChatHoverEvent() != null) {
 			HoverEvent hoverevent = parIChatComponent.getChatStyle().getChatHoverEvent();
 			if (hoverevent.getAction() == HoverEvent.Action.SHOW_ITEM) {
@@ -355,7 +388,7 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	 * Executes the click event specified by the given chat
 	 * component
 	 */
-	protected boolean handleComponentClick(IChatComponent parIChatComponent) {
+	public boolean handleComponentClick(IChatComponent parIChatComponent) {
 		if (parIChatComponent == null) {
 			return false;
 		} else {
@@ -421,14 +454,39 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 		this.mc.thePlayer.sendChatMessage(msg);
 	}
 
+	protected void touchStarted(int parInt1, int parInt2, int parInt3) {
+		if (shouldTouchGenerateMouseEvents()) {
+			this.mouseClicked(parInt1, parInt2, 12345);
+		}
+	}
+
+	protected void touchTapped(int parInt1, int parInt2, int parInt3) {
+		if (shouldTouchGenerateMouseEvents()) {
+			this.mouseClicked(parInt1, parInt2, 0);
+			this.mouseReleased(parInt1, parInt2, 0);
+		}
+	}
+
+	protected void touchMoved(int parInt1, int parInt2, int parInt3) {
+	}
+
+	protected void touchEndMove(int parInt1, int parInt2, int parInt3) {
+		if (shouldTouchGenerateMouseEvents()) {
+			this.mouseReleased(parInt1, parInt2, 12345);
+		}
+	}
+
 	/**+
 	 * Called when the mouse is clicked. Args : mouseX, mouseY,
 	 * clickedButton
 	 */
 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
-		if (parInt3 == 0) {
+		boolean touchMode = PointerInputAbstraction.isTouchMode();
+		if (parInt3 == 0 || parInt3 == 12345) {
 			for (int i = 0; i < this.buttonList.size(); ++i) {
 				GuiButton guibutton = (GuiButton) this.buttonList.get(i);
+				if (touchMode && (parInt3 == 12345) != guibutton.isSliderTouchEvents())
+					continue;
 				if (guibutton.mousePressed(this.mc, parInt1, parInt2)) {
 					this.selectedButton = guibutton;
 					guibutton.playPressSound(this.mc.getSoundHandler());
@@ -444,7 +502,8 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	 * mouseY, releaseButton
 	 */
 	protected void mouseReleased(int i, int j, int k) {
-		if (this.selectedButton != null && k == 0) {
+		if (this.selectedButton != null && (k == 0 || k == 12345)
+				&& (!PointerInputAbstraction.isTouchMode() || (k == 12345) == selectedButton.isSliderTouchEvents())) {
 			this.selectedButton.mouseReleased(i, j);
 			this.selectedButton = null;
 		}
@@ -492,9 +551,18 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	 * Delegates mouse and keyboard input.
 	 */
 	public void handleInput() throws IOException {
+		boolean noTouch = true;
+		while (Touch.next()) {
+			noTouch = false;
+			this.handleTouchInput();
+			TouchControls.handleInput();
+		}
+
 		if (Mouse.isCreated()) {
 			while (Mouse.next()) {
-				this.handleMouseInput();
+				if (noTouch) {
+					this.handleMouseInput();
+				}
 			}
 		}
 
@@ -506,14 +574,101 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 
 	}
 
+	public final Map<Integer, int[]> touchStarts = new HashMap<>();
+
+	/**
+	 * Handles touch input.
+	 */
+	public void handleTouchInput() throws IOException {
+		EnumTouchEvent et = Touch.getEventType();
+		if (et == EnumTouchEvent.TOUCHSTART) {
+			PointerInputAbstraction.enterTouchModeHook();
+		}
+		float scaleFac = getEaglerScale();
+		for (int t = 0, c = Touch.getEventTouchPointCount(); t < c; ++t) {
+			int u = Touch.getEventTouchPointUID(t);
+			int i = Touch.getEventTouchX(t);
+			int j = Touch.getEventTouchY(t);
+			if (et == EnumTouchEvent.TOUCHSTART) {
+				if (TouchControls.handleTouchBegin(u, i, j)) {
+					continue;
+				}
+			} else if (et == EnumTouchEvent.TOUCHEND) {
+				if (TouchControls.handleTouchEnd(u, i, j)) {
+					continue;
+				}
+			}
+			i = applyEaglerScale(scaleFac, i * this.width / this.mc.displayWidth, this.width);
+			j = applyEaglerScale(scaleFac, this.height - j * this.height / this.mc.displayHeight - 1, this.height);
+			float si = Touch.getEventTouchRadiusX(t) * this.width / this.mc.displayWidth / scaleFac;
+			if (si < 1.0f)
+				si = 1.0f;
+			float sj = Touch.getEventTouchRadiusY(t) * this.height / this.mc.displayHeight / scaleFac;
+			if (sj < 1.0f)
+				sj = 1.0f;
+			int[] ck = touchStarts.remove(u);
+			switch (et) {
+			case TOUCHSTART:
+				if (t == 0) {
+					touchModeCursorPosX = i;
+					touchModeCursorPosY = j;
+				}
+				lastTouchEvent = EagRuntime.steadyTimeMillis();
+				touchStarts.put(u, new int[] { i, j, 0 });
+				this.touchStarted(i, j, u);
+				break;
+			case TOUCHMOVE:
+				if (t == 0) {
+					touchModeCursorPosX = i;
+					touchModeCursorPosY = j;
+				}
+				if (ck != null && Math.abs(ck[0] - i) < si && Math.abs(ck[1] - j) < sj) {
+					touchStarts.put(u, ck);
+					break;
+				}
+				touchStarts.put(u, new int[] { i, j, (ck != null && isTouchDraggingStateLocked(u)) ? ck[2] : 1 });
+				this.touchMoved(i, j, u);
+				if (t == 0 && shouldTouchGenerateMouseEvents()) {
+					this.mouseClickMove(i, j, 0, EagRuntime.steadyTimeMillis() - lastTouchEvent);
+				}
+				break;
+			case TOUCHEND:
+				if (ck == null)
+					break;
+				if (t == 0) {
+					touchModeCursorPosX = -1;
+					touchModeCursorPosY = -1;
+				}
+				if (ck != null && ck[2] == 1) {
+					this.touchEndMove(i, j, u);
+				} else {
+					if (ck != null) {
+						i = ck[0];
+						j = ck[1];
+					}
+					this.touchTapped(i, j, u);
+				}
+				break;
+			}
+		}
+	}
+
+	public boolean isTouchPointDragging(int uid) {
+		int[] ret = touchStarts.get(uid);
+		return ret != null && ret[2] == 1;
+	}
+
 	/**+
 	 * Handles mouse input.
 	 */
 	public void handleMouseInput() throws IOException {
-		int i = Mouse.getEventX() * this.width / this.mc.displayWidth;
-		int j = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
+		float f = getEaglerScale();
+		int i = applyEaglerScale(f, Mouse.getEventX() * this.width / this.mc.displayWidth, this.width);
+		int j = applyEaglerScale(f, this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1,
+				this.height);
 		int k = Mouse.getEventButton();
 		if (Mouse.getEventButtonState()) {
+			PointerInputAbstraction.enterMouseModeHook();
 			if (this.mc.gameSettings.touchscreen && this.touchValue++ > 0) {
 				return;
 			}
@@ -567,9 +722,63 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 		this.drawWorldBackground(0);
 	}
 
+	protected boolean isPartOfPauseMenu() {
+		return false;
+	}
+
 	public void drawWorldBackground(int i) {
 		if (this.mc.theWorld != null) {
-			this.drawGradientRect(0, 0, this.width, this.height, -1072689136, -804253680);
+			boolean ingame = isPartOfPauseMenu();
+			ResourceLocation loc = (ingame && PauseMenuCustomizeState.icon_background_pause != null)
+					? PauseMenuCustomizeState.icon_background_pause
+					: PauseMenuCustomizeState.icon_background_all;
+			float aspect = (ingame && PauseMenuCustomizeState.icon_background_pause != null)
+					? 1.0f / PauseMenuCustomizeState.icon_background_pause_aspect
+					: 1.0f / PauseMenuCustomizeState.icon_background_all_aspect;
+			if (loc != null) {
+				GlStateManager.disableLighting();
+				GlStateManager.disableFog();
+				GlStateManager.enableBlend();
+				GlStateManager.disableAlpha();
+				GlStateManager.enableTexture2D();
+				GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+				Tessellator tessellator = Tessellator.getInstance();
+				WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+				this.mc.getTextureManager().bindTexture(loc);
+				GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+				float f = 64.0F;
+				worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+				worldrenderer.pos(0.0D, (double) this.height, 0.0D).tex(0.0D, (double) ((float) this.height / f))
+						.color(64, 64, 64, 192).endVertex();
+				worldrenderer.pos((double) this.width, (double) this.height, 0.0D)
+						.tex((double) ((float) this.width / f * aspect), (double) ((float) this.height / f))
+						.color(64, 64, 64, 192).endVertex();
+				worldrenderer.pos((double) this.width, 0.0D, 0.0D)
+						.tex((double) ((float) this.width / f * aspect), (double) 0).color(64, 64, 64, 192).endVertex();
+				worldrenderer.pos(0.0D, 0.0D, 0.0D).tex(0.0D, (double) 0).color(64, 64, 64, 192).endVertex();
+				tessellator.draw();
+				GlStateManager.enableAlpha();
+			} else {
+				this.drawGradientRect(0, 0, this.width, this.height, -1072689136, -804253680);
+			}
+			if (!(this instanceof GuiScreenServerInfo)) {
+				loc = (ingame && PauseMenuCustomizeState.icon_watermark_pause != null)
+						? PauseMenuCustomizeState.icon_watermark_pause
+						: PauseMenuCustomizeState.icon_watermark_all;
+				aspect = (ingame && PauseMenuCustomizeState.icon_watermark_pause != null)
+						? PauseMenuCustomizeState.icon_watermark_pause_aspect
+						: PauseMenuCustomizeState.icon_watermark_all_aspect;
+				if (loc != null) {
+					GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+					mc.getTextureManager().bindTexture(loc);
+					GlStateManager.pushMatrix();
+					GlStateManager.translate(8, height - 72, 0.0f);
+					float f2 = 64.0f / 256.0f;
+					GlStateManager.scale(f2 * aspect, f2, f2);
+					this.drawTexturedModalRect(0, 0, 0, 0, 256, 256);
+					GlStateManager.popMatrix();
+				}
+			}
 		} else {
 			this.drawBackground(i);
 		}
@@ -677,4 +886,37 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	public boolean blockPTTKey() {
 		return false;
 	}
+
+	public void fireInputEvent(EnumInputEvent event, String param) {
+
+	}
+
+	public boolean showCopyPasteButtons() {
+		return false;
+	}
+
+	public static int applyEaglerScale(float scaleFac, int coord, int screenDim) {
+		return (int) ((coord - (1.0f - scaleFac) * screenDim * 0.5f) / scaleFac);
+	}
+
+	public float getEaglerScale() {
+		return PointerInputAbstraction.isTouchMode() ? getTouchModeScale() : 1.0f;
+	}
+
+	protected float getTouchModeScale() {
+		return 1.0f;
+	}
+
+	public boolean canCloseGui() {
+		return true;
+	}
+
+	protected boolean isTouchDraggingStateLocked(int uid) {
+		return false;
+	}
+
+	protected boolean shouldTouchGenerateMouseEvents() {
+		return true;
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenAddServer.java b/src/game/java/net/minecraft/client/gui/GuiScreenAddServer.java
similarity index 76%
rename from src/main/java/net/minecraft/client/gui/GuiScreenAddServer.java
rename to src/game/java/net/minecraft/client/gui/GuiScreenAddServer.java
index 157a8c4..91731f5 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreenAddServer.java
+++ b/src/game/java/net/minecraft/client/gui/GuiScreenAddServer.java
@@ -2,6 +2,7 @@ package net.minecraft.client.gui;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.resources.I18n;
 
@@ -32,6 +33,7 @@ public class GuiScreenAddServer extends GuiScreen {
 	private GuiTextField serverNameField;
 	private GuiButton serverResourcePacks;
 	private GuiButton hideAddress;
+	private GuiButton enableCookies;
 
 	public GuiScreenAddServer(GuiScreen parGuiScreen, ServerData parServerData) {
 		this.parentScreen = parGuiScreen;
@@ -70,9 +72,19 @@ public class GuiScreenAddServer extends GuiScreen {
 		this.buttonList.add(this.serverResourcePacks = new GuiButton(2, this.width / 2 - 100, i + 54,
 				I18n.format("addServer.resourcePack", new Object[0]) + ": "
 						+ this.serverData.getResourceMode().getMotd().getFormattedText()));
-		this.buttonList.add(this.hideAddress = new GuiButton(3, this.width / 2 - 100, i + 78,
-				I18n.format("addServer.hideAddress", new Object[0]) + ": "
-						+ I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0])));
+		if (EagRuntime.getConfiguration().isEnableServerCookies()) {
+			this.buttonList.add(this.enableCookies = new GuiButton(4, this.width / 2 - 100, i + 78, 99, 20,
+					I18n.format("addServer.enableCookies") + ": "
+							+ I18n.format(this.serverData.enableCookies ? "addServer.enableCookies.enabled"
+									: "addServer.enableCookies.disabled")));
+			this.buttonList.add(this.hideAddress = new GuiButton(3, this.width / 2 + 1, i + 78, 99, 20,
+					I18n.format("addServer.hideAddr", new Object[0]) + ": "
+							+ I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0])));
+		} else {
+			this.buttonList.add(this.hideAddress = new GuiButton(3, this.width / 2 - 100, i + 78,
+					I18n.format("addServer.hideAddress", new Object[0]) + ": "
+							+ I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0])));
+		}
 		this.serverNameField = new GuiTextField(0, this.fontRendererObj, this.width / 2 - 100, 66, 200, 20);
 		this.serverNameField.setFocused(true);
 		this.serverNameField.setText(this.serverData.serverName);
@@ -98,8 +110,15 @@ public class GuiScreenAddServer extends GuiScreen {
 		if (parGuiButton.enabled) {
 			if (parGuiButton.id == 3) {
 				this.serverData.hideAddress = !this.serverData.hideAddress;
-				this.hideAddress.displayString = I18n.format("addServer.hideAddress", new Object[0]) + ": "
-						+ I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0]);
+				this.hideAddress.displayString = I18n
+						.format(EagRuntime.getConfiguration().isEnableServerCookies() ? "addServer.hideAddr"
+								: "addServer.hideAddress", new Object[0])
+						+ ": " + I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0]);
+			} else if (parGuiButton.id == 4) {
+				this.serverData.enableCookies = !this.serverData.enableCookies;
+				this.enableCookies.displayString = I18n.format("addServer.enableCookies") + ": "
+						+ I18n.format(this.serverData.enableCookies ? "addServer.enableCookies.enabled"
+								: "addServer.enableCookies.disabled");
 			} else if (parGuiButton.id == 2) {
 				this.serverData.setResourceMode(
 						ServerData.ServerResourceMode._VALUES[(this.serverData.getResourceMode().ordinal() + 1)
@@ -170,4 +189,16 @@ public class GuiScreenAddServer extends GuiScreen {
 		this.serverIPField.drawTextBox();
 		super.drawScreen(i, j, f);
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return serverNameField.isFocused() || serverIPField.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		serverNameField.fireInputEvent(event, param);
+		serverIPField.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenBook.java b/src/game/java/net/minecraft/client/gui/GuiScreenBook.java
similarity index 93%
rename from src/main/java/net/minecraft/client/gui/GuiScreenBook.java
rename to src/game/java/net/minecraft/client/gui/GuiScreenBook.java
index 14a4b63..1683573 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreenBook.java
+++ b/src/game/java/net/minecraft/client/gui/GuiScreenBook.java
@@ -10,6 +10,7 @@ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenVisualViewport;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.I18n;
@@ -49,7 +50,7 @@ import net.minecraft.util.ResourceLocation;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class GuiScreenBook extends GuiScreen {
+public class GuiScreenBook extends GuiScreenVisualViewport {
 	private static final Logger logger = LogManager.getLogger();
 	private static final ResourceLocation bookGuiTextures = new ResourceLocation("textures/gui/book.png");
 	private final EntityPlayer editingPlayer;
@@ -97,11 +98,8 @@ public class GuiScreenBook extends GuiScreen {
 
 	}
 
-	/**+
-	 * Called from the main game loop to update the screen.
-	 */
-	public void updateScreen() {
-		super.updateScreen();
+	public void updateScreen0() {
+		super.updateScreen0();
 		++this.updateCount;
 	}
 
@@ -350,11 +348,7 @@ public class GuiScreenBook extends GuiScreen {
 
 	}
 
-	/**+
-	 * Draws the screen and all the components in it. Args : mouseX,
-	 * mouseY, renderPartialTicks
-	 */
-	public void drawScreen(int i, int j, float f) {
+	public void drawScreen0(int i, int j, float f) {
 		GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
 		this.mc.getTextureManager().bindTexture(bookGuiTextures);
 		int k = (this.width - this.bookImageWidth) / 2;
@@ -437,14 +431,10 @@ public class GuiScreenBook extends GuiScreen {
 			}
 		}
 
-		super.drawScreen(i, j, f);
+		super.drawScreen0(i, j, f);
 	}
 
-	/**+
-	 * Called when the mouse is clicked. Args : mouseX, mouseY,
-	 * clickedButton
-	 */
-	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
+	protected void mouseClicked0(int parInt1, int parInt2, int parInt3) {
 		if (parInt3 == 0) {
 			IChatComponent ichatcomponent = this.func_175385_b(parInt1, parInt2);
 			if (this.handleComponentClick(ichatcomponent)) {
@@ -452,14 +442,14 @@ public class GuiScreenBook extends GuiScreen {
 			}
 		}
 
-		super.mouseClicked(parInt1, parInt2, parInt3);
+		super.mouseClicked0(parInt1, parInt2, parInt3);
 	}
 
 	/**+
 	 * Executes the click event specified by the given chat
 	 * component
 	 */
-	protected boolean handleComponentClick(IChatComponent ichatcomponent) {
+	public boolean handleComponentClick(IChatComponent ichatcomponent) {
 		ClickEvent clickevent = ichatcomponent == null ? null : ichatcomponent.getChatStyle().getChatClickEvent();
 		if (clickevent == null) {
 			return false;
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenCustomizePresets.java b/src/game/java/net/minecraft/client/gui/GuiScreenCustomizePresets.java
similarity index 95%
rename from src/main/java/net/minecraft/client/gui/GuiScreenCustomizePresets.java
rename to src/game/java/net/minecraft/client/gui/GuiScreenCustomizePresets.java
index 5f37217..76f9eab 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreenCustomizePresets.java
+++ b/src/game/java/net/minecraft/client/gui/GuiScreenCustomizePresets.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 import net.minecraft.client.renderer.Tessellator;
@@ -77,6 +78,11 @@ public class GuiScreenCustomizePresets extends GuiScreen {
 		this.field_175311_g.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.field_175311_g.handleTouchInput();
+	}
+
 	/**+
 	 * Called when the screen is unloaded. Used to disable keyboard
 	 * repeat events
@@ -154,6 +160,16 @@ public class GuiScreenCustomizePresets extends GuiScreen {
 				|| this.field_175317_i.getText().length() > 1;
 	}
 
+	@Override
+	public boolean showCopyPasteButtons() {
+		return field_175317_i.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		field_175317_i.fireInputEvent(event, param);
+	}
+
 	static {
 		ChunkProviderSettings.Factory chunkprovidersettings$factory = ChunkProviderSettings.Factory.jsonToFactory(
 				"{ \"coordinateScale\":684.412, \"heightScale\":684.412, \"upperLimitScale\":512.0, \"lowerLimitScale\":512.0, \"depthNoiseScaleX\":200.0, \"depthNoiseScaleZ\":200.0, \"depthNoiseScaleExponent\":0.5, \"mainNoiseScaleX\":5000.0, \"mainNoiseScaleY\":1000.0, \"mainNoiseScaleZ\":5000.0, \"baseSize\":8.5, \"stretchY\":8.0, \"biomeDepthWeight\":2.0, \"biomeDepthOffset\":0.5, \"biomeScaleWeight\":2.0, \"biomeScaleOffset\":0.375, \"useCaves\":true, \"useDungeons\":true, \"dungeonChance\":8, \"useStrongholds\":true, \"useVillages\":true, \"useMineShafts\":true, \"useTemples\":true, \"useRavines\":true, \"useWaterLakes\":true, \"waterLakeChance\":4, \"useLavaLakes\":true, \"lavaLakeChance\":80, \"useLavaOceans\":false, \"seaLevel\":255 }");
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java b/src/game/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java
similarity index 96%
rename from src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java
rename to src/game/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java
index f26f037..84e12d5 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java
+++ b/src/game/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java
@@ -168,5 +168,9 @@ public class GuiScreenOptionsSounds extends GuiScreen {
 
 			this.field_146155_p = false;
 		}
+
+		public boolean isSliderTouchEvents() {
+			return true;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenResourcePacks.java b/src/game/java/net/minecraft/client/gui/GuiScreenResourcePacks.java
similarity index 95%
rename from src/main/java/net/minecraft/client/gui/GuiScreenResourcePacks.java
rename to src/game/java/net/minecraft/client/gui/GuiScreenResourcePacks.java
index 185ca19..1210ab6 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreenResourcePacks.java
+++ b/src/game/java/net/minecraft/client/gui/GuiScreenResourcePacks.java
@@ -103,6 +103,12 @@ public class GuiScreenResourcePacks extends GuiScreen {
 		this.availableResourcePacksList.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.selectedResourcePacksList.handleTouchInput();
+		this.availableResourcePacksList.handleTouchInput();
+	}
+
 	public boolean hasResourcePackEntry(ResourcePackListEntry parResourcePackListEntry) {
 		return this.selectedResourcePacks.contains(parResourcePackListEntry);
 	}
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenServerList.java b/src/game/java/net/minecraft/client/gui/GuiScreenServerList.java
similarity index 92%
rename from src/main/java/net/minecraft/client/gui/GuiScreenServerList.java
rename to src/game/java/net/minecraft/client/gui/GuiScreenServerList.java
index a7b6d8f..5793298 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreenServerList.java
+++ b/src/game/java/net/minecraft/client/gui/GuiScreenServerList.java
@@ -2,6 +2,7 @@ package net.minecraft.client.gui;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.resources.I18n;
 
@@ -138,4 +139,15 @@ public class GuiScreenServerList extends GuiScreen {
 		this.field_146302_g.drawTextBox();
 		super.drawScreen(i, j, f);
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return field_146302_g.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		field_146302_g.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenWorking.java b/src/game/java/net/minecraft/client/gui/GuiScreenWorking.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiScreenWorking.java
rename to src/game/java/net/minecraft/client/gui/GuiScreenWorking.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiSelectWorld.java b/src/game/java/net/minecraft/client/gui/GuiSelectWorld.java
similarity index 92%
rename from src/main/java/net/minecraft/client/gui/GuiSelectWorld.java
rename to src/game/java/net/minecraft/client/gui/GuiSelectWorld.java
index 61743f8..86860c3 100755
--- a/src/main/java/net/minecraft/client/gui/GuiSelectWorld.java
+++ b/src/game/java/net/minecraft/client/gui/GuiSelectWorld.java
@@ -10,6 +10,7 @@ import java.util.Date;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenLANConnect;
 import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenLANNotSupported;
+import net.lax1dude.eaglercraft.v1_8.sp.ipc.IPCPacket1CIssueDetected;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
@@ -70,6 +71,7 @@ public class GuiSelectWorld extends GuiScreen implements GuiYesNoCallback {
 	private GuiButton recreateButton;
 	private boolean hasRequestedWorlds = false;
 	private boolean waitingForWorlds = false;
+	private boolean ramdiskMode = false;
 
 	public GuiSelectWorld(GuiScreen parentScreenIn) {
 		this.parentScreen = parentScreenIn;
@@ -82,6 +84,7 @@ public class GuiSelectWorld extends GuiScreen implements GuiYesNoCallback {
 	 * window resizes, the buttonList is cleared beforehand.
 	 */
 	public void initGui() {
+		this.ramdiskMode = SingleplayerServerController.isIssueDetected(IPCPacket1CIssueDetected.ISSUE_RAMDISK_MODE);
 		this.field_146628_f = I18n.format("selectWorld.title", new Object[0]);
 		this.field_146637_u = I18n.format("selectWorld.world", new Object[0]);
 		this.field_146636_v = I18n.format("selectWorld.conversion", new Object[0]);
@@ -91,7 +94,7 @@ public class GuiSelectWorld extends GuiScreen implements GuiYesNoCallback {
 				new Object[0]);
 		this.field_146635_w[WorldSettings.GameType.SPECTATOR.getID()] = I18n.format("gameMode.spectator",
 				new Object[0]);
-		this.field_146638_t = new GuiSelectWorld.List(this.mc);
+		this.field_146638_t = new GuiSelectWorld.List(this.mc, ramdiskMode ? -10 : 0);
 		this.field_146638_t.registerScrollButtons(4, 5);
 		this.func_146618_g();
 	}
@@ -121,6 +124,11 @@ public class GuiSelectWorld extends GuiScreen implements GuiYesNoCallback {
 		this.field_146638_t.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.field_146638_t.handleTouchInput();
+	}
+
 	private void func_146627_h() {
 		ISaveFormat isaveformat = this.mc.getSaveLoader();
 		this.field_146639_s = isaveformat.getSaveList();
@@ -240,6 +248,11 @@ public class GuiSelectWorld extends GuiScreen implements GuiYesNoCallback {
 		this.field_146638_t.drawScreen(i, j, f);
 		this.drawCenteredString(this.fontRendererObj, this.field_146628_f, this.width / 2, 20, 16777215);
 
+		if (ramdiskMode) {
+			this.drawCenteredString(this.fontRendererObj, I18n.format("selectWorld.ramdiskWarning"), this.width / 2,
+					height - 68, 11184810);
+		}
+
 		GlStateManager.pushMatrix();
 		GlStateManager.scale(0.75f, 0.75f, 0.75f);
 
@@ -283,8 +296,9 @@ public class GuiSelectWorld extends GuiScreen implements GuiYesNoCallback {
 	}
 
 	class List extends GuiSlot {
-		public List(Minecraft mcIn) {
-			super(mcIn, GuiSelectWorld.this.width, GuiSelectWorld.this.height, 32, GuiSelectWorld.this.height - 64, 36);
+		public List(Minecraft mcIn, int i) {
+			super(mcIn, GuiSelectWorld.this.width, GuiSelectWorld.this.height, 32, GuiSelectWorld.this.height - 64 + i,
+					36);
 		}
 
 		protected int getSize() {
diff --git a/src/main/java/net/minecraft/client/gui/GuiSleepMP.java b/src/game/java/net/minecraft/client/gui/GuiSleepMP.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiSleepMP.java
rename to src/game/java/net/minecraft/client/gui/GuiSleepMP.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiSlider.java b/src/game/java/net/minecraft/client/gui/GuiSlider.java
similarity index 95%
rename from src/main/java/net/minecraft/client/gui/GuiSlider.java
rename to src/game/java/net/minecraft/client/gui/GuiSlider.java
index 22af45d..6f9b26f 100755
--- a/src/main/java/net/minecraft/client/gui/GuiSlider.java
+++ b/src/game/java/net/minecraft/client/gui/GuiSlider.java
@@ -145,4 +145,8 @@ public class GuiSlider extends GuiButton {
 	public interface FormatHelper {
 		String getText(int var1, String var2, float var3);
 	}
+
+	public boolean isSliderTouchEvents() {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiSlot.java b/src/game/java/net/minecraft/client/gui/GuiSlot.java
similarity index 92%
rename from src/main/java/net/minecraft/client/gui/GuiSlot.java
rename to src/game/java/net/minecraft/client/gui/GuiSlot.java
index 2f139a3..895f440 100755
--- a/src/main/java/net/minecraft/client/gui/GuiSlot.java
+++ b/src/game/java/net/minecraft/client/gui/GuiSlot.java
@@ -3,7 +3,10 @@ package net.minecraft.client.gui;
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
+import net.lax1dude.eaglercraft.v1_8.Touch;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumTouchEvent;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
@@ -322,9 +325,18 @@ public abstract class GuiSlot {
 	}
 
 	public void handleMouseInput() {
+		handleInput(Mouse.getEventButton(), Mouse.getEventButtonState(), Mouse.getDWheel());
+	}
+
+	public void handleTouchInput() {
+		mouseX = PointerInputAbstraction.getVCursorX() * width / mc.displayWidth;
+		mouseY = height - PointerInputAbstraction.getVCursorY() * height / mc.displayHeight - 1;
+		handleInput(0, Touch.getEventType() == EnumTouchEvent.TOUCHSTART, 0);
+	}
+
+	protected void handleInput(int eventButton, boolean eventState, int dWheel) {
 		if (this.isMouseYWithinSlotBounds(this.mouseY)) {
-			if (Mouse.getEventButton() == 0 && Mouse.getEventButtonState() && this.mouseY >= this.top
-					&& this.mouseY <= this.bottom) {
+			if (eventButton == 0 && eventState && this.mouseY >= this.top && this.mouseY <= this.bottom) {
 				int i = (this.width - this.getListWidth()) / 2;
 				int j = (this.width + this.getListWidth()) / 2;
 				int k = this.mouseY - this.top - this.headerPadding + (int) this.amountScrolled - 4;
@@ -337,7 +349,7 @@ public abstract class GuiSlot {
 				}
 			}
 
-			if (Mouse.isButtonDown(0) && this.getEnabled()) {
+			if (PointerInputAbstraction.getVCursorButtonDown(0) && this.getEnabled()) {
 				if (this.initialClickY == -1) {
 					boolean flag1 = true;
 					if (this.mouseY >= this.top && this.mouseY <= this.bottom) {
@@ -390,15 +402,14 @@ public abstract class GuiSlot {
 				this.initialClickY = -1;
 			}
 
-			int i2 = Mouse.getEventDWheel();
-			if (i2 != 0) {
-				if (i2 > 0) {
-					i2 = -1;
-				} else if (i2 < 0) {
-					i2 = 1;
+			if (dWheel != 0) {
+				if (dWheel > 0) {
+					dWheel = -1;
+				} else if (dWheel < 0) {
+					dWheel = 1;
 				}
 
-				this.amountScrolled += (float) (i2 * this.slotHeight / 2);
+				this.amountScrolled += (float) (dWheel * this.slotHeight / 2);
 			}
 
 		}
@@ -426,9 +437,6 @@ public abstract class GuiSlot {
 		Tessellator tessellator = Tessellator.getInstance();
 		WorldRenderer worldrenderer = tessellator.getWorldRenderer();
 
-		int mx = Mouse.getX();
-		int my = Mouse.getY();
-
 		for (int j = 0; j < i; ++j) {
 			int k = mouseYIn + j * this.slotHeight + this.headerPadding;
 			int l = this.slotHeight - 4;
diff --git a/src/main/java/net/minecraft/client/gui/GuiSpectator.java b/src/game/java/net/minecraft/client/gui/GuiSpectator.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiSpectator.java
rename to src/game/java/net/minecraft/client/gui/GuiSpectator.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiTextField.java b/src/game/java/net/minecraft/client/gui/GuiTextField.java
similarity index 94%
rename from src/main/java/net/minecraft/client/gui/GuiTextField.java
rename to src/game/java/net/minecraft/client/gui/GuiTextField.java
index b483e96..c691ff1 100755
--- a/src/main/java/net/minecraft/client/gui/GuiTextField.java
+++ b/src/game/java/net/minecraft/client/gui/GuiTextField.java
@@ -5,6 +5,7 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 import net.minecraft.client.renderer.Tessellator;
@@ -681,4 +682,22 @@ public class GuiTextField extends Gui {
 	public void setVisible(boolean parFlag) {
 		this.visible = parFlag;
 	}
+
+	public void fireInputEvent(EnumInputEvent clipboardPaste, String param) {
+		if (!isFocused)
+			return;
+		switch (clipboardPaste) {
+		case CLIPBOARD_COPY:
+			GuiScreen.setClipboardString(this.getSelectedText());
+			break;
+		case CLIPBOARD_PASTE:
+			if (this.isEnabled) {
+				this.writeText(param != null ? param : GuiScreen.getClipboardString());
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiUtilRenderComponents.java b/src/game/java/net/minecraft/client/gui/GuiUtilRenderComponents.java
similarity index 95%
rename from src/main/java/net/minecraft/client/gui/GuiUtilRenderComponents.java
rename to src/game/java/net/minecraft/client/gui/GuiUtilRenderComponents.java
index 1ea7f37..245af26 100755
--- a/src/main/java/net/minecraft/client/gui/GuiUtilRenderComponents.java
+++ b/src/game/java/net/minecraft/client/gui/GuiUtilRenderComponents.java
@@ -37,6 +37,10 @@ public class GuiUtilRenderComponents {
 				: parString1;
 	}
 
+	/**
+	 * This function is like the FontRenderer wrap function, except for chat
+	 * components
+	 */
 	public static List<IChatComponent> func_178908_a(IChatComponent parIChatComponent, int parInt1,
 			FontRenderer parFontRenderer, boolean parFlag, boolean parFlag2) {
 		int i = 0;
diff --git a/src/main/java/net/minecraft/client/gui/GuiVideoSettings.java b/src/game/java/net/minecraft/client/gui/GuiVideoSettings.java
similarity index 71%
rename from src/main/java/net/minecraft/client/gui/GuiVideoSettings.java
rename to src/game/java/net/minecraft/client/gui/GuiVideoSettings.java
index 38e76f9..c7c9ac1 100755
--- a/src/main/java/net/minecraft/client/gui/GuiVideoSettings.java
+++ b/src/game/java/net/minecraft/client/gui/GuiVideoSettings.java
@@ -2,6 +2,10 @@ package net.minecraft.client.gui;
 
 import java.io.IOException;
 
+import net.lax1dude.eaglercraft.v1_8.Display;
+import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
+import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.DynamicLightsStateManager;
+import net.lax1dude.eaglercraft.v1_8.recording.ScreenRecordingController;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.settings.GameSettings;
 
@@ -30,6 +34,7 @@ public class GuiVideoSettings extends GuiScreen {
 	protected String screenTitle = "Video Settings";
 	private GameSettings guiGameSettings;
 	private GuiListExtended optionsRowList;
+	private boolean vsyncLock = false;
 	/**
 	 * + An array of all of GameSettings.Options's video options.
 	 */
@@ -64,6 +69,29 @@ public class GuiVideoSettings extends GuiScreen {
 				new GuiButton(200, this.width / 2 - 100, this.height - 27, I18n.format("gui.done", new Object[0])));
 		this.optionsRowList = new GuiOptionsRowList(this.mc, this.width, this.height, 32, this.height - 32, 25,
 				videoOptions);
+		if (!DynamicLightsStateManager.isSupported()) {
+			GuiOptionButton btn = ((GuiOptionsRowList) optionsRowList)
+					.getButtonFor(GameSettings.Options.EAGLER_DYNAMIC_LIGHTS);
+			if (btn != null) {
+				btn.enabled = false;
+			}
+		}
+		if (EaglercraftGPU.checkOpenGLESVersion() < 300) {
+			GuiOptionSlider btn = ((GuiOptionsRowList) optionsRowList).getSliderFor(GameSettings.Options.MIPMAP_LEVELS);
+			if (btn != null) {
+				btn.displayString = I18n.format(GameSettings.Options.MIPMAP_LEVELS.getEnumString()) + ": N/A";
+				btn.sliderValue = 0.0f;
+				btn.enabled = false;
+			}
+		}
+		if (!Display.supportsFullscreen()) {
+			GuiOptionButton btn = ((GuiOptionsRowList) optionsRowList).getButtonFor(GameSettings.Options.FULLSCREEN);
+			if (btn != null) {
+				btn.displayString = I18n.format(GameSettings.Options.FULLSCREEN.getEnumString()) + ": "
+						+ I18n.format("options.off");
+				btn.enabled = false;
+			}
+		}
 	}
 
 	/**+
@@ -74,6 +102,11 @@ public class GuiVideoSettings extends GuiScreen {
 		this.optionsRowList.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.optionsRowList.handleTouchInput();
+	}
+
 	/**+
 	 * Called by the controls from the buttonList when activated.
 	 * (Mouse pressed for buttons)
@@ -97,11 +130,12 @@ public class GuiVideoSettings extends GuiScreen {
 		super.mouseClicked(parInt1, parInt2, parInt3);
 		this.optionsRowList.mouseClicked(parInt1, parInt2, parInt3);
 		if (this.guiGameSettings.guiScale != i) {
-			ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+			ScaledResolution scaledresolution = mc.scaledResolution = new ScaledResolution(mc);
 			int j = scaledresolution.getScaledWidth();
 			int k = scaledresolution.getScaledHeight();
 			this.setWorldAndResolution(this.mc, j, k);
 			this.mc.voiceOverlay.setResolution(j, k);
+			this.mc.notifRenderer.setResolution(this.mc, j, k, scaledresolution.getScaleFactor());
 		}
 
 	}
@@ -115,7 +149,7 @@ public class GuiVideoSettings extends GuiScreen {
 		super.mouseReleased(i, j, k);
 		this.optionsRowList.mouseReleased(i, j, k);
 		if (this.guiGameSettings.guiScale != l) {
-			ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+			ScaledResolution scaledresolution = mc.scaledResolution = new ScaledResolution(mc);
 			int i1 = scaledresolution.getScaledWidth();
 			int j1 = scaledresolution.getScaledHeight();
 			this.setWorldAndResolution(this.mc, i1, j1);
@@ -133,4 +167,17 @@ public class GuiVideoSettings extends GuiScreen {
 		this.drawCenteredString(this.fontRendererObj, this.screenTitle, this.width / 2, 5, 16777215);
 		super.drawScreen(i, j, f);
 	}
+
+	@Override
+	public void updateScreen() {
+		boolean vsyncLockEn = ScreenRecordingController.isVSyncLocked();
+		if (vsyncLockEn != vsyncLock) {
+			vsyncLock = vsyncLockEn;
+			GuiOptionButton btn = ((GuiOptionsRowList) optionsRowList).getButtonFor(GameSettings.Options.EAGLER_VSYNC);
+			if (btn != null) {
+				btn.enabled = !vsyncLockEn;
+			}
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiWinGame.java b/src/game/java/net/minecraft/client/gui/GuiWinGame.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiWinGame.java
rename to src/game/java/net/minecraft/client/gui/GuiWinGame.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiYesNo.java b/src/game/java/net/minecraft/client/gui/GuiYesNo.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiYesNo.java
rename to src/game/java/net/minecraft/client/gui/GuiYesNo.java
diff --git a/src/main/java/net/minecraft/client/gui/GuiYesNoCallback.java b/src/game/java/net/minecraft/client/gui/GuiYesNoCallback.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/GuiYesNoCallback.java
rename to src/game/java/net/minecraft/client/gui/GuiYesNoCallback.java
diff --git a/src/main/java/net/minecraft/client/gui/IProgressMeter.java b/src/game/java/net/minecraft/client/gui/IProgressMeter.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/IProgressMeter.java
rename to src/game/java/net/minecraft/client/gui/IProgressMeter.java
diff --git a/src/main/java/net/minecraft/client/gui/MapItemRenderer.java b/src/game/java/net/minecraft/client/gui/MapItemRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/MapItemRenderer.java
rename to src/game/java/net/minecraft/client/gui/MapItemRenderer.java
diff --git a/src/main/java/net/minecraft/client/gui/ScaledResolution.java b/src/game/java/net/minecraft/client/gui/ScaledResolution.java
similarity index 91%
rename from src/main/java/net/minecraft/client/gui/ScaledResolution.java
rename to src/game/java/net/minecraft/client/gui/ScaledResolution.java
index ac2787e..0fd6bac 100755
--- a/src/main/java/net/minecraft/client/gui/ScaledResolution.java
+++ b/src/game/java/net/minecraft/client/gui/ScaledResolution.java
@@ -30,6 +30,10 @@ public class ScaledResolution {
 	private int scaledHeight;
 	private int scaleFactor;
 
+	/**
+	 * EAGLER NOTE: This constructor is deprecated! Use
+	 * Minecraft.getMinecraft().scaledResolution
+	 */
 	public ScaledResolution(Minecraft parMinecraft) {
 		this.scaledWidth = parMinecraft.displayWidth;
 		this.scaledHeight = parMinecraft.displayHeight;
@@ -40,6 +44,8 @@ public class ScaledResolution {
 			i = 1000;
 		}
 
+		i = Math.round(i * Math.max(parMinecraft.displayDPI, 0.5f));
+
 		while (this.scaleFactor < i && this.scaledWidth / (this.scaleFactor + 1) >= 320
 				&& this.scaledHeight / (this.scaleFactor + 1) >= 240) {
 			++this.scaleFactor;
diff --git a/src/main/java/net/minecraft/client/gui/ScreenChatOptions.java b/src/game/java/net/minecraft/client/gui/ScreenChatOptions.java
similarity index 77%
rename from src/main/java/net/minecraft/client/gui/ScreenChatOptions.java
rename to src/game/java/net/minecraft/client/gui/ScreenChatOptions.java
index 9417632..687c959 100755
--- a/src/main/java/net/minecraft/client/gui/ScreenChatOptions.java
+++ b/src/game/java/net/minecraft/client/gui/ScreenChatOptions.java
@@ -1,5 +1,6 @@
 package net.minecraft.client.gui;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.settings.GameSettings;
 
@@ -25,6 +26,12 @@ import net.minecraft.client.settings.GameSettings;
  */
 public class ScreenChatOptions extends GuiScreen {
 	private static final GameSettings.Options[] field_146399_a = new GameSettings.Options[] {
+			GameSettings.Options.CHAT_VISIBILITY, GameSettings.Options.CHAT_COLOR, GameSettings.Options.CHAT_LINKS,
+			GameSettings.Options.CHAT_OPACITY, GameSettings.Options.CHAT_LINKS_PROMPT, GameSettings.Options.CHAT_SCALE,
+			GameSettings.Options.CHAT_HEIGHT_FOCUSED, GameSettings.Options.CHAT_HEIGHT_UNFOCUSED,
+			GameSettings.Options.CHAT_WIDTH, GameSettings.Options.REDUCED_DEBUG_INFO,
+			GameSettings.Options.EAGLER_PROFANITY_FILTER };
+	private static final GameSettings.Options[] no_profanity_filter = new GameSettings.Options[] {
 			GameSettings.Options.CHAT_VISIBILITY, GameSettings.Options.CHAT_COLOR, GameSettings.Options.CHAT_LINKS,
 			GameSettings.Options.CHAT_OPACITY, GameSettings.Options.CHAT_LINKS_PROMPT, GameSettings.Options.CHAT_SCALE,
 			GameSettings.Options.CHAT_HEIGHT_FOCUSED, GameSettings.Options.CHAT_HEIGHT_UNFOCUSED,
@@ -47,8 +54,10 @@ public class ScreenChatOptions extends GuiScreen {
 		int i = 0;
 		this.field_146401_i = I18n.format("options.chat.title", new Object[0]);
 
-		for (int j = 0; j < field_146399_a.length; ++j) {
-			GameSettings.Options gamesettings$options = field_146399_a[j];
+		boolean profanityFilterForce = EagRuntime.getConfiguration().isForceProfanityFilter();
+		GameSettings.Options[] opts = profanityFilterForce ? no_profanity_filter : field_146399_a;
+		for (int j = 0; j < opts.length; ++j) {
+			GameSettings.Options gamesettings$options = opts[j];
 			if (gamesettings$options.getEnumFloat()) {
 				this.buttonList.add(new GuiOptionSlider(gamesettings$options.returnEnumOrdinal(),
 						this.width / 2 - 155 + i % 2 * 160, this.height / 6 + 24 * (i >> 1), gamesettings$options));
@@ -61,8 +70,8 @@ public class ScreenChatOptions extends GuiScreen {
 			++i;
 		}
 
-		this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height / 6 + 120,
-				I18n.format("gui.done", new Object[0])));
+		this.buttonList.add(new GuiButton(200, this.width / 2 - 100,
+				this.height / 6 + (profanityFilterForce ? 130 : 154), I18n.format("gui.done", new Object[0])));
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/client/gui/ServerListEntryNormal.java b/src/game/java/net/minecraft/client/gui/ServerListEntryNormal.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/ServerListEntryNormal.java
rename to src/game/java/net/minecraft/client/gui/ServerListEntryNormal.java
diff --git a/src/main/java/net/minecraft/client/gui/ServerSelectionList.java b/src/game/java/net/minecraft/client/gui/ServerSelectionList.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/ServerSelectionList.java
rename to src/game/java/net/minecraft/client/gui/ServerSelectionList.java
diff --git a/src/main/java/net/minecraft/client/gui/achievement/GuiAchievement.java b/src/game/java/net/minecraft/client/gui/achievement/GuiAchievement.java
similarity index 96%
rename from src/main/java/net/minecraft/client/gui/achievement/GuiAchievement.java
rename to src/game/java/net/minecraft/client/gui/achievement/GuiAchievement.java
index 05492a6..39e43df 100755
--- a/src/main/java/net/minecraft/client/gui/achievement/GuiAchievement.java
+++ b/src/game/java/net/minecraft/client/gui/achievement/GuiAchievement.java
@@ -74,7 +74,7 @@ public class GuiAchievement extends Gui {
 		GlStateManager.loadIdentity();
 		this.width = this.mc.displayWidth;
 		this.height = this.mc.displayHeight;
-		ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+		ScaledResolution scaledresolution = mc.scaledResolution;
 		this.width = scaledresolution.getScaledWidth();
 		this.height = scaledresolution.getScaledHeight();
 		GlStateManager.clear(GL_DEPTH_BUFFER_BIT);
diff --git a/src/main/java/net/minecraft/client/gui/achievement/GuiAchievements.java b/src/game/java/net/minecraft/client/gui/achievement/GuiAchievements.java
similarity index 96%
rename from src/main/java/net/minecraft/client/gui/achievement/GuiAchievements.java
rename to src/game/java/net/minecraft/client/gui/achievement/GuiAchievements.java
index a831dad..68cbfbb 100755
--- a/src/main/java/net/minecraft/client/gui/achievement/GuiAchievements.java
+++ b/src/game/java/net/minecraft/client/gui/achievement/GuiAchievements.java
@@ -5,6 +5,7 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.block.Block;
@@ -122,7 +123,7 @@ public class GuiAchievements extends GuiScreen implements IProgressMeter {
 					lanSearchStates[(int) (Minecraft.getSystemTime() / 150L % (long) lanSearchStates.length)],
 					this.width / 2, this.height / 2 + this.fontRendererObj.FONT_HEIGHT * 2, 16777215);
 		} else {
-			if (Mouse.isButtonDown(0)) {
+			if (PointerInputAbstraction.getVCursorButtonDown(0)) {
 				int k = (this.width - this.field_146555_f) / 2;
 				int l = (this.height - this.field_146557_g) / 2;
 				int i1 = k + 8;
diff --git a/src/main/java/net/minecraft/client/gui/achievement/GuiStats.java b/src/game/java/net/minecraft/client/gui/achievement/GuiStats.java
similarity index 96%
rename from src/main/java/net/minecraft/client/gui/achievement/GuiStats.java
rename to src/game/java/net/minecraft/client/gui/achievement/GuiStats.java
index e8fd2f6..1927e5b 100755
--- a/src/main/java/net/minecraft/client/gui/achievement/GuiStats.java
+++ b/src/game/java/net/minecraft/client/gui/achievement/GuiStats.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
-import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 import net.minecraft.client.Minecraft;
@@ -92,6 +92,13 @@ public class GuiStats extends GuiScreen implements IProgressMeter {
 
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		if (this.displaySlot != null) {
+			this.displaySlot.handleTouchInput();
+		}
+	}
+
 	public void func_175366_f() {
 		this.generalStats = new GuiStats.StatsGeneral(this.mc);
 		this.generalStats.registerScrollButtons(1, 1);
@@ -262,7 +269,7 @@ public class GuiStats extends GuiScreen implements IProgressMeter {
 		}
 
 		protected void drawListHeader(int i, int j, Tessellator var3) {
-			if (!Mouse.isButtonDown(0)) {
+			if (!PointerInputAbstraction.getVCursorButtonDown(0)) {
 				this.field_148218_l = -1;
 			}
 
diff --git a/src/main/java/net/minecraft/client/gui/inventory/CreativeCrafting.java b/src/game/java/net/minecraft/client/gui/inventory/CreativeCrafting.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/inventory/CreativeCrafting.java
rename to src/game/java/net/minecraft/client/gui/inventory/CreativeCrafting.java
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiBeacon.java b/src/game/java/net/minecraft/client/gui/inventory/GuiBeacon.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiBeacon.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiBeacon.java
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java b/src/game/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiChest.java b/src/game/java/net/minecraft/client/gui/inventory/GuiChest.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiChest.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiChest.java
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java b/src/game/java/net/minecraft/client/gui/inventory/GuiContainer.java
similarity index 89%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiContainer.java
index 0cb07e4..c2b54c2 100755
--- a/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java
+++ b/src/game/java/net/minecraft/client/gui/inventory/GuiContainer.java
@@ -5,7 +5,9 @@ import java.util.Set;
 
 import com.google.common.collect.Sets;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.Touch;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
@@ -93,6 +95,10 @@ public abstract class GuiContainer extends GuiScreen {
 	 */
 	public void initGui() {
 		super.initGui();
+		if (primaryTouchPoint != -1 && Touch.fetchPointIdx(primaryTouchPoint) == -1) {
+			primaryTouchPoint = -1;
+			mouseReleased(lastTouchX, lastTouchY, 0);
+		}
 		this.mc.thePlayer.openContainer = this.inventorySlots;
 		this.guiLeft = (this.width - this.xSize) / 2;
 		this.guiTop = (this.height - this.ySize) / 2;
@@ -127,7 +133,7 @@ public abstract class GuiContainer extends GuiScreen {
 		for (int i1 = 0; i1 < this.inventorySlots.inventorySlots.size(); ++i1) {
 			Slot slot = (Slot) this.inventorySlots.inventorySlots.get(i1);
 			this.drawSlot(slot);
-			if (this.isMouseOverSlot(slot, i, j) && slot.canBeHovered()) {
+			if (!this.mc.gameSettings.touchscreen && slot.canBeHovered() && this.isMouseOverSlot(slot, i, j)) {
 				this.theSlot = slot;
 				GlStateManager.disableLighting();
 				GlStateManager.disableDepth();
@@ -161,7 +167,6 @@ public abstract class GuiContainer extends GuiScreen {
 					s = "" + EnumChatFormatting.YELLOW + "0";
 				}
 			}
-
 			this.drawItemStack(itemstack, i - k - b0, j - l - j2, s);
 		}
 
@@ -180,7 +185,8 @@ public abstract class GuiContainer extends GuiScreen {
 		}
 
 		GlStateManager.popMatrix();
-		if (inventoryplayer.getItemStack() == null && this.theSlot != null && this.theSlot.getHasStack()) {
+		if (!this.mc.gameSettings.touchscreen && inventoryplayer.getItemStack() == null && this.theSlot != null
+				&& this.theSlot.getHasStack()) {
 			ItemStack itemstack1 = this.theSlot.getStack();
 			this.renderToolTip(itemstack1, i, j);
 		}
@@ -340,10 +346,10 @@ public abstract class GuiContainer extends GuiScreen {
 				l = -999;
 			}
 
-			if (this.mc.gameSettings.touchscreen && flag1 && this.mc.thePlayer.inventory.getItemStack() == null) {
-				this.mc.displayGuiScreen((GuiScreen) null);
-				return;
-			}
+//			if (this.mc.gameSettings.touchscreen && flag1 && this.mc.thePlayer.inventory.getItemStack() == null) {
+//				this.mc.displayGuiScreen((GuiScreen) null);
+//				return;
+//			}
 
 			if (l != -1) {
 				if (this.mc.gameSettings.touchscreen) {
@@ -593,7 +599,7 @@ public abstract class GuiContainer extends GuiScreen {
 				this.mc.setIngameFocus();
 			}
 		} else if (parInt1 == 1) {
-			showingCloseKey = System.currentTimeMillis();
+			showingCloseKey = EagRuntime.steadyTimeMillis();
 		} else {
 			this.checkHotbarKeys(parInt1);
 			if (this.theSlot != null && this.theSlot.getHasStack()) {
@@ -649,7 +655,58 @@ public abstract class GuiContainer extends GuiScreen {
 		super.updateScreen();
 		if (!this.mc.thePlayer.isEntityAlive() || this.mc.thePlayer.isDead) {
 			this.mc.thePlayer.closeScreen();
+			return;
 		}
+		if (primaryTouchPoint != -1 && Touch.fetchPointIdx(primaryTouchPoint) == -1) {
+			primaryTouchPoint = -1;
+			mouseReleased(lastTouchX, lastTouchY, 0);
+		}
+	}
 
+	protected float getTouchModeScale() {
+		return 1.25f;
+	}
+
+	private int primaryTouchPoint = -1;
+	private int lastTouchX = -1;
+	private int lastTouchY = -1;
+
+	protected void touchStarted(int touchX, int touchY, int uid) {
+		if (primaryTouchPoint == -1) {
+			primaryTouchPoint = uid;
+			lastTouchX = touchX;
+			lastTouchY = touchY;
+			mouseClicked(touchX, touchY, 0);
+		}
+	}
+
+	protected void touchMoved(int touchX, int touchY, int uid) {
+		if (primaryTouchPoint == uid) {
+			lastTouchX = touchX;
+			lastTouchY = touchY;
+			mouseClickMove(touchX, touchY, 0, 0l);
+		}
+	}
+
+	protected void touchEndMove(int touchX, int touchY, int uid) {
+		if (primaryTouchPoint == uid) {
+			primaryTouchPoint = -1;
+			lastTouchX = touchX;
+			lastTouchY = touchY;
+			mouseReleased(touchX, touchY, 0);
+		}
+	}
+
+	protected void touchTapped(int touchX, int touchY, int uid) {
+		if (primaryTouchPoint == uid) {
+			primaryTouchPoint = -1;
+			lastTouchX = touchX;
+			lastTouchY = touchY;
+			mouseReleased(touchX, touchY, 0);
+		}
+	}
+
+	protected boolean shouldTouchGenerateMouseEvents() {
+		return false;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java b/src/game/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java
similarity index 93%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java
index 45d8307..7973014 100755
--- a/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java
+++ b/src/game/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java
@@ -9,7 +9,9 @@ import com.google.common.collect.Lists;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
@@ -395,6 +397,22 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 		super.mouseReleased(i, j, k);
 	}
 
+	@Override
+	protected void touchTapped(int touchX, int touchY, int uid) {
+		int l = touchX - this.guiLeft;
+		int i1 = touchY - this.guiTop;
+
+		for (int m = 0; m < CreativeTabs.creativeTabArray.length; ++m) {
+			CreativeTabs creativetabs = CreativeTabs.creativeTabArray[m];
+			if (this.func_147049_a(creativetabs, l, i1)) {
+				this.setCurrentCreativeTab(creativetabs);
+				break;
+			}
+		}
+
+		super.touchTapped(touchX, touchY, uid);
+	}
+
 	/**+
 	 * returns (if you are not on the inventoryTab) and (the flag
 	 * isn't set) and (you have more than 1 page of items)
@@ -499,7 +517,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 	 * mouseY, renderPartialTicks
 	 */
 	public void drawScreen(int i, int j, float f) {
-		boolean flag = Mouse.isButtonDown(0);
+		boolean flag = PointerInputAbstraction.getVCursorButtonDown(0);
 		int k = this.guiLeft;
 		int l = this.guiTop;
 		int i1 = k + 175;
@@ -542,7 +560,8 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 
 	protected void renderToolTip(ItemStack itemstack, int i, int j) {
 		if (selectedTabIndex == CreativeTabs.tabAllSearch.getTabIndex()) {
-			List list = itemstack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
+			List list = itemstack.getTooltipProfanityFilter(this.mc.thePlayer,
+					this.mc.gameSettings.advancedItemTooltips);
 			CreativeTabs creativetabs = itemstack.getItem().getCreativeTab();
 			if (creativetabs == null && itemstack.getItem() == Items.enchanted_book) {
 				Map map = EnchantmentHelper.getEnchantments(itemstack);
@@ -858,4 +877,15 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 	public boolean blockPTTKey() {
 		return searchField.isFocused();
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return searchField.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		searchField.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiCrafting.java b/src/game/java/net/minecraft/client/gui/inventory/GuiCrafting.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiCrafting.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiCrafting.java
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiDispenser.java b/src/game/java/net/minecraft/client/gui/inventory/GuiDispenser.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiDispenser.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiDispenser.java
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiEditSign.java b/src/game/java/net/minecraft/client/gui/inventory/GuiEditSign.java
similarity index 84%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiEditSign.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiEditSign.java
index 57c124b..9d48a8d 100755
--- a/src/main/java/net/minecraft/client/gui/inventory/GuiEditSign.java
+++ b/src/game/java/net/minecraft/client/gui/inventory/GuiEditSign.java
@@ -1,12 +1,16 @@
 package net.minecraft.client.gui.inventory;
 
+import net.lax1dude.eaglercraft.v1_8.Display;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenVisualViewport;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.block.Block;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.client.renderer.tileentity.TileEntitySignRenderer;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.init.Blocks;
 import net.minecraft.network.play.client.C12PacketUpdateSign;
@@ -34,7 +38,7 @@ import net.minecraft.util.ChatComponentText;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class GuiEditSign extends GuiScreen {
+public class GuiEditSign extends GuiScreenVisualViewport {
 	private TileEntitySign tileSign;
 	private int updateCounter;
 	private int editLine;
@@ -72,10 +76,7 @@ public class GuiEditSign extends GuiScreen {
 		this.tileSign.setEditable(true);
 	}
 
-	/**+
-	 * Called from the main game loop to update the screen.
-	 */
-	public void updateScreen() {
+	public void updateScreen0() {
 		++this.updateCounter;
 	}
 
@@ -125,11 +126,7 @@ public class GuiEditSign extends GuiScreen {
 
 	}
 
-	/**+
-	 * Draws the screen and all the components in it. Args : mouseX,
-	 * mouseY, renderPartialTicks
-	 */
-	public void drawScreen(int i, int j, float f) {
+	public void drawScreen0(int i, int j, float f) {
 		this.drawDefaultBackground();
 		this.drawCenteredString(this.fontRendererObj, I18n.format("sign.edit", new Object[0]), this.width / 2, 40,
 				16777215);
@@ -167,13 +164,23 @@ public class GuiEditSign extends GuiScreen {
 			this.tileSign.lineBeingEdited = this.editLine;
 		}
 
-		TileEntityRendererDispatcher.instance.renderTileEntityAt(this.tileSign, -0.5D, -0.75D, -0.5D, 0.0F);
+		try {
+			TileEntitySignRenderer.disableProfanityFilter = true;
+			TileEntityRendererDispatcher.instance.renderTileEntityAt(this.tileSign, -0.5D,
+					(PointerInputAbstraction.isTouchMode() && (Display.getVisualViewportH() / mc.displayHeight) < 0.75f)
+							? -0.25D
+							: -0.75D,
+					-0.5D, 0.0F);
+		} finally {
+			TileEntitySignRenderer.disableProfanityFilter = false;
+		}
 		this.tileSign.lineBeingEdited = -1;
 		GlStateManager.popMatrix();
-		super.drawScreen(i, j, f);
+		super.drawScreen0(i, j, f);
 	}
 
 	public boolean blockPTTKey() {
 		return true;
 	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiFurnace.java b/src/game/java/net/minecraft/client/gui/inventory/GuiFurnace.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiFurnace.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiFurnace.java
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiInventory.java b/src/game/java/net/minecraft/client/gui/inventory/GuiInventory.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiInventory.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiInventory.java
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java b/src/game/java/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java
rename to src/game/java/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java
diff --git a/src/main/java/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java b/src/game/java/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java
rename to src/game/java/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java
diff --git a/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java b/src/game/java/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java
rename to src/game/java/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java
diff --git a/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuRecipient.java b/src/game/java/net/minecraft/client/gui/spectator/ISpectatorMenuRecipient.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuRecipient.java
rename to src/game/java/net/minecraft/client/gui/spectator/ISpectatorMenuRecipient.java
diff --git a/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuView.java b/src/game/java/net/minecraft/client/gui/spectator/ISpectatorMenuView.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuView.java
rename to src/game/java/net/minecraft/client/gui/spectator/ISpectatorMenuView.java
diff --git a/src/main/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java b/src/game/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java
rename to src/game/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java
diff --git a/src/main/java/net/minecraft/client/gui/spectator/SpectatorMenu.java b/src/game/java/net/minecraft/client/gui/spectator/SpectatorMenu.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/spectator/SpectatorMenu.java
rename to src/game/java/net/minecraft/client/gui/spectator/SpectatorMenu.java
diff --git a/src/main/java/net/minecraft/client/gui/spectator/categories/SpectatorDetails.java b/src/game/java/net/minecraft/client/gui/spectator/categories/SpectatorDetails.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/spectator/categories/SpectatorDetails.java
rename to src/game/java/net/minecraft/client/gui/spectator/categories/SpectatorDetails.java
diff --git a/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java b/src/game/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java
rename to src/game/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java
diff --git a/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java b/src/game/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java
similarity index 100%
rename from src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java
rename to src/game/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java
diff --git a/src/main/java/net/minecraft/client/main/GameConfiguration.java b/src/game/java/net/minecraft/client/main/GameConfiguration.java
similarity index 100%
rename from src/main/java/net/minecraft/client/main/GameConfiguration.java
rename to src/game/java/net/minecraft/client/main/GameConfiguration.java
diff --git a/src/main/java/net/minecraft/client/main/Main.java b/src/game/java/net/minecraft/client/main/Main.java
similarity index 100%
rename from src/main/java/net/minecraft/client/main/Main.java
rename to src/game/java/net/minecraft/client/main/Main.java
diff --git a/src/main/java/net/minecraft/client/model/ModelArmorStand.java b/src/game/java/net/minecraft/client/model/ModelArmorStand.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelArmorStand.java
rename to src/game/java/net/minecraft/client/model/ModelArmorStand.java
diff --git a/src/main/java/net/minecraft/client/model/ModelArmorStandArmor.java b/src/game/java/net/minecraft/client/model/ModelArmorStandArmor.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelArmorStandArmor.java
rename to src/game/java/net/minecraft/client/model/ModelArmorStandArmor.java
diff --git a/src/main/java/net/minecraft/client/model/ModelBanner.java b/src/game/java/net/minecraft/client/model/ModelBanner.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelBanner.java
rename to src/game/java/net/minecraft/client/model/ModelBanner.java
diff --git a/src/main/java/net/minecraft/client/model/ModelBase.java b/src/game/java/net/minecraft/client/model/ModelBase.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelBase.java
rename to src/game/java/net/minecraft/client/model/ModelBase.java
diff --git a/src/main/java/net/minecraft/client/model/ModelBat.java b/src/game/java/net/minecraft/client/model/ModelBat.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelBat.java
rename to src/game/java/net/minecraft/client/model/ModelBat.java
diff --git a/src/main/java/net/minecraft/client/model/ModelBiped.java b/src/game/java/net/minecraft/client/model/ModelBiped.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelBiped.java
rename to src/game/java/net/minecraft/client/model/ModelBiped.java
diff --git a/src/main/java/net/minecraft/client/model/ModelBlaze.java b/src/game/java/net/minecraft/client/model/ModelBlaze.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelBlaze.java
rename to src/game/java/net/minecraft/client/model/ModelBlaze.java
diff --git a/src/main/java/net/minecraft/client/model/ModelBoat.java b/src/game/java/net/minecraft/client/model/ModelBoat.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelBoat.java
rename to src/game/java/net/minecraft/client/model/ModelBoat.java
diff --git a/src/main/java/net/minecraft/client/model/ModelBook.java b/src/game/java/net/minecraft/client/model/ModelBook.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelBook.java
rename to src/game/java/net/minecraft/client/model/ModelBook.java
diff --git a/src/main/java/net/minecraft/client/model/ModelBox.java b/src/game/java/net/minecraft/client/model/ModelBox.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelBox.java
rename to src/game/java/net/minecraft/client/model/ModelBox.java
diff --git a/src/main/java/net/minecraft/client/model/ModelChest.java b/src/game/java/net/minecraft/client/model/ModelChest.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelChest.java
rename to src/game/java/net/minecraft/client/model/ModelChest.java
diff --git a/src/main/java/net/minecraft/client/model/ModelChicken.java b/src/game/java/net/minecraft/client/model/ModelChicken.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelChicken.java
rename to src/game/java/net/minecraft/client/model/ModelChicken.java
diff --git a/src/main/java/net/minecraft/client/model/ModelCow.java b/src/game/java/net/minecraft/client/model/ModelCow.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelCow.java
rename to src/game/java/net/minecraft/client/model/ModelCow.java
diff --git a/src/main/java/net/minecraft/client/model/ModelCreeper.java b/src/game/java/net/minecraft/client/model/ModelCreeper.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelCreeper.java
rename to src/game/java/net/minecraft/client/model/ModelCreeper.java
diff --git a/src/main/java/net/minecraft/client/model/ModelDragon.java b/src/game/java/net/minecraft/client/model/ModelDragon.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelDragon.java
rename to src/game/java/net/minecraft/client/model/ModelDragon.java
diff --git a/src/main/java/net/minecraft/client/model/ModelEnderCrystal.java b/src/game/java/net/minecraft/client/model/ModelEnderCrystal.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelEnderCrystal.java
rename to src/game/java/net/minecraft/client/model/ModelEnderCrystal.java
diff --git a/src/main/java/net/minecraft/client/model/ModelEnderMite.java b/src/game/java/net/minecraft/client/model/ModelEnderMite.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelEnderMite.java
rename to src/game/java/net/minecraft/client/model/ModelEnderMite.java
diff --git a/src/main/java/net/minecraft/client/model/ModelEnderman.java b/src/game/java/net/minecraft/client/model/ModelEnderman.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelEnderman.java
rename to src/game/java/net/minecraft/client/model/ModelEnderman.java
diff --git a/src/main/java/net/minecraft/client/model/ModelGhast.java b/src/game/java/net/minecraft/client/model/ModelGhast.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelGhast.java
rename to src/game/java/net/minecraft/client/model/ModelGhast.java
diff --git a/src/main/java/net/minecraft/client/model/ModelGuardian.java b/src/game/java/net/minecraft/client/model/ModelGuardian.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelGuardian.java
rename to src/game/java/net/minecraft/client/model/ModelGuardian.java
diff --git a/src/main/java/net/minecraft/client/model/ModelHorse.java b/src/game/java/net/minecraft/client/model/ModelHorse.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelHorse.java
rename to src/game/java/net/minecraft/client/model/ModelHorse.java
diff --git a/src/main/java/net/minecraft/client/model/ModelHumanoidHead.java b/src/game/java/net/minecraft/client/model/ModelHumanoidHead.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelHumanoidHead.java
rename to src/game/java/net/minecraft/client/model/ModelHumanoidHead.java
diff --git a/src/main/java/net/minecraft/client/model/ModelIronGolem.java b/src/game/java/net/minecraft/client/model/ModelIronGolem.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelIronGolem.java
rename to src/game/java/net/minecraft/client/model/ModelIronGolem.java
diff --git a/src/main/java/net/minecraft/client/model/ModelLargeChest.java b/src/game/java/net/minecraft/client/model/ModelLargeChest.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelLargeChest.java
rename to src/game/java/net/minecraft/client/model/ModelLargeChest.java
diff --git a/src/main/java/net/minecraft/client/model/ModelLeashKnot.java b/src/game/java/net/minecraft/client/model/ModelLeashKnot.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelLeashKnot.java
rename to src/game/java/net/minecraft/client/model/ModelLeashKnot.java
diff --git a/src/main/java/net/minecraft/client/model/ModelMagmaCube.java b/src/game/java/net/minecraft/client/model/ModelMagmaCube.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelMagmaCube.java
rename to src/game/java/net/minecraft/client/model/ModelMagmaCube.java
diff --git a/src/main/java/net/minecraft/client/model/ModelMinecart.java b/src/game/java/net/minecraft/client/model/ModelMinecart.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelMinecart.java
rename to src/game/java/net/minecraft/client/model/ModelMinecart.java
diff --git a/src/main/java/net/minecraft/client/model/ModelOcelot.java b/src/game/java/net/minecraft/client/model/ModelOcelot.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelOcelot.java
rename to src/game/java/net/minecraft/client/model/ModelOcelot.java
diff --git a/src/main/java/net/minecraft/client/model/ModelPig.java b/src/game/java/net/minecraft/client/model/ModelPig.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelPig.java
rename to src/game/java/net/minecraft/client/model/ModelPig.java
diff --git a/src/main/java/net/minecraft/client/model/ModelPlayer.java b/src/game/java/net/minecraft/client/model/ModelPlayer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelPlayer.java
rename to src/game/java/net/minecraft/client/model/ModelPlayer.java
diff --git a/src/main/java/net/minecraft/client/model/ModelQuadruped.java b/src/game/java/net/minecraft/client/model/ModelQuadruped.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelQuadruped.java
rename to src/game/java/net/minecraft/client/model/ModelQuadruped.java
diff --git a/src/main/java/net/minecraft/client/model/ModelRabbit.java b/src/game/java/net/minecraft/client/model/ModelRabbit.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelRabbit.java
rename to src/game/java/net/minecraft/client/model/ModelRabbit.java
diff --git a/src/main/java/net/minecraft/client/model/ModelRenderer.java b/src/game/java/net/minecraft/client/model/ModelRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelRenderer.java
rename to src/game/java/net/minecraft/client/model/ModelRenderer.java
diff --git a/src/main/java/net/minecraft/client/model/ModelSheep1.java b/src/game/java/net/minecraft/client/model/ModelSheep1.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelSheep1.java
rename to src/game/java/net/minecraft/client/model/ModelSheep1.java
diff --git a/src/main/java/net/minecraft/client/model/ModelSheep2.java b/src/game/java/net/minecraft/client/model/ModelSheep2.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelSheep2.java
rename to src/game/java/net/minecraft/client/model/ModelSheep2.java
diff --git a/src/main/java/net/minecraft/client/model/ModelSign.java b/src/game/java/net/minecraft/client/model/ModelSign.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelSign.java
rename to src/game/java/net/minecraft/client/model/ModelSign.java
diff --git a/src/main/java/net/minecraft/client/model/ModelSilverfish.java b/src/game/java/net/minecraft/client/model/ModelSilverfish.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelSilverfish.java
rename to src/game/java/net/minecraft/client/model/ModelSilverfish.java
diff --git a/src/main/java/net/minecraft/client/model/ModelSkeleton.java b/src/game/java/net/minecraft/client/model/ModelSkeleton.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelSkeleton.java
rename to src/game/java/net/minecraft/client/model/ModelSkeleton.java
diff --git a/src/main/java/net/minecraft/client/model/ModelSkeletonHead.java b/src/game/java/net/minecraft/client/model/ModelSkeletonHead.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelSkeletonHead.java
rename to src/game/java/net/minecraft/client/model/ModelSkeletonHead.java
diff --git a/src/main/java/net/minecraft/client/model/ModelSlime.java b/src/game/java/net/minecraft/client/model/ModelSlime.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelSlime.java
rename to src/game/java/net/minecraft/client/model/ModelSlime.java
diff --git a/src/main/java/net/minecraft/client/model/ModelSnowMan.java b/src/game/java/net/minecraft/client/model/ModelSnowMan.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelSnowMan.java
rename to src/game/java/net/minecraft/client/model/ModelSnowMan.java
diff --git a/src/main/java/net/minecraft/client/model/ModelSpider.java b/src/game/java/net/minecraft/client/model/ModelSpider.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelSpider.java
rename to src/game/java/net/minecraft/client/model/ModelSpider.java
diff --git a/src/main/java/net/minecraft/client/model/ModelSquid.java b/src/game/java/net/minecraft/client/model/ModelSquid.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelSquid.java
rename to src/game/java/net/minecraft/client/model/ModelSquid.java
diff --git a/src/main/java/net/minecraft/client/model/ModelVillager.java b/src/game/java/net/minecraft/client/model/ModelVillager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelVillager.java
rename to src/game/java/net/minecraft/client/model/ModelVillager.java
diff --git a/src/main/java/net/minecraft/client/model/ModelWitch.java b/src/game/java/net/minecraft/client/model/ModelWitch.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelWitch.java
rename to src/game/java/net/minecraft/client/model/ModelWitch.java
diff --git a/src/main/java/net/minecraft/client/model/ModelWither.java b/src/game/java/net/minecraft/client/model/ModelWither.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelWither.java
rename to src/game/java/net/minecraft/client/model/ModelWither.java
diff --git a/src/main/java/net/minecraft/client/model/ModelWolf.java b/src/game/java/net/minecraft/client/model/ModelWolf.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelWolf.java
rename to src/game/java/net/minecraft/client/model/ModelWolf.java
diff --git a/src/main/java/net/minecraft/client/model/ModelZombie.java b/src/game/java/net/minecraft/client/model/ModelZombie.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelZombie.java
rename to src/game/java/net/minecraft/client/model/ModelZombie.java
diff --git a/src/main/java/net/minecraft/client/model/ModelZombieVillager.java b/src/game/java/net/minecraft/client/model/ModelZombieVillager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/ModelZombieVillager.java
rename to src/game/java/net/minecraft/client/model/ModelZombieVillager.java
diff --git a/src/main/java/net/minecraft/client/model/PositionTextureVertex.java b/src/game/java/net/minecraft/client/model/PositionTextureVertex.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/PositionTextureVertex.java
rename to src/game/java/net/minecraft/client/model/PositionTextureVertex.java
diff --git a/src/main/java/net/minecraft/client/model/TextureOffset.java b/src/game/java/net/minecraft/client/model/TextureOffset.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/TextureOffset.java
rename to src/game/java/net/minecraft/client/model/TextureOffset.java
diff --git a/src/main/java/net/minecraft/client/model/TexturedQuad.java b/src/game/java/net/minecraft/client/model/TexturedQuad.java
similarity index 100%
rename from src/main/java/net/minecraft/client/model/TexturedQuad.java
rename to src/game/java/net/minecraft/client/model/TexturedQuad.java
diff --git a/src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java b/src/game/java/net/minecraft/client/multiplayer/ChunkProviderClient.java
similarity index 92%
rename from src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java
rename to src/game/java/net/minecraft/client/multiplayer/ChunkProviderClient.java
index a5df971..32c6e90 100755
--- a/src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java
+++ b/src/game/java/net/minecraft/client/multiplayer/ChunkProviderClient.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.minecraft.entity.EnumCreatureType;
@@ -124,15 +125,15 @@ public class ChunkProviderClient implements IChunkProvider {
 	 * guaranteed to unload every such chunk.
 	 */
 	public boolean unloadQueuedChunks() {
-		long i = System.currentTimeMillis();
+		long i = EagRuntime.steadyTimeMillis();
 
 		for (int j = 0, k = this.chunkListing.size(); j < k; ++j) {
-			this.chunkListing.get(j).func_150804_b(System.currentTimeMillis() - i > 5L);
+			this.chunkListing.get(j).func_150804_b(EagRuntime.steadyTimeMillis() - i > 5L);
 		}
 
-		if (System.currentTimeMillis() - i > 100L) {
+		if (EagRuntime.steadyTimeMillis() - i > 100L) {
 			logger.info("Warning: Clientside chunk ticking took {} ms",
-					new Object[] { Long.valueOf(System.currentTimeMillis() - i) });
+					new Object[] { Long.valueOf(EagRuntime.steadyTimeMillis() - i) });
 		}
 
 		return false;
diff --git a/src/main/java/net/minecraft/client/multiplayer/GuiConnecting.java b/src/game/java/net/minecraft/client/multiplayer/GuiConnecting.java
similarity index 62%
rename from src/main/java/net/minecraft/client/multiplayer/GuiConnecting.java
rename to src/game/java/net/minecraft/client/multiplayer/GuiConnecting.java
index 0363d65..813c124 100755
--- a/src/main/java/net/minecraft/client/multiplayer/GuiConnecting.java
+++ b/src/game/java/net/minecraft/client/multiplayer/GuiConnecting.java
@@ -1,9 +1,13 @@
 package net.minecraft.client.multiplayer;
 
 import java.io.IOException;
+import java.util.List;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.cookie.ServerCookieDataStore;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
-import net.lax1dude.eaglercraft.v1_8.internal.EnumServerRateLimit;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketClient;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketFrame;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformNetworking;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -11,6 +15,10 @@ import net.lax1dude.eaglercraft.v1_8.socket.AddressResolver;
 import net.lax1dude.eaglercraft.v1_8.socket.ConnectionHandshake;
 import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
 import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker;
+import net.lax1dude.eaglercraft.v1_8.socket.WebSocketNetworkManager;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageConstants;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageProtocol;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.client.GameProtocolMessageController;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiDisconnected;
@@ -18,6 +26,7 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
 import net.minecraft.util.ChatComponentText;
 
 /**+
@@ -42,10 +51,12 @@ import net.minecraft.util.ChatComponentText;
  */
 public class GuiConnecting extends GuiScreen {
 	private static final Logger logger = LogManager.getLogger();
+	private IWebSocketClient webSocket;
 	private EaglercraftNetworkManager networkManager;
 	private String currentAddress;
 	private String currentPassword;
 	private boolean allowPlaintext;
+	private boolean allowCookies;
 	private boolean cancel;
 	private boolean hasOpened;
 	private final GuiScreen previousGuiScreen;
@@ -73,28 +84,36 @@ public class GuiConnecting extends GuiScreen {
 		if (RateLimitTracker.isLockedOut(serveraddress)) {
 			logger.error("Server locked this client out on a previous connection, will not attempt to reconnect");
 		} else {
-			this.connect(serveraddress, password, allowPlaintext);
+			this.connect(serveraddress, password, allowPlaintext,
+					parServerData.enableCookies && EagRuntime.getConfiguration().isEnableServerCookies());
 		}
 	}
 
 	public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, String hostName, int port) {
-		this(parGuiScreen, mcIn, hostName, port, false);
+		this(parGuiScreen, mcIn, hostName, port, false, EagRuntime.getConfiguration().isEnableServerCookies());
 	}
 
-	public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, String hostName, int port, boolean allowPlaintext) {
-		this(parGuiScreen, mcIn, hostName, port, null, allowPlaintext);
+	public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, String hostName, int port, boolean allowCookies) {
+		this(parGuiScreen, mcIn, hostName, port, false, allowCookies);
 	}
 
-	public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, String hostName, int port, String password) {
-		this(parGuiScreen, mcIn, hostName, port, password, false);
+	public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, String hostName, int port, boolean allowPlaintext,
+			boolean allowCookies) {
+		this(parGuiScreen, mcIn, hostName, port, null, allowPlaintext, allowCookies);
 	}
 
 	public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, String hostName, int port, String password,
-			boolean allowPlaintext) {
+			boolean allowCookies) {
+		this(parGuiScreen, mcIn, hostName, port, password, false, allowCookies);
+	}
+
+	public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, String hostName, int port, String password,
+			boolean allowPlaintext, boolean allowCookies) {
 		this.mc = mcIn;
 		this.previousGuiScreen = parGuiScreen;
 		mcIn.loadWorld((WorldClient) null);
-		this.connect(hostName, password, allowPlaintext);
+		this.connect(hostName, password, allowPlaintext,
+				allowCookies && EagRuntime.getConfiguration().isEnableServerCookies());
 	}
 
 	public GuiConnecting(GuiConnecting previous, String password) {
@@ -104,13 +123,14 @@ public class GuiConnecting extends GuiScreen {
 	public GuiConnecting(GuiConnecting previous, String password, boolean allowPlaintext) {
 		this.mc = previous.mc;
 		this.previousGuiScreen = previous.previousGuiScreen;
-		this.connect(previous.currentAddress, password, allowPlaintext);
+		this.connect(previous.currentAddress, password, allowPlaintext, previous.allowCookies);
 	}
 
-	private void connect(String ip, String password, boolean allowPlaintext) {
+	private void connect(String ip, String password, boolean allowPlaintext, boolean allowCookies) {
 		this.currentAddress = ip;
 		this.currentPassword = password;
 		this.allowPlaintext = allowPlaintext;
+		this.allowCookies = allowCookies;
 	}
 
 	/**+
@@ -121,51 +141,68 @@ public class GuiConnecting extends GuiScreen {
 		if (timer > 1) {
 			if (this.currentAddress == null) {
 				mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(previousGuiScreen));
-			} else if (this.networkManager == null) {
+			} else if (webSocket == null) {
 				logger.info("Connecting to: {}", currentAddress);
-				this.networkManager = new EaglercraftNetworkManager(currentAddress);
-				this.networkManager.connect();
+				webSocket = PlatformNetworking.openWebSocket(currentAddress);
+				if (webSocket == null) {
+					mc.displayGuiScreen(new GuiDisconnected(previousGuiScreen, "connect.failed",
+							new ChatComponentText("Could not open WebSocket to \"" + currentAddress + "\"!")));
+				}
 			} else {
-				if (this.networkManager.isChannelOpen()) {
+				if (webSocket.getState() == EnumEaglerConnectionState.CONNECTED) {
 					if (!hasOpened) {
 						hasOpened = true;
 						logger.info("Logging in: {}", currentAddress);
-						if (ConnectionHandshake.attemptHandshake(this.mc, this, previousGuiScreen, currentPassword,
-								allowPlaintext)) {
+						byte[] cookieData = null;
+						if (allowCookies) {
+							ServerCookieDataStore.ServerCookie cookie = ServerCookieDataStore
+									.loadCookie(currentAddress);
+							if (cookie != null) {
+								cookieData = cookie.cookie;
+							}
+						}
+						if (ConnectionHandshake.attemptHandshake(this.mc, webSocket, this, previousGuiScreen,
+								currentPassword, allowPlaintext, allowCookies, cookieData)) {
 							logger.info("Handshake Success");
+							this.networkManager = new WebSocketNetworkManager(webSocket);
 							this.networkManager.setPluginInfo(ConnectionHandshake.pluginBrand,
 									ConnectionHandshake.pluginVersion);
 							mc.bungeeOutdatedMsgTimer = 80;
 							mc.clearTitles();
 							this.networkManager.setConnectionState(EnumConnectionState.PLAY);
-							this.networkManager.setNetHandler(new NetHandlerPlayClient(this.mc, previousGuiScreen,
-									this.networkManager, this.mc.getSession().getProfile()));
+							NetHandlerPlayClient netHandler = new NetHandlerPlayClient(this.mc, previousGuiScreen,
+									this.networkManager, this.mc.getSession().getProfile());
+							this.networkManager.setNetHandler(netHandler);
+							netHandler.setEaglerMessageController(new GameProtocolMessageController(
+									GamePluginMessageProtocol.getByVersion(ConnectionHandshake.protocolVersion),
+									GamePluginMessageConstants.CLIENT_TO_SERVER,
+									GameProtocolMessageController
+											.createClientHandler(ConnectionHandshake.protocolVersion, netHandler),
+									(ch, msg) -> netHandler.addToSendQueue(new C17PacketCustomPayload(ch, msg))));
 						} else {
 							if (mc.currentScreen == this) {
-								checkLowLevelRatelimit();
-							}
-							if (mc.currentScreen == this) {
+								checkRatelimit();
 								logger.info("Handshake Failure");
 								mc.getSession().reset();
 								mc.displayGuiScreen(
 										new GuiDisconnected(previousGuiScreen, "connect.failed", new ChatComponentText(
 												"Handshake Failure\n\nAre you sure this is an eagler 1.8 server?")));
 							}
-							if (!PlatformNetworking.playConnectionState().isClosed()) {
-								PlatformNetworking.playDisconnect();
-							}
+							webSocket.close();
 							return;
 						}
 					}
-					try {
-						this.networkManager.processReceivedPackets();
-					} catch (IOException ex) {
+					if (this.networkManager != null) {
+						try {
+							this.networkManager.processReceivedPackets();
+						} catch (IOException ex) {
+						}
 					}
 				} else {
-					if (PlatformNetworking.playConnectionState() == EnumEaglerConnectionState.FAILED) {
+					if (webSocket.getState() == EnumEaglerConnectionState.FAILED) {
 						if (!hasOpened) {
 							mc.getSession().reset();
-							checkLowLevelRatelimit();
+							checkRatelimit();
 							if (mc.currentScreen == this) {
 								if (RateLimitTracker.isProbablyLockedOut(currentAddress)) {
 									mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(previousGuiScreen));
@@ -176,9 +213,9 @@ public class GuiConnecting extends GuiScreen {
 							}
 						}
 					} else {
-						if (this.networkManager.checkDisconnected()) {
+						if (this.networkManager != null && this.networkManager.checkDisconnected()) {
 							this.mc.getSession().reset();
-							checkLowLevelRatelimit();
+							checkRatelimit();
 							if (mc.currentScreen == this) {
 								if (RateLimitTracker.isProbablyLockedOut(currentAddress)) {
 									mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(previousGuiScreen));
@@ -191,8 +228,14 @@ public class GuiConnecting extends GuiScreen {
 					}
 				}
 			}
+			if (timer > 200) {
+				if (webSocket != null) {
+					webSocket.close();
+				}
+				mc.displayGuiScreen(new GuiDisconnected(previousGuiScreen, "connect.failed",
+						new ChatComponentText("Handshake timed out")));
+			}
 		}
-
 	}
 
 	/**+
@@ -224,6 +267,8 @@ public class GuiConnecting extends GuiScreen {
 			this.cancel = true;
 			if (this.networkManager != null) {
 				this.networkManager.closeChannel(new ChatComponentText("Aborted"));
+			} else if (this.webSocket != null) {
+				this.webSocket.close();
 			}
 
 			this.mc.displayGuiScreen(this.previousGuiScreen);
@@ -248,17 +293,28 @@ public class GuiConnecting extends GuiScreen {
 		super.drawScreen(i, j, f);
 	}
 
-	private void checkLowLevelRatelimit() {
-		EnumServerRateLimit rateLimit = PlatformNetworking.getRateLimit();
-		if (rateLimit == EnumServerRateLimit.BLOCKED) {
-			RateLimitTracker.registerBlock(currentAddress);
-			mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(previousGuiScreen));
-			logger.info("Handshake Failure: Too Many Requests!");
-		} else if (rateLimit == EnumServerRateLimit.LOCKED_OUT) {
-			RateLimitTracker.registerLockOut(currentAddress);
-			mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(previousGuiScreen));
-			logger.info("Handshake Failure: Too Many Requests!");
-			logger.info("Server has locked this client out");
+	private void checkRatelimit() {
+		if (this.webSocket != null) {
+			List<IWebSocketFrame> strFrames = webSocket.getNextStringFrames();
+			if (strFrames != null) {
+				for (int i = 0; i < strFrames.size(); ++i) {
+					String str = strFrames.get(i).getString();
+					if (str.equalsIgnoreCase("BLOCKED")) {
+						RateLimitTracker.registerBlock(currentAddress);
+						mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(previousGuiScreen));
+						logger.info("Handshake Failure: Too Many Requests!");
+					} else if (str.equalsIgnoreCase("LOCKED")) {
+						RateLimitTracker.registerLockOut(currentAddress);
+						mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(previousGuiScreen));
+						logger.info("Handshake Failure: Too Many Requests!");
+						logger.info("Server has locked this client out");
+					}
+				}
+			}
 		}
 	}
+
+	public boolean canCloseGui() {
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/multiplayer/PlayerControllerMP.java b/src/game/java/net/minecraft/client/multiplayer/PlayerControllerMP.java
similarity index 96%
rename from src/main/java/net/minecraft/client/multiplayer/PlayerControllerMP.java
rename to src/game/java/net/minecraft/client/multiplayer/PlayerControllerMP.java
index b1d2d43..73580bf 100755
--- a/src/main/java/net/minecraft/client/multiplayer/PlayerControllerMP.java
+++ b/src/game/java/net/minecraft/client/multiplayer/PlayerControllerMP.java
@@ -2,6 +2,7 @@ package net.minecraft.client.multiplayer;
 
 import java.io.IOException;
 
+import net.lax1dude.eaglercraft.v1_8.ClientUUIDLoadingCache;
 import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -314,6 +315,8 @@ public class PlayerControllerMP {
 			}
 			this.netClientHandler.getSkinCache().flush();
 			this.netClientHandler.getCapeCache().flush();
+			this.netClientHandler.getNotifManager().runTick();
+			ClientUUIDLoadingCache.update();
 		} else {
 			this.netClientHandler.getNetworkManager().checkDisconnected();
 		}
diff --git a/src/main/java/net/minecraft/client/multiplayer/ServerAddress.java b/src/game/java/net/minecraft/client/multiplayer/ServerAddress.java
similarity index 100%
rename from src/main/java/net/minecraft/client/multiplayer/ServerAddress.java
rename to src/game/java/net/minecraft/client/multiplayer/ServerAddress.java
diff --git a/src/main/java/net/minecraft/client/multiplayer/ServerData.java b/src/game/java/net/minecraft/client/multiplayer/ServerData.java
similarity index 92%
rename from src/main/java/net/minecraft/client/multiplayer/ServerData.java
rename to src/game/java/net/minecraft/client/multiplayer/ServerData.java
index 3d7dcc2..5be03f1 100755
--- a/src/main/java/net/minecraft/client/multiplayer/ServerData.java
+++ b/src/game/java/net/minecraft/client/multiplayer/ServerData.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.IServerQuery;
 import net.lax1dude.eaglercraft.v1_8.internal.QueryResponse;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
@@ -72,6 +73,7 @@ public class ServerData {
 	public boolean hasPing = false;
 	public boolean serverIconEnabled = false;
 	public boolean isDefault = false;
+	public boolean enableCookies;
 
 	private static final Logger logger = LogManager.getLogger("MOTDQuery");
 
@@ -82,6 +84,7 @@ public class ServerData {
 		this.serverIP = parString2;
 		this.field_181042_l = parFlag;
 		this.iconResourceLocation = new ResourceLocation("eagler:servers/icons/tex_" + serverTextureId++);
+		this.enableCookies = EagRuntime.getConfiguration().isEnableServerCookies();
 	}
 
 	/**+
@@ -100,6 +103,7 @@ public class ServerData {
 		}
 
 		nbttagcompound.setBoolean("hideAddress", this.hideAddress);
+		nbttagcompound.setBoolean("enableCookies", this.enableCookies);
 
 		return nbttagcompound;
 	}
@@ -135,6 +139,12 @@ public class ServerData {
 			serverdata.hideAddress = false;
 		}
 
+		if (nbtCompound.hasKey("enableCookies", 1)) {
+			serverdata.enableCookies = nbtCompound.getBoolean("enableCookies");
+		} else {
+			serverdata.enableCookies = true;
+		}
+
 		return serverdata;
 	}
 
@@ -148,6 +158,7 @@ public class ServerData {
 		this.setResourceMode(serverDataIn.getResourceMode());
 		this.hideAddress = serverDataIn.hideAddress;
 		this.field_181042_l = serverDataIn.field_181042_l;
+		this.enableCookies = serverDataIn.enableCookies;
 	}
 
 	public static enum ServerResourceMode {
diff --git a/src/main/java/net/minecraft/client/multiplayer/ServerList.java b/src/game/java/net/minecraft/client/multiplayer/ServerList.java
similarity index 94%
rename from src/main/java/net/minecraft/client/multiplayer/ServerList.java
rename to src/game/java/net/minecraft/client/multiplayer/ServerList.java
index 82b9aa9..6487e00 100755
--- a/src/main/java/net/minecraft/client/multiplayer/ServerList.java
+++ b/src/game/java/net/minecraft/client/multiplayer/ServerList.java
@@ -88,6 +88,7 @@ public class ServerList {
 			for (DefaultServer srv : EagRuntime.getConfiguration().getDefaultServerList()) {
 				ServerData dat = new ServerData(srv.name, srv.addr, true);
 				dat.isDefault = true;
+				dat.hideAddress = srv.hideAddress;
 				this.allServers.add(dat);
 			}
 
@@ -247,7 +248,7 @@ public class ServerList {
 		for (int i = 0, l = this.servers.size(); i < l; ++i) {
 			ServerData dat = this.servers.get(i);
 			if (dat.pingSentTime <= 0l) {
-				dat.pingSentTime = System.currentTimeMillis();
+				dat.pingSentTime = EagRuntime.steadyTimeMillis();
 				if (RateLimitTracker.isLockedOut(dat.serverIP)) {
 					logger.error(
 							"Server {} locked this client out on a previous connection, will not attempt to reconnect",
@@ -269,6 +270,7 @@ public class ServerList {
 					}
 				}
 			} else if (dat.currentQuery != null) {
+				dat.currentQuery.update();
 				if (!dat.hasPing) {
 					++total;
 					EnumServerRateLimit rateLimit = dat.currentQuery.getRateLimit();
@@ -305,7 +307,7 @@ public class ServerList {
 					dat.setIconPacket(r);
 				}
 				if (!dat.currentQuery.isOpen() && dat.pingSentTime > 0l
-						&& (System.currentTimeMillis() - dat.pingSentTime) > 2000l && !dat.hasPing) {
+						&& (EagRuntime.steadyTimeMillis() - dat.pingSentTime) > 2000l && !dat.hasPing) {
 					if (RateLimitTracker.isProbablyLockedOut(dat.serverIP)) {
 						logger.error("Server {} ratelimited this client out on a previous connection, assuming lockout",
 								dat.serverIP);
diff --git a/src/main/java/net/minecraft/client/multiplayer/WorldClient.java b/src/game/java/net/minecraft/client/multiplayer/WorldClient.java
similarity index 94%
rename from src/main/java/net/minecraft/client/multiplayer/WorldClient.java
rename to src/game/java/net/minecraft/client/multiplayer/WorldClient.java
index 9a67a12..64c2faf 100755
--- a/src/main/java/net/minecraft/client/multiplayer/WorldClient.java
+++ b/src/game/java/net/minecraft/client/multiplayer/WorldClient.java
@@ -20,7 +20,6 @@ import net.minecraft.entity.item.EntityMinecart;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.profiler.Profiler;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
@@ -76,9 +75,9 @@ public class WorldClient extends World {
 	private final Set<ChunkCoordIntPair> previousActiveChunkSet = Sets.newHashSet();
 
 	public WorldClient(NetHandlerPlayClient parNetHandlerPlayClient, WorldSettings parWorldSettings, int parInt1,
-			EnumDifficulty parEnumDifficulty, Profiler parProfiler) {
+			EnumDifficulty parEnumDifficulty) {
 		super(new SaveHandlerMP(), new WorldInfo(parWorldSettings, "MpServer"),
-				WorldProvider.getProviderForDimension(parInt1), parProfiler, true);
+				WorldProvider.getProviderForDimension(parInt1), true);
 		this.sendQueue = parNetHandlerPlayClient;
 		this.getWorldInfo().setDifficulty(parEnumDifficulty);
 		this.setSpawnPoint(new BlockPos(8, 64, 8));
@@ -99,8 +98,6 @@ public class WorldClient extends World {
 			this.setWorldTime(this.getWorldTime() + 1L);
 		}
 
-		this.theProfiler.startSection("reEntryProcessing");
-
 		for (int i = 0; i < 10 && !this.entitySpawnQueue.isEmpty(); ++i) {
 			Entity entity = (Entity) this.entitySpawnQueue.iterator().next();
 			this.entitySpawnQueue.remove(entity);
@@ -109,11 +106,8 @@ public class WorldClient extends World {
 			}
 		}
 
-		this.theProfiler.endStartSection("chunkCache");
 		this.clientChunkProvider.unloadQueuedChunks();
-		this.theProfiler.endStartSection("blocks");
 		this.updateBlocks();
-		this.theProfiler.endSection();
 	}
 
 	/**+
@@ -147,10 +141,8 @@ public class WorldClient extends World {
 			if (!this.previousActiveChunkSet.contains(chunkcoordintpair)) {
 				int j = chunkcoordintpair.chunkXPos * 16;
 				int k = chunkcoordintpair.chunkZPos * 16;
-				this.theProfiler.startSection("getChunk");
 				Chunk chunk = this.getChunkFromChunkCoords(chunkcoordintpair.chunkXPos, chunkcoordintpair.chunkZPos);
 				this.playMoodSoundAndCheckLight(j, k, chunk);
-				this.theProfiler.endSection();
 				this.previousActiveChunkSet.add(chunkcoordintpair);
 				++i;
 				if (i >= 10) {
diff --git a/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java b/src/game/java/net/minecraft/client/network/NetHandlerPlayClient.java
similarity index 94%
rename from src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java
rename to src/game/java/net/minecraft/client/network/NetHandlerPlayClient.java
index 955f22a..9790b5c 100755
--- a/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java
+++ b/src/game/java/net/minecraft/client/network/NetHandlerPlayClient.java
@@ -6,22 +6,24 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.ClientUUIDLoadingCache;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 
 import com.google.common.collect.Maps;
 
 import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
-import net.lax1dude.eaglercraft.v1_8.profile.CapePackets;
+import net.lax1dude.eaglercraft.v1_8.notifications.ServerNotificationManager;
 import net.lax1dude.eaglercraft.v1_8.profile.ServerCapeCache;
 import net.lax1dude.eaglercraft.v1_8.profile.ServerSkinCache;
-import net.lax1dude.eaglercraft.v1_8.profile.SkinPackets;
 import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageProtocol;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.client.GameProtocolMessageController;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANClientNetworkManager;
 import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkManager;
-import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
 import net.lax1dude.eaglercraft.v1_8.voice.VoiceClientController;
+import net.lax1dude.eaglercraft.v1_8.webview.WebViewOverlayController;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
@@ -257,7 +259,12 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 	private final EaglercraftRandom avRandomizer = new EaglercraftRandom();
 	private final ServerSkinCache skinCache;
 	private final ServerCapeCache capeCache;
+	private final ServerNotificationManager notifManager;
 	public boolean currentFNAWSkinAllowedState = true;
+	public boolean currentFNAWSkinForcedState = true;
+	private GameProtocolMessageController eaglerMessageController = null;
+	public boolean hasRequestedServerInfo = false;
+	public byte[] cachedServerInfoData = null;
 
 	public NetHandlerPlayClient(Minecraft mcIn, GuiScreen parGuiScreen, EaglercraftNetworkManager parNetworkManager,
 			GameProfile parGameProfile) {
@@ -265,8 +272,9 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 		this.guiScreenServer = parGuiScreen;
 		this.netManager = parNetworkManager;
 		this.profile = parGameProfile;
-		this.skinCache = new ServerSkinCache(parNetworkManager, mcIn.getTextureManager());
-		this.capeCache = new ServerCapeCache(parNetworkManager, mcIn.getTextureManager());
+		this.skinCache = new ServerSkinCache(this, mcIn.getTextureManager());
+		this.capeCache = new ServerCapeCache(this, mcIn.getTextureManager());
+		this.notifManager = new ServerNotificationManager();
 		this.isIntegratedServer = (parNetworkManager instanceof ClientIntegratedServerNetworkManager)
 				|| (parNetworkManager instanceof LANClientNetworkManager);
 	}
@@ -279,6 +287,7 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 		this.clientWorldController = null;
 		this.skinCache.destroy();
 		this.capeCache.destroy();
+		this.notifManager.destroy();
 	}
 
 	public ServerSkinCache getSkinCache() {
@@ -289,6 +298,47 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 		return this.capeCache;
 	}
 
+	public ServerNotificationManager getNotifManager() {
+		return this.notifManager;
+	}
+
+	public GameProtocolMessageController getEaglerMessageController() {
+		return eaglerMessageController;
+	}
+
+	public void setEaglerMessageController(GameProtocolMessageController eaglerMessageController) {
+		this.eaglerMessageController = eaglerMessageController;
+	}
+
+	public GamePluginMessageProtocol getEaglerMessageProtocol() {
+		return eaglerMessageController != null ? eaglerMessageController.protocol : null;
+	}
+
+	public void sendEaglerMessage(GameMessagePacket packet) {
+		try {
+			eaglerMessageController.sendPacket(packet);
+		} catch (IOException e) {
+			logger.error("Failed to send eaglercraft plugin message packet: " + packet);
+			logger.error(e);
+		}
+	}
+
+	public boolean webViewSendHandler(GameMessagePacket pkt) {
+		if (eaglerMessageController == null) {
+			return false;
+		}
+		if (this.gameController.thePlayer == null || this.gameController.thePlayer.sendQueue != this) {
+			logger.error("WebView sent message on a dead handler!");
+			return false;
+		}
+		if (eaglerMessageController.protocol.ver >= 4) {
+			sendEaglerMessage(pkt);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	/**+
 	 * Registers some server properties
 	 * (gametype,hardcore-mode,terraintype,difficulty,player limit),
@@ -297,10 +347,8 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 	 */
 	public void handleJoinGame(S01PacketJoinGame packetIn) {
 		this.gameController.playerController = new PlayerControllerMP(this.gameController, this);
-		this.clientWorldController = new WorldClient(this,
-				new WorldSettings(0L, packetIn.getGameType(), false, packetIn.isHardcoreMode(),
-						packetIn.getWorldType()),
-				packetIn.getDimension(), packetIn.getDifficulty(), this.gameController.mcProfiler);
+		this.clientWorldController = new WorldClient(this, new WorldSettings(0L, packetIn.getGameType(), false,
+				packetIn.isHardcoreMode(), packetIn.getWorldType()), packetIn.getDimension(), packetIn.getDifficulty());
 		this.gameController.gameSettings.difficulty = packetIn.getDifficulty();
 		this.gameController.loadWorld(this.clientWorldController);
 		this.gameController.thePlayer.dimension = packetIn.getDimension();
@@ -313,9 +361,9 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 		this.netManager.sendPacket(new C17PacketCustomPayload("MC|Brand",
 				(new PacketBuffer(Unpooled.buffer())).writeString(ClientBrandRetriever.getClientModName())));
 		if (VoiceClientController.isClientSupported()) {
-			VoiceClientController.initializeVoiceClient((pkt) -> this.netManager
-					.sendPacket(new C17PacketCustomPayload(VoiceClientController.SIGNAL_CHANNEL, pkt)));
+			VoiceClientController.initializeVoiceClient(this::sendEaglerMessage, eaglerMessageController.protocol.ver);
 		}
+		WebViewOverlayController.setPacketSendCallback(this::webViewSendHandler);
 	}
 
 	/**+
@@ -953,7 +1001,7 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 			Scoreboard scoreboard = this.clientWorldController.getScoreboard();
 			this.clientWorldController = new WorldClient(this, new WorldSettings(0L, packetIn.getGameType(), false,
 					this.gameController.theWorld.getWorldInfo().isHardcoreModeEnabled(), packetIn.getWorldType()),
-					packetIn.getDimensionID(), packetIn.getDifficulty(), this.gameController.mcProfiler);
+					packetIn.getDimensionID(), packetIn.getDifficulty());
 			this.clientWorldController.setWorldScoreboard(scoreboard);
 			this.gameController.loadWorld(this.clientWorldController);
 			this.gameController.thePlayer.dimension = packetIn.getDimensionID();
@@ -1103,6 +1151,7 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 				if (tileentitysign.getIsEditable()) {
 					System.arraycopy(packetIn.getLines(), 0, tileentitysign.signText, 0, 4);
 					tileentitysign.markDirty();
+					tileentitysign.clearProfanityFilterCache();
 				}
 
 				flag = true;
@@ -1392,6 +1441,7 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 				this.playerInfoMap.remove(uuid);
 				this.skinCache.evictSkin(uuid);
 				this.capeCache.evictCape(uuid);
+				ClientUUIDLoadingCache.evict(uuid);
 			} else {
 				NetworkPlayerInfo networkplayerinfo = (NetworkPlayerInfo) this.playerInfoMap
 						.get(s38packetplayerlistitem$addplayerdata.getProfile().getId());
@@ -1559,40 +1609,14 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 				this.gameController
 						.displayGuiScreen(new GuiScreenBook(this.gameController.thePlayer, itemstack, false));
 			}
-		} else if ("EAG|Skins-1.8".equals(packetIn.getChannelName())) {
+		} else {
 			try {
-				SkinPackets.readPluginMessage(packetIn.getBufferData(), skinCache);
+				eaglerMessageController.handlePacket(packetIn.getChannelName(), packetIn.getBufferData());
 			} catch (IOException e) {
-				logger.error("Couldn't read EAG|Skins-1.8 packet!");
+				logger.error("Couldn't read \"{}\" packet as an eaglercraft plugin message!",
+						packetIn.getChannelName());
 				logger.error(e);
 			}
-		} else if ("EAG|Capes-1.8".equals(packetIn.getChannelName())) {
-			try {
-				CapePackets.readPluginMessage(packetIn.getBufferData(), capeCache);
-			} catch (IOException e) {
-				logger.error("Couldn't read EAG|Capes-1.8 packet!");
-				logger.error(e);
-			}
-		} else if ("EAG|UpdateCert-1.8".equals(packetIn.getChannelName())) {
-			if (EagRuntime.getConfiguration().allowUpdateSvc()) {
-				try {
-					PacketBuffer pb = packetIn.getBufferData();
-					byte[] c = new byte[pb.readableBytes()];
-					pb.readBytes(c);
-					UpdateService.addCertificateToSet(c);
-				} catch (Throwable e) {
-					logger.error("Couldn't process EAG|UpdateCert-1.8 packet!");
-					logger.error(e);
-				}
-			}
-		} else if (VoiceClientController.SIGNAL_CHANNEL.equals(packetIn.getChannelName())) {
-			if (VoiceClientController.isClientSupported()) {
-				VoiceClientController.handleVoiceSignalPacket(packetIn.getBufferData());
-			}
-		} else if ("EAG|FNAWSEn-1.8".equals(packetIn.getChannelName())) {
-			this.currentFNAWSkinAllowedState = packetIn.getBufferData().readBoolean();
-			Minecraft.getMinecraft().getRenderManager().setEnableFNAWSkins(
-					this.currentFNAWSkinAllowedState && Minecraft.getMinecraft().gameSettings.enableFNAWSkins);
 		}
 	}
 
diff --git a/src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java b/src/game/java/net/minecraft/client/network/NetworkPlayerInfo.java
similarity index 78%
rename from src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java
rename to src/game/java/net/minecraft/client/network/NetworkPlayerInfo.java
index f62b950..76af28a 100755
--- a/src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java
+++ b/src/game/java/net/minecraft/client/network/NetworkPlayerInfo.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.network;
 
 import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
+import net.lax1dude.eaglercraft.v1_8.profanity_filter.ProfanityFilter;
 import net.lax1dude.eaglercraft.v1_8.profile.SkinModel;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.play.server.S38PacketPlayerListItem;
@@ -31,10 +32,12 @@ import net.minecraft.world.WorldSettings;
  */
 public class NetworkPlayerInfo {
 	private final GameProfile gameProfile;
+	private String gameProfileProfanityFilter;
 	private WorldSettings.GameType gameType;
 	private int responseTime;
 	private String skinType;
 	private IChatComponent displayName;
+	private IChatComponent displayNameProfanityFilter;
 	private int field_178873_i = 0;
 	private int field_178870_j = 0;
 	private long field_178871_k = 0L;
@@ -50,6 +53,7 @@ public class NetworkPlayerInfo {
 		this.gameType = parAddPlayerData.getGameMode();
 		this.responseTime = parAddPlayerData.getPing();
 		this.displayName = parAddPlayerData.getDisplayName();
+		this.displayNameProfanityFilter = null;
 	}
 
 	/**+
@@ -104,12 +108,41 @@ public class NetworkPlayerInfo {
 
 	public void setDisplayName(IChatComponent displayNameIn) {
 		this.displayName = displayNameIn;
+		this.displayNameProfanityFilter = null;
 	}
 
 	public IChatComponent getDisplayName() {
 		return this.displayName;
 	}
 
+	public IChatComponent getDisplayNameProfanityFilter() {
+		if (Minecraft.getMinecraft().isEnableProfanityFilter()) {
+			if (this.displayName != null) {
+				if (this.displayNameProfanityFilter == null) {
+					this.displayNameProfanityFilter = ProfanityFilter.getInstance()
+							.profanityFilterChatComponent(this.displayName);
+				}
+				return this.displayNameProfanityFilter;
+			} else {
+				return null;
+			}
+		} else {
+			return this.displayName;
+		}
+	}
+
+	public String getGameProfileNameProfanityFilter() {
+		if (Minecraft.getMinecraft().isEnableProfanityFilter()) {
+			if (this.gameProfileProfanityFilter == null) {
+				this.gameProfileProfanityFilter = ProfanityFilter.getInstance()
+						.profanityFilterString(this.gameProfile.getName());
+			}
+			return this.gameProfileProfanityFilter;
+		} else {
+			return this.gameProfile.getName();
+		}
+	}
+
 	public int func_178835_l() {
 		return this.field_178873_i;
 	}
diff --git a/src/main/java/net/minecraft/client/particle/Barrier.java b/src/game/java/net/minecraft/client/particle/Barrier.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/Barrier.java
rename to src/game/java/net/minecraft/client/particle/Barrier.java
diff --git a/src/main/java/net/minecraft/client/particle/EffectRenderer.java b/src/game/java/net/minecraft/client/particle/EffectRenderer.java
similarity index 94%
rename from src/main/java/net/minecraft/client/particle/EffectRenderer.java
rename to src/game/java/net/minecraft/client/particle/EffectRenderer.java
index 65a56bb..66cf1ea 100755
--- a/src/main/java/net/minecraft/client/particle/EffectRenderer.java
+++ b/src/game/java/net/minecraft/client/particle/EffectRenderer.java
@@ -14,6 +14,7 @@ import java.util.concurrent.Callable;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager;
@@ -72,7 +73,7 @@ public class EffectRenderer {
 	private Map<Integer, IParticleFactory> particleTypes = Maps.newHashMap();
 
 	public static final AcceleratedEffectRenderer vanillaAcceleratedParticleRenderer = new AcceleratedEffectRenderer();
-	public IAcceleratedParticleEngine acceleratedParticleRenderer = vanillaAcceleratedParticleRenderer;
+	public IAcceleratedParticleEngine acceleratedParticleRenderer = null;
 
 	public EffectRenderer(World worldIn, TextureManager rendererIn) {
 		this.worldObj = worldIn;
@@ -87,6 +88,8 @@ public class EffectRenderer {
 		}
 
 		this.registerVanillaParticles();
+		this.acceleratedParticleRenderer = EaglercraftGPU.checkInstancingCapable() ? vanillaAcceleratedParticleRenderer
+				: null;
 	}
 
 	private void registerVanillaParticles() {
@@ -305,14 +308,17 @@ public class EffectRenderer {
 
 					boolean legacyRenderingHasOccured = false;
 
-					acceleratedParticleRenderer.begin(partialTicks);
+					if (acceleratedParticleRenderer != null) {
+						acceleratedParticleRenderer.begin(partialTicks);
+					}
 
 					for (int k = 0; k < this.fxLayers[i][j].size(); ++k) {
 						final EntityFX entityfx = (EntityFX) this.fxLayers[i][j].get(k);
 
 						try {
-							if (!entityfx.renderAccelerated(acceleratedParticleRenderer, entityIn, partialTicks, f, f4,
-									f1, f2, f3)) {
+							if (acceleratedParticleRenderer == null
+									|| !entityfx.renderAccelerated(acceleratedParticleRenderer, entityIn, partialTicks,
+											f, f4, f1, f2, f3)) {
 								entityfx.renderParticle(worldrenderer, entityIn, partialTicks, f, f4, f1, f2, f3);
 								legacyRenderingHasOccured = true;
 							}
@@ -343,7 +349,9 @@ public class EffectRenderer {
 						worldrenderer.finishDrawing();
 					}
 
-					acceleratedParticleRenderer.draw(texCoordWidth, texCoordHeight);
+					if (acceleratedParticleRenderer != null) {
+						acceleratedParticleRenderer.draw(texCoordWidth, texCoordHeight);
+					}
 				}
 			}
 		}
diff --git a/src/main/java/net/minecraft/client/particle/EntityAuraFX.java b/src/game/java/net/minecraft/client/particle/EntityAuraFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityAuraFX.java
rename to src/game/java/net/minecraft/client/particle/EntityAuraFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityBlockDustFX.java b/src/game/java/net/minecraft/client/particle/EntityBlockDustFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityBlockDustFX.java
rename to src/game/java/net/minecraft/client/particle/EntityBlockDustFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityBreakingFX.java b/src/game/java/net/minecraft/client/particle/EntityBreakingFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityBreakingFX.java
rename to src/game/java/net/minecraft/client/particle/EntityBreakingFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityBubbleFX.java b/src/game/java/net/minecraft/client/particle/EntityBubbleFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityBubbleFX.java
rename to src/game/java/net/minecraft/client/particle/EntityBubbleFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityCloudFX.java b/src/game/java/net/minecraft/client/particle/EntityCloudFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityCloudFX.java
rename to src/game/java/net/minecraft/client/particle/EntityCloudFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityCrit2FX.java b/src/game/java/net/minecraft/client/particle/EntityCrit2FX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityCrit2FX.java
rename to src/game/java/net/minecraft/client/particle/EntityCrit2FX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityCritFX.java b/src/game/java/net/minecraft/client/particle/EntityCritFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityCritFX.java
rename to src/game/java/net/minecraft/client/particle/EntityCritFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityDiggingFX.java b/src/game/java/net/minecraft/client/particle/EntityDiggingFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityDiggingFX.java
rename to src/game/java/net/minecraft/client/particle/EntityDiggingFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityDropParticleFX.java b/src/game/java/net/minecraft/client/particle/EntityDropParticleFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityDropParticleFX.java
rename to src/game/java/net/minecraft/client/particle/EntityDropParticleFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityEnchantmentTableParticleFX.java b/src/game/java/net/minecraft/client/particle/EntityEnchantmentTableParticleFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityEnchantmentTableParticleFX.java
rename to src/game/java/net/minecraft/client/particle/EntityEnchantmentTableParticleFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityExplodeFX.java b/src/game/java/net/minecraft/client/particle/EntityExplodeFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityExplodeFX.java
rename to src/game/java/net/minecraft/client/particle/EntityExplodeFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityFX.java b/src/game/java/net/minecraft/client/particle/EntityFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityFX.java
rename to src/game/java/net/minecraft/client/particle/EntityFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityFirework.java b/src/game/java/net/minecraft/client/particle/EntityFirework.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityFirework.java
rename to src/game/java/net/minecraft/client/particle/EntityFirework.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityFishWakeFX.java b/src/game/java/net/minecraft/client/particle/EntityFishWakeFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityFishWakeFX.java
rename to src/game/java/net/minecraft/client/particle/EntityFishWakeFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityFlameFX.java b/src/game/java/net/minecraft/client/particle/EntityFlameFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityFlameFX.java
rename to src/game/java/net/minecraft/client/particle/EntityFlameFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityFootStepFX.java b/src/game/java/net/minecraft/client/particle/EntityFootStepFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityFootStepFX.java
rename to src/game/java/net/minecraft/client/particle/EntityFootStepFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityHeartFX.java b/src/game/java/net/minecraft/client/particle/EntityHeartFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityHeartFX.java
rename to src/game/java/net/minecraft/client/particle/EntityHeartFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityHugeExplodeFX.java b/src/game/java/net/minecraft/client/particle/EntityHugeExplodeFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityHugeExplodeFX.java
rename to src/game/java/net/minecraft/client/particle/EntityHugeExplodeFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityLargeExplodeFX.java b/src/game/java/net/minecraft/client/particle/EntityLargeExplodeFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityLargeExplodeFX.java
rename to src/game/java/net/minecraft/client/particle/EntityLargeExplodeFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityLavaFX.java b/src/game/java/net/minecraft/client/particle/EntityLavaFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityLavaFX.java
rename to src/game/java/net/minecraft/client/particle/EntityLavaFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityNoteFX.java b/src/game/java/net/minecraft/client/particle/EntityNoteFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityNoteFX.java
rename to src/game/java/net/minecraft/client/particle/EntityNoteFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityParticleEmitter.java b/src/game/java/net/minecraft/client/particle/EntityParticleEmitter.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityParticleEmitter.java
rename to src/game/java/net/minecraft/client/particle/EntityParticleEmitter.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityPickupFX.java b/src/game/java/net/minecraft/client/particle/EntityPickupFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityPickupFX.java
rename to src/game/java/net/minecraft/client/particle/EntityPickupFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityPortalFX.java b/src/game/java/net/minecraft/client/particle/EntityPortalFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityPortalFX.java
rename to src/game/java/net/minecraft/client/particle/EntityPortalFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityRainFX.java b/src/game/java/net/minecraft/client/particle/EntityRainFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityRainFX.java
rename to src/game/java/net/minecraft/client/particle/EntityRainFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntityReddustFX.java b/src/game/java/net/minecraft/client/particle/EntityReddustFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntityReddustFX.java
rename to src/game/java/net/minecraft/client/particle/EntityReddustFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntitySmokeFX.java b/src/game/java/net/minecraft/client/particle/EntitySmokeFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntitySmokeFX.java
rename to src/game/java/net/minecraft/client/particle/EntitySmokeFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntitySnowShovelFX.java b/src/game/java/net/minecraft/client/particle/EntitySnowShovelFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntitySnowShovelFX.java
rename to src/game/java/net/minecraft/client/particle/EntitySnowShovelFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntitySpellParticleFX.java b/src/game/java/net/minecraft/client/particle/EntitySpellParticleFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntitySpellParticleFX.java
rename to src/game/java/net/minecraft/client/particle/EntitySpellParticleFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntitySplashFX.java b/src/game/java/net/minecraft/client/particle/EntitySplashFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntitySplashFX.java
rename to src/game/java/net/minecraft/client/particle/EntitySplashFX.java
diff --git a/src/main/java/net/minecraft/client/particle/EntitySuspendFX.java b/src/game/java/net/minecraft/client/particle/EntitySuspendFX.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/EntitySuspendFX.java
rename to src/game/java/net/minecraft/client/particle/EntitySuspendFX.java
diff --git a/src/main/java/net/minecraft/client/particle/IParticleFactory.java b/src/game/java/net/minecraft/client/particle/IParticleFactory.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/IParticleFactory.java
rename to src/game/java/net/minecraft/client/particle/IParticleFactory.java
diff --git a/src/main/java/net/minecraft/client/particle/MobAppearance.java b/src/game/java/net/minecraft/client/particle/MobAppearance.java
similarity index 100%
rename from src/main/java/net/minecraft/client/particle/MobAppearance.java
rename to src/game/java/net/minecraft/client/particle/MobAppearance.java
diff --git a/src/main/java/net/minecraft/client/player/inventory/ContainerLocalMenu.java b/src/game/java/net/minecraft/client/player/inventory/ContainerLocalMenu.java
similarity index 100%
rename from src/main/java/net/minecraft/client/player/inventory/ContainerLocalMenu.java
rename to src/game/java/net/minecraft/client/player/inventory/ContainerLocalMenu.java
diff --git a/src/main/java/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java b/src/game/java/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java
similarity index 100%
rename from src/main/java/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java
rename to src/game/java/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java
diff --git a/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java b/src/game/java/net/minecraft/client/renderer/ActiveRenderInfo.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java
rename to src/game/java/net/minecraft/client/renderer/ActiveRenderInfo.java
diff --git a/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java b/src/game/java/net/minecraft/client/renderer/BlockFluidRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java
rename to src/game/java/net/minecraft/client/renderer/BlockFluidRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/BlockModelRenderer.java b/src/game/java/net/minecraft/client/renderer/BlockModelRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/BlockModelRenderer.java
rename to src/game/java/net/minecraft/client/renderer/BlockModelRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/BlockModelShapes.java b/src/game/java/net/minecraft/client/renderer/BlockModelShapes.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/BlockModelShapes.java
rename to src/game/java/net/minecraft/client/renderer/BlockModelShapes.java
diff --git a/src/main/java/net/minecraft/client/renderer/BlockRendererDispatcher.java b/src/game/java/net/minecraft/client/renderer/BlockRendererDispatcher.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/BlockRendererDispatcher.java
rename to src/game/java/net/minecraft/client/renderer/BlockRendererDispatcher.java
diff --git a/src/main/java/net/minecraft/client/renderer/ChestRenderer.java b/src/game/java/net/minecraft/client/renderer/ChestRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/ChestRenderer.java
rename to src/game/java/net/minecraft/client/renderer/ChestRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/ChunkRenderContainer.java b/src/game/java/net/minecraft/client/renderer/ChunkRenderContainer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/ChunkRenderContainer.java
rename to src/game/java/net/minecraft/client/renderer/ChunkRenderContainer.java
diff --git a/src/main/java/net/minecraft/client/renderer/DestroyBlockProgress.java b/src/game/java/net/minecraft/client/renderer/DestroyBlockProgress.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/DestroyBlockProgress.java
rename to src/game/java/net/minecraft/client/renderer/DestroyBlockProgress.java
diff --git a/src/main/java/net/minecraft/client/renderer/EntityRenderer.java b/src/game/java/net/minecraft/client/renderer/EntityRenderer.java
similarity index 93%
rename from src/main/java/net/minecraft/client/renderer/EntityRenderer.java
rename to src/game/java/net/minecraft/client/renderer/EntityRenderer.java
index 1a6604a..b181365 100755
--- a/src/main/java/net/minecraft/client/renderer/EntityRenderer.java
+++ b/src/game/java/net/minecraft/client/renderer/EntityRenderer.java
@@ -8,13 +8,15 @@ import java.util.Arrays;
 import java.util.List;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.HString;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
+
 import java.util.concurrent.Callable;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 
 import net.lax1dude.eaglercraft.v1_8.Display;
-import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
@@ -43,6 +45,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.MapItemRenderer;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.multiplayer.WorldClient;
@@ -298,7 +301,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		Entity entity = this.mc.getRenderViewEntity();
 		if (entity != null) {
 			if (this.mc.theWorld != null) {
-				this.mc.mcProfiler.startSection("pick");
 				this.mc.pointedEntity = null;
 				double d0 = (double) this.mc.playerController.getBlockReachDistance();
 				this.mc.objectMouseOver = entity.rayTrace(d0, partialTicks);
@@ -378,8 +380,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 						this.mc.pointedEntity = this.pointedEntity;
 					}
 				}
-
-				this.mc.mcProfiler.endSection();
 			}
 		}
 	}
@@ -738,7 +738,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 
 	private void updateLightmap(float partialTicks) {
 		if (this.lightmapUpdateNeeded) {
-			this.mc.mcProfiler.startSection("lightTex");
 			WorldClient worldclient = this.mc.theWorld;
 			if (worldclient != null) {
 				float f = worldclient.getSunBrightness(1.0F);
@@ -865,7 +864,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 				GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
 
 				this.lightmapUpdateNeeded = false;
-				this.mc.mcProfiler.endSection();
 			}
 		}
 	}
@@ -876,9 +874,9 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 	}
 
 	public void func_181560_a(float parFloat1, long parLong1) {
-		boolean flag = Display.isActive();
+		boolean flag = Display.isActive() || mc.gameSettings.touchscreen;
 		if (!flag && this.mc.gameSettings.pauseOnLostFocus
-				&& (!this.mc.gameSettings.touchscreen || !Mouse.isButtonDown(1))) {
+				&& (!this.mc.gameSettings.touchscreen || !PointerInputAbstraction.getVCursorButtonDown(1))) {
 			if (Minecraft.getSystemTime() - this.prevFrameTime > 500L) {
 				this.mc.displayInGameMenu();
 			}
@@ -886,8 +884,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			this.prevFrameTime = Minecraft.getSystemTime();
 		}
 
-		this.mc.mcProfiler.startSection("mouse");
-
 		if (this.mc.inGameHasFocus && flag) {
 			this.mc.mouseHelper.mouseXYChange();
 			float f = this.mc.gameSettings.mouseSensitivity * 0.6F + 0.2F;
@@ -917,25 +913,23 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			}
 		}
 
-		this.mc.mcProfiler.endSection();
 		if (!this.mc.skipRenderWorld) {
 			anaglyphEnable = this.mc.gameSettings.anaglyph;
-			final ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+			final ScaledResolution scaledresolution = mc.scaledResolution;
 			int l = scaledresolution.getScaledWidth();
 			int i1 = scaledresolution.getScaledHeight();
-			final int j1 = Mouse.getX() * l / this.mc.displayWidth;
-			final int k1 = i1 - Mouse.getY() * i1 / this.mc.displayHeight - 1;
+			final int j1 = PointerInputAbstraction.getVCursorX() * l / this.mc.displayWidth;
+			final int k1 = i1 - PointerInputAbstraction.getVCursorY() * i1 / this.mc.displayHeight - 1;
 			int l1 = this.mc.gameSettings.limitFramerate;
 			if (this.mc.theWorld != null) {
-				this.mc.mcProfiler.startSection("level");
 				int i = Math.min(Minecraft.getDebugFPS(), l1);
 				i = Math.max(i, 60);
 				long j = System.nanoTime() - parLong1;
 				long k = Math.max((long) (1000000000 / i / 4) - j, 0L);
 				this.renderWorld(parFloat1, System.nanoTime() + k);
 				this.renderEndNanoTime = System.nanoTime();
-				this.mc.mcProfiler.endStartSection("gui");
-				if (!this.mc.gameSettings.hideGUI || this.mc.currentScreen != null) {
+				final boolean b = !this.mc.gameSettings.hideGUI || this.mc.currentScreen != null;
+				if (b) {
 					GlStateManager.alphaFunc(GL_GREATER, 0.1F);
 					long framebufferAge = this.overlayFramebuffer.getAge();
 					if (framebufferAge == -1l || framebufferAge > (Minecraft.getDebugFPS() < 25 ? 125l : 75l)) {
@@ -944,10 +938,14 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 						GlStateManager.clearColor(0.0f, 0.0f, 0.0f, 0.0f);
 						GlStateManager.clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 						GlStateManager.enableOverlayFramebufferBlending();
-						this.mc.ingameGUI.renderGameOverlay(parFloat1);
+						if (b) {
+							this.mc.ingameGUI.renderGameOverlay(parFloat1);
+						}
 						GlStateManager.disableOverlayFramebufferBlending();
 						this.overlayFramebuffer.endRender();
 					}
+				}
+				if (b) {
 					this.setupOverlayRendering();
 					GlStateManager.disableLighting();
 					GlStateManager.enableBlend();
@@ -959,7 +957,7 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 					GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
 					GlStateManager.enableBlend();
 					GlStateManager.blendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-					GlStateManager.disableAlpha();
+					GlStateManager.enableAlpha();
 					GlStateManager.disableDepth();
 					GlStateManager.depthMask(false);
 					Tessellator tessellator = Tessellator.getInstance();
@@ -972,15 +970,12 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 					tessellator.draw();
 					GlStateManager.depthMask(true);
 					GlStateManager.enableDepth();
-					GlStateManager.enableAlpha();
 					GlStateManager.disableBlend();
 					if (this.mc.gameSettings.hudPlayer) { // give the player model HUD good fps
 						this.mc.ingameGUI.drawEaglerPlayerOverlay(l - 3,
 								3 + this.mc.ingameGUI.overlayDebug.playerOffset, parFloat1);
 					}
 				}
-
-				this.mc.mcProfiler.endSection();
 			} else {
 				GlStateManager.viewport(0, 0, this.mc.displayWidth, this.mc.displayHeight);
 				GlStateManager.matrixMode(GL_PROJECTION);
@@ -991,11 +986,32 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 				this.renderEndNanoTime = System.nanoTime();
 			}
 
+			this.mc.notifRenderer.renderOverlay(j1, k1);
+
 			if (this.mc.currentScreen != null) {
 				GlStateManager.clear(GL_DEPTH_BUFFER_BIT);
+				float f = 1.0f;
+				final float[] ff = new float[] { 1.0f };
 
 				try {
-					this.mc.currentScreen.drawScreen(j1, k1, parFloat1);
+					f = mc.currentScreen.getEaglerScale();
+					int mx, my;
+					if (f == 1.0f) {
+						mx = j1;
+						my = k1;
+					} else {
+						mx = GuiScreen.applyEaglerScale(f, j1, l);
+						my = GuiScreen.applyEaglerScale(f, k1, i1);
+						GlStateManager.pushMatrix();
+						float fff = (1.0f - f) * 0.5f;
+						GlStateManager.translate(fff * l, fff * i1, 0.0f);
+						GlStateManager.scale(f, f, f);
+					}
+					ff[0] = f;
+					this.mc.currentScreen.drawScreen(mx, my, parFloat1);
+					if (f != 1.0f) {
+						GlStateManager.popMatrix();
+					}
 				} catch (Throwable throwable) {
 					CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Rendering screen");
 					CrashReportCategory crashreportcategory = crashreport.makeCategory("Screen render details");
@@ -1008,7 +1024,8 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 						public String call() throws Exception {
 							return HString.format("Scaled: (%d, %d). Absolute: (%d, %d)",
 									new Object[] { Integer.valueOf(j1), Integer.valueOf(k1),
-											Integer.valueOf(Mouse.getX()), Integer.valueOf(Mouse.getY()) });
+											Integer.valueOf(PointerInputAbstraction.getVCursorX()),
+											Integer.valueOf(PointerInputAbstraction.getVCursorY()) });
 						}
 					});
 					crashreportcategory.addCrashSectionCallable("Screen size", new Callable<String>() {
@@ -1021,12 +1038,16 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 											Integer.valueOf(scaledresolution.getScaleFactor()) });
 						}
 					});
+					crashreportcategory.addCrashSectionCallable("Eagler Scale", new Callable<String>() {
+						public String call() throws Exception {
+							return "" + ff[0];
+						}
+					});
 					throw new ReportedException(crashreport);
 				}
 
 				this.mc.voiceOverlay.drawOverlay();
 			}
-
 		}
 	}
 
@@ -1102,7 +1123,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		GlStateManager.enableDepth();
 		GlStateManager.enableAlpha();
 		GlStateManager.alphaFunc(GL_GREATER, 0.5F);
-		this.mc.mcProfiler.startSection("center");
 		boolean dlights = DynamicLightsStateManager.isDynamicLightsRender();
 		if (dlights) {
 			updateDynamicLightListEagler(partialTicks);
@@ -1138,7 +1158,9 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 				}
 				mc.effectRenderer.acceleratedParticleRenderer = EffectRenderer.vanillaAcceleratedParticleRenderer;
 			} else {
-				mc.effectRenderer.acceleratedParticleRenderer = EffectRenderer.vanillaAcceleratedParticleRenderer;
+				mc.effectRenderer.acceleratedParticleRenderer = EaglercraftGPU.checkInstancingCapable()
+						? EffectRenderer.vanillaAcceleratedParticleRenderer
+						: null;
 				if (dlights) {
 					GlStateManager.enableExtensionPipeline();
 				}
@@ -1155,8 +1177,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		if (fxaa) {
 			EffectPipelineFXAA.end();
 		}
-
-		this.mc.mcProfiler.endSection();
 	}
 
 	private void renderWorldPass(int pass, float partialTicks, long finishTimeNano) {
@@ -1164,18 +1184,15 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		EffectRenderer effectrenderer = this.mc.effectRenderer;
 		boolean flag = this.isDrawBlockOutline();
 		GlStateManager.enableCull();
-		this.mc.mcProfiler.endStartSection("clear");
 		GlStateManager.viewport(0, 0, this.mc.displayWidth, this.mc.displayHeight);
 		this.updateFogColor(partialTicks);
 		GlStateManager.clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-		this.mc.mcProfiler.endStartSection("camera");
 		this.setupCameraTransform(partialTicks, pass);
 		boolean isDynamicLights = DynamicLightsStateManager.isDynamicLightsRender();
 		if (isDynamicLights) {
 			DynamicLightsStateManager.setupInverseViewMatrix();
 		}
 		ActiveRenderInfo.updateRenderInfo(this.mc.thePlayer, this.mc.gameSettings.thirdPersonView == 2);
-		this.mc.mcProfiler.endStartSection("culling");
 		Frustum frustum = new Frustum();
 		Entity entity = this.mc.getRenderViewEntity();
 		double d0 = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * (double) partialTicks;
@@ -1187,7 +1204,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		frustum.setPosition(d0, d1, d2);
 		if (this.mc.gameSettings.renderDistanceChunks >= 4) {
 			this.setupFog(-1, partialTicks);
-			this.mc.mcProfiler.endStartSection("sky");
 			GlStateManager.matrixMode(GL_PROJECTION);
 			GlStateManager.loadIdentity();
 			float vigg = this.getFOVModifier(partialTicks, true);
@@ -1208,19 +1224,15 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			this.renderCloudsCheck(renderglobal, partialTicks, pass);
 		}
 
-		this.mc.mcProfiler.endStartSection("prepareterrain");
 		this.setupFog(0, partialTicks);
 		this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
 		RenderHelper.disableStandardItemLighting();
-		this.mc.mcProfiler.endStartSection("terrain_setup");
 		renderglobal.setupTerrain(entity, (double) partialTicks, frustum, this.frameCount++,
 				this.mc.thePlayer.isSpectator());
 		if (pass == 0 || pass == 2) {
-			this.mc.mcProfiler.endStartSection("updatechunks");
 			this.mc.renderGlobal.updateChunks(finishTimeNano);
 		}
 
-		this.mc.mcProfiler.endStartSection("terrain");
 		GlStateManager.matrixMode(GL_MODELVIEW);
 		GlStateManager.pushMatrix();
 		GlStateManager.disableAlpha();
@@ -1238,7 +1250,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			GlStateManager.popMatrix();
 			GlStateManager.pushMatrix();
 			RenderHelper.enableStandardItemLighting();
-			this.mc.mcProfiler.endStartSection("entities");
 			renderglobal.renderEntities(entity, frustum, partialTicks);
 			RenderHelper.disableStandardItemLighting();
 			this.disableLightmap();
@@ -1248,7 +1259,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			if (this.mc.objectMouseOver != null && entity.isInsideOfMaterial(Material.water) && flag) {
 				EntityPlayer entityplayer = (EntityPlayer) entity;
 				GlStateManager.disableAlpha();
-				this.mc.mcProfiler.endStartSection("outline");
 				if (isDynamicLights) {
 					GlStateManager.disableExtensionPipeline();
 				}
@@ -1268,7 +1278,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			if (isDynamicLights) {
 				GlStateManager.disableExtensionPipeline();
 			}
-			this.mc.mcProfiler.endStartSection("outline");
 			renderglobal.drawSelectionBox(entityplayer1, this.mc.objectMouseOver, 0, partialTicks);
 			GlStateManager.enableAlpha();
 			if (isDynamicLights) {
@@ -1276,7 +1285,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			}
 		}
 
-		this.mc.mcProfiler.endStartSection("destroyProgress");
 		GlStateManager.enableBlend();
 		GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, 1, 1, 0);
 		this.mc.getTextureManager().getTexture(TextureMap.locationBlocksTexture).setBlurMipmap(false, false);
@@ -1286,11 +1294,9 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		GlStateManager.disableBlend();
 		if (!this.debugView) {
 			this.enableLightmap();
-			this.mc.mcProfiler.endStartSection("litParticles");
 			effectrenderer.renderLitParticles(entity, partialTicks);
 			RenderHelper.disableStandardItemLighting();
 			this.setupFog(0, partialTicks);
-			this.mc.mcProfiler.endStartSection("particles");
 			if (isDynamicLights) {
 				DynamicLightsStateManager.bindAcceleratedEffectRenderer(effectrenderer);
 				DynamicLightsStateManager.reportForwardRenderObjectPosition2(0.0f, 0.0f, 0.0f);
@@ -1304,7 +1310,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 
 		GlStateManager.depthMask(false);
 		GlStateManager.enableCull();
-		this.mc.mcProfiler.endStartSection("weather");
 		this.renderRainSnow(partialTicks);
 		GlStateManager.depthMask(true);
 		renderglobal.renderWorldBorder(entity, partialTicks);
@@ -1317,7 +1322,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		GlStateManager.depthMask(false);
 		this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
 		GlStateManager.shadeModel(GL_SMOOTH);
-		this.mc.mcProfiler.endStartSection("translucent");
 		renderglobal.renderBlockLayer(EnumWorldBlockLayer.TRANSLUCENT, (double) partialTicks, pass, entity);
 		GlStateManager.shadeModel(GL_FLAT);
 		GlStateManager.depthMask(true);
@@ -1325,11 +1329,9 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		GlStateManager.disableBlend();
 		GlStateManager.disableFog();
 		if (entity.posY + (double) entity.getEyeHeight() >= 128.0D) {
-			this.mc.mcProfiler.endStartSection("aboveClouds");
 			this.renderCloudsCheck(renderglobal, partialTicks, pass);
 		}
 
-		this.mc.mcProfiler.endStartSection("hand");
 		if (this.renderHand) {
 			GlStateManager.clear(GL_DEPTH_BUFFER_BIT);
 			this.renderHand(partialTicks, pass);
@@ -1354,7 +1356,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 
 	private void renderCloudsCheck(RenderGlobal renderGlobalIn, float partialTicks, int pass) {
 		if (this.mc.gameSettings.func_181147_e() != 0) {
-			this.mc.mcProfiler.endStartSection("clouds");
 			GlStateManager.matrixMode(GL_PROJECTION);
 			GlStateManager.loadIdentity();
 			GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
@@ -1642,7 +1643,7 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 	 * Setup orthogonal projection for rendering GUI screen overlays
 	 */
 	public void setupOverlayRendering() {
-		ScaledResolution scaledresolution = new ScaledResolution(this.mc);
+		ScaledResolution scaledresolution = mc.scaledResolution;
 		GlStateManager.clear(GL_DEPTH_BUFFER_BIT);
 		GlStateManager.matrixMode(GL_PROJECTION);
 		GlStateManager.loadIdentity();
@@ -1842,7 +1843,7 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		} else if (block.getMaterial() == Material.lava) {
 			GlStateManager.setFog(GL_EXP);
 			GlStateManager.setFogDensity(2.0F);
-		} else if (!this.mc.gameSettings.fog) {
+		} else if (partialTicks != -1 && !this.mc.gameSettings.fog) {
 			GlStateManager.setFog(GL_EXP);
 			GlStateManager.setFogDensity(0.0F);
 		} else {
@@ -1898,28 +1899,23 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			EaglerDeferredPipeline.renderSuspended();
 			return;
 		}
-		mc.mcProfiler.endStartSection("eaglercraftShaders");
 		EaglerDeferredPipeline.instance.setPartialTicks(partialTicks);
 		eagPartialTicks = partialTicks;
 		EaglerDeferredConfig conf = mc.gameSettings.deferredShaderConf;
 		boolean flag = isDrawBlockOutline();
 		GlStateManager.viewport(0, 0, mc.displayWidth, mc.displayHeight);
-		mc.mcProfiler.startSection("camera");
 		setupCameraTransform(partialTicks, 2);
 		EaglerDeferredPipeline.instance.loadViewMatrix();
 		ActiveRenderInfo.updateRenderInfo(mc.thePlayer, mc.gameSettings.thirdPersonView == 2);
-		mc.mcProfiler.endStartSection("culling");
 		Frustum frustum = new Frustum();
 		Entity entity = mc.getRenderViewEntity();
 		if (entity == null) {
 			entity = mc.thePlayer;
 		}
-		double d0 = EaglerDeferredPipeline.instance.currentRenderX = entity.lastTickPosX
-				+ (entity.posX - entity.lastTickPosX) * (double) partialTicks;
-		double d1 = EaglerDeferredPipeline.instance.currentRenderY = entity.lastTickPosY
-				+ (entity.posY - entity.lastTickPosY) * (double) partialTicks;
-		double d2 = EaglerDeferredPipeline.instance.currentRenderZ = entity.lastTickPosZ
-				+ (entity.posZ - entity.lastTickPosZ) * (double) partialTicks;
+		double d0 = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * (double) partialTicks;
+		double d1 = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * (double) partialTicks;
+		double d2 = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * (double) partialTicks;
+		EaglerDeferredPipeline.instance.setRenderPosGlobal(d0, d1, d2);
 		EaglerDeferredPipeline.instance.updateReprojectionCoordinates(d0, d1, d2);
 		float eyeHeight = entity.getEyeHeight();
 		frustum.setPosition(d0, d1, d2);
@@ -1931,7 +1927,7 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 //		}
 //		System.out.println(builder.toString());
 
-		float waveTimer = (float) ((System.currentTimeMillis() % 600000l) * 0.001);
+		float waveTimer = (float) ((EagRuntime.steadyTimeMillis() % 600000l) * 0.001);
 		DeferredStateManager.setWaterWindOffset(0.0f, 0.0f, waveTimer, waveTimer);
 
 		float blockWaveDistX = (float) (d0 - blockWaveOffsetX);
@@ -1956,7 +1952,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 
 		// if (mc.gameSettings.renderDistanceChunks >= 4) vanilla shows sky not fog
 
-		mc.mcProfiler.endStartSection("terrain_setup");
 		mc.renderGlobal.setupTerrain(entity, (double) partialTicks, frustum, frameCount++, mc.thePlayer.isSpectator());
 
 		// clear some state:
@@ -1974,11 +1969,8 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 
 		EaglerDeferredPipeline.instance.beginDrawMainGBufferTerrain();
 
-		mc.mcProfiler.endStartSection("updatechunks");
 		mc.renderGlobal.updateChunks(finishTimeNano);
 
-		mc.mcProfiler.endStartSection("terrain");
-
 		mc.renderGlobal.renderBlockLayer(EnumWorldBlockLayer.SOLID, (double) partialTicks, 2, entity);
 		GlStateManager.enableAlpha();
 		GlStateManager.alphaFunc(GL_GREATER, 0.5F);
@@ -2007,20 +1999,17 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		NameTagRenderer.doRenderNameTags = true;
 		NameTagRenderer.nameTagsCount = 0;
 		GlStateManager.pushMatrix();
-		mc.mcProfiler.endStartSection("entities");
 		DeferredStateManager.setDefaultMaterialConstants();
 		DeferredStateManager.startUsingEnvMap();
 		mc.renderGlobal.renderEntities(entity, frustum, partialTicks);
 		GlStateManager.matrixMode(GL_MODELVIEW);
 		GlStateManager.popMatrix();
-		mc.mcProfiler.endStartSection("litParticles");
 		EntityFX.interpPosX = d0;
 		EntityFX.interpPosY = d1;
 		EntityFX.interpPosZ = d2;
 		enableLightmap();
 		GlStateManager.pushMatrix();
 		mc.effectRenderer.renderLitParticles(entity, partialTicks);
-		mc.mcProfiler.endStartSection("gbufferParticles");
 		GlStateManager.matrixMode(GL_MODELVIEW);
 		GlStateManager.popMatrix();
 		GlStateManager.pushMatrix();
@@ -2034,9 +2023,7 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		DynamicLightManager.setIsRenderingLights(false);
 		NameTagRenderer.doRenderNameTags = false;
 
-		mc.mcProfiler.endStartSection("endDrawMainGBuffer");
 		EaglerDeferredPipeline.instance.endDrawMainGBuffer();
-		mc.mcProfiler.endStartSection("shadowSetup");
 
 		// calculate sun matrix and angle:
 
@@ -2441,11 +2428,9 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			}
 		}
 
-		mc.mcProfiler.endStartSection("combineGBuffersAndIlluminate");
 		EaglerDeferredPipeline.instance.combineGBuffersAndIlluminate();
 
 		if (conf.is_rendering_useEnvMap) {
-			mc.mcProfiler.endStartSection("envMap");
 			DeferredStateManager.forwardCallbackHandler = null;
 			EaglerDeferredPipeline.instance.beginDrawEnvMap();
 			GlStateManager.enableCull();
@@ -2516,7 +2501,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		}
 
 		if (conf.is_rendering_realisticWater) {
-			mc.mcProfiler.endStartSection("realisticWaterMask");
 			EaglerDeferredPipeline.instance.beginDrawRealisticWaterMask();
 			enableLightmap();
 			mc.renderGlobal.renderBlockLayer(EnumWorldBlockLayer.REALISTIC_WATER, (double) partialTicks, 2, entity);
@@ -2524,8 +2508,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			EaglerDeferredPipeline.instance.endDrawRealisticWaterMask();
 		}
 
-		mc.mcProfiler.endStartSection("setupShaderFog");
-
 		int dim = mc.theWorld.provider.getDimensionId();
 		float ff;
 		if (dim == 0) {
@@ -2590,16 +2572,13 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		DeferredStateManager.setDefaultMaterialConstants();
 
 		if (conf.is_rendering_realisticWater) {
-			mc.mcProfiler.endStartSection("realisticWaterSurface");
 			EaglerDeferredPipeline.instance.beginDrawRealisticWaterSurface();
 			mc.renderGlobal.renderBlockLayer(EnumWorldBlockLayer.REALISTIC_WATER, (double) partialTicks, 2, entity);
 			EaglerDeferredPipeline.instance.endDrawRealisticWaterSurface();
 		}
 
-		mc.mcProfiler.endStartSection("gbufferFog");
 		EaglerDeferredPipeline.instance.applyGBufferFog();
 
-		mc.mcProfiler.endStartSection("translucentEntities");
 		EaglerDeferredPipeline.instance.beginDrawTranslucentEntities();
 
 		TileEntityRendererDispatcher.staticPlayerX = d0;
@@ -2623,14 +2602,11 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		DeferredStateManager.forwardCallbackGBuffer.reset();
 
 		EaglerDeferredPipeline.instance.beginDrawTranslucentBlocks();
-		mc.mcProfiler.endStartSection("translucentBlocks");
 		mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
 		mc.renderGlobal.renderBlockLayer(EnumWorldBlockLayer.TRANSLUCENT, (double) partialTicks, 2, entity);
 
 		EaglerDeferredPipeline.instance.beginDrawMainGBufferDestroyProgress();
 
-		mc.mcProfiler.endStartSection("destroyProgress");
-
 		GlStateManager.enableBlend();
 		GlStateManager.tryBlendFuncSeparate(0, GL_SRC_ALPHA, 0, 0);
 		GlStateManager.color(1.0f, 1.0f, 1.0f, 0.5f);
@@ -2642,7 +2618,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		EaglerDeferredPipeline.instance.endDrawMainGBufferDestroyProgress();
 
 		if (mc.effectRenderer.hasParticlesInAlphaLayer()) {
-			mc.mcProfiler.endStartSection("transparentParticles");
 			GlStateManager.pushMatrix();
 			mc.effectRenderer.acceleratedParticleRenderer = EaglerDeferredPipeline.instance.forwardEffectRenderer;
 			DeferredStateManager.setHDRTranslucentPassBlendFunc();
@@ -2658,22 +2633,18 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		}
 
 		if (conf.is_rendering_useEnvMap) {
-			mc.mcProfiler.endStartSection("glassHighlights");
 			EaglerDeferredPipeline.instance.beginDrawGlassHighlights();
 			mc.renderGlobal.renderBlockLayer(EnumWorldBlockLayer.GLASS_HIGHLIGHTS, (double) partialTicks, 2, entity);
 			EaglerDeferredPipeline.instance.endDrawGlassHighlights();
 		}
 
-		mc.mcProfiler.endStartSection("saveReprojData");
 		EaglerDeferredPipeline.instance.saveReprojData();
 
-		mc.mcProfiler.endStartSection("rainSnow");
 		renderRainSnow(partialTicks);
 
 		GlStateManager.disableBlend();
 
 		if (renderHand) {
-			mc.mcProfiler.endStartSection("renderHandOverlay");
 			EaglerDeferredPipeline.instance.beginDrawHandOverlay();
 			DeferredStateManager.reportForwardRenderObjectPosition2(0.0f, 0.0f, 0.0f);
 			DeferredStateManager.forwardCallbackHandler = DeferredStateManager.forwardCallbackGBuffer;
@@ -2699,7 +2670,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			GlStateManager.disableAlpha();
 		}
 
-		mc.mcProfiler.endStartSection("endDrawDeferred");
 		EaglerDeferredPipeline.instance.endDrawHDRTranslucent();
 
 		EaglerDeferredPipeline.instance.endDrawDeferred();
@@ -2719,11 +2689,9 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 		if (!DebugFramebufferView.debugViewShown) {
 			GlStateManager.disableAlpha();
 			if (isDrawBlockOutline()) {
-				this.mc.mcProfiler.endStartSection("outline");
 				mc.renderGlobal.drawSelectionBox(mc.thePlayer, this.mc.objectMouseOver, 0, partialTicks);
 			}
 			GlStateManager.enableAlpha();
-			this.mc.mcProfiler.endStartSection("nameTags");
 			if (NameTagRenderer.nameTagsCount > 0) {
 				enableLightmap();
 				Arrays.sort(NameTagRenderer.nameTagsThisFrame, 0, NameTagRenderer.nameTagsCount, (n1, n2) -> {
@@ -2750,11 +2718,8 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 			}
 			disableLightmap();
 			GlStateManager.disableLighting();
-			this.mc.mcProfiler.endStartSection("worldBorder");
 			mc.renderGlobal.renderWorldBorder(entity, partialTicks);
 		}
-
-		mc.mcProfiler.endSection();
 	}
 
 	public boolean renderHeldItemLight(EntityLivingBase entityLiving, float mag) {
diff --git a/src/main/java/net/minecraft/client/renderer/EnumFaceDirection.java b/src/game/java/net/minecraft/client/renderer/EnumFaceDirection.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/EnumFaceDirection.java
rename to src/game/java/net/minecraft/client/renderer/EnumFaceDirection.java
diff --git a/src/main/java/net/minecraft/client/renderer/GLAllocation.java b/src/game/java/net/minecraft/client/renderer/GLAllocation.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/GLAllocation.java
rename to src/game/java/net/minecraft/client/renderer/GLAllocation.java
diff --git a/src/main/java/net/minecraft/client/renderer/IImageBuffer.java b/src/game/java/net/minecraft/client/renderer/IImageBuffer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/IImageBuffer.java
rename to src/game/java/net/minecraft/client/renderer/IImageBuffer.java
diff --git a/src/main/java/net/minecraft/client/renderer/ImageBufferDownload.java b/src/game/java/net/minecraft/client/renderer/ImageBufferDownload.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/ImageBufferDownload.java
rename to src/game/java/net/minecraft/client/renderer/ImageBufferDownload.java
diff --git a/src/main/java/net/minecraft/client/renderer/InventoryEffectRenderer.java b/src/game/java/net/minecraft/client/renderer/InventoryEffectRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/InventoryEffectRenderer.java
rename to src/game/java/net/minecraft/client/renderer/InventoryEffectRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/ItemMeshDefinition.java b/src/game/java/net/minecraft/client/renderer/ItemMeshDefinition.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/ItemMeshDefinition.java
rename to src/game/java/net/minecraft/client/renderer/ItemMeshDefinition.java
diff --git a/src/main/java/net/minecraft/client/renderer/ItemModelMesher.java b/src/game/java/net/minecraft/client/renderer/ItemModelMesher.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/ItemModelMesher.java
rename to src/game/java/net/minecraft/client/renderer/ItemModelMesher.java
diff --git a/src/main/java/net/minecraft/client/renderer/ItemRenderer.java b/src/game/java/net/minecraft/client/renderer/ItemRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/ItemRenderer.java
rename to src/game/java/net/minecraft/client/renderer/ItemRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/RegionRenderCache.java b/src/game/java/net/minecraft/client/renderer/RegionRenderCache.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/RegionRenderCache.java
rename to src/game/java/net/minecraft/client/renderer/RegionRenderCache.java
diff --git a/src/main/java/net/minecraft/client/renderer/RegionRenderCacheBuilder.java b/src/game/java/net/minecraft/client/renderer/RegionRenderCacheBuilder.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/RegionRenderCacheBuilder.java
rename to src/game/java/net/minecraft/client/renderer/RegionRenderCacheBuilder.java
diff --git a/src/main/java/net/minecraft/client/renderer/RenderGlobal.java b/src/game/java/net/minecraft/client/renderer/RenderGlobal.java
similarity index 96%
rename from src/main/java/net/minecraft/client/renderer/RenderGlobal.java
rename to src/game/java/net/minecraft/client/renderer/RenderGlobal.java
index bb9623f..e7925b6 100755
--- a/src/main/java/net/minecraft/client/renderer/RenderGlobal.java
+++ b/src/game/java/net/minecraft/client/renderer/RenderGlobal.java
@@ -8,6 +8,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.HString;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
@@ -500,7 +502,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 					+ (renderViewEntity.posY - renderViewEntity.prevPosY) * (double) partialTicks;
 			double d2 = renderViewEntity.prevPosZ
 					+ (renderViewEntity.posZ - renderViewEntity.prevPosZ) * (double) partialTicks;
-			this.theWorld.theProfiler.startSection("prepare");
 			TileEntityRendererDispatcher.instance.cacheActiveRenderInfo(this.theWorld, this.mc.getTextureManager(),
 					this.mc.fontRendererObj, this.mc.getRenderViewEntity(), partialTicks);
 			this.renderManager.cacheActiveRenderInfo(this.theWorld, this.mc.fontRendererObj,
@@ -517,7 +518,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 			TileEntityRendererDispatcher.staticPlayerZ = d5;
 			this.renderManager.setRenderPosition(d3, d4, d5);
 			this.mc.entityRenderer.enableLightmap();
-			this.theWorld.theProfiler.endStartSection("global");
 			List list = this.theWorld.getLoadedEntityList();
 			this.countEntitiesTotal = list.size();
 
@@ -534,8 +534,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 				}
 			}
 
-			this.theWorld.theProfiler.endStartSection("entities");
-
 			label738: for (int ii = 0, ll = this.renderInfos.size(); ii < ll; ++ii) {
 				RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation = this.renderInfos
 						.get(ii);
@@ -585,7 +583,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 				}
 			}
 
-			this.theWorld.theProfiler.endStartSection("blockentities");
 			RenderHelper.enableStandardItemLighting();
 
 			for (int ii = 0, ll = this.renderInfos.size(); ii < ll; ++ii) {
@@ -633,7 +630,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 
 			this.postRenderDamagedBlocks();
 			this.mc.entityRenderer.disableLightmap();
-			this.mc.mcProfiler.endSection();
 		}
 	}
 
@@ -648,8 +644,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 	public void renderShadowLODEntities(Entity renderViewEntity, float partialTicks,
 			EntityChunkCullAdapter entityChunkCull, EntityObjectCullAdapter entityObjectCull) { // TODO
 		if (renderEntitiesStartupCounter <= 0) {
-			theWorld.theProfiler.startSection("shadow_entity_prepare");
-
 			TileEntityRendererDispatcher.instance.cacheActiveRenderInfo(theWorld, mc.getTextureManager(),
 					mc.fontRendererObj, renderViewEntity, partialTicks);
 			renderManager.cacheActiveRenderInfo(theWorld, mc.fontRendererObj, renderViewEntity, mc.pointedEntity,
@@ -666,7 +660,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 			TileEntityRendererDispatcher.staticPlayerZ = d5;
 			renderManager.setRenderPosition(d3, d4, d5);
 
-			this.theWorld.theProfiler.endStartSection("shadow_entities");
 			for (RenderGlobal.ContainerLocalRenderInformation containerlocalrenderinformation : this.renderInfos) {
 				RenderChunk currentRenderChunk = containerlocalrenderinformation.renderChunk;
 
@@ -720,14 +713,11 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 					GlStateManager.depthMask(true);
 				}
 			}
-			theWorld.theProfiler.endSection();
 		}
 	}
 
 	public void renderParaboloidTileEntities(Entity renderViewEntity, float partialTicks, int up) {
 		if (renderEntitiesStartupCounter <= 0) {
-			theWorld.theProfiler.startSection("paraboloid_entity_prepare");
-
 			TileEntityRendererDispatcher.instance.cacheActiveRenderInfo(theWorld, mc.getTextureManager(),
 					mc.fontRendererObj, renderViewEntity, partialTicks);
 			renderManager.cacheActiveRenderInfo(theWorld, mc.fontRendererObj, renderViewEntity, mc.pointedEntity,
@@ -768,7 +758,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 			maxY = MathHelper.floor_double(maxY / 16.0) * 16;
 			maxZ = MathHelper.floor_double(maxZ / 16.0) * 16;
 
-			this.theWorld.theProfiler.endStartSection("paraboloid_entities");
 			for (int cx = minX; cx <= maxX; cx += 16) {
 				for (int cz = minZ; cz <= maxZ; cz += 16) {
 					for (int cy = minY; cy <= maxY; cy += 16) {
@@ -791,7 +780,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 					}
 				}
 			}
-			theWorld.theProfiler.endSection();
 			mc.entityRenderer.disableLightmap();
 		}
 	}
@@ -831,7 +819,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 			this.loadRenderers();
 		}
 
-		this.theWorld.theProfiler.startSection("camera");
 		double d0 = viewEntity.posX - this.frustumUpdatePosX;
 		double d1 = viewEntity.posY - this.frustumUpdatePosY;
 		double d2 = viewEntity.posZ - this.frustumUpdatePosZ;
@@ -847,12 +834,10 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 			this.viewFrustum.updateChunkPositions(viewEntity.posX, viewEntity.posZ);
 		}
 
-		this.theWorld.theProfiler.endStartSection("renderlistcamera");
 		double d3 = viewEntity.lastTickPosX + (viewEntity.posX - viewEntity.lastTickPosX) * partialTicks;
 		double d4 = viewEntity.lastTickPosY + (viewEntity.posY - viewEntity.lastTickPosY) * partialTicks;
 		double d5 = viewEntity.lastTickPosZ + (viewEntity.posZ - viewEntity.lastTickPosZ) * partialTicks;
 		this.renderContainer.initialize(d3, d4, d5);
-		this.theWorld.theProfiler.endStartSection("cull");
 		if (this.debugFixedClippingHelper != null) {
 			Frustum frustum = new Frustum(this.debugFixedClippingHelper);
 			frustum.setPosition(this.debugTerrainFrustumPosition.field_181059_a,
@@ -860,7 +845,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 			camera = frustum;
 		}
 
-		this.mc.mcProfiler.endStartSection("culling");
 		BlockPos blockpos1 = new BlockPos(d3, d4 + (double) viewEntity.getEyeHeight(), d5);
 		RenderChunk renderchunk = this.viewFrustum.getRenderChunk(blockpos1);
 		BlockPos blockpos = new BlockPos(MathHelper.floor_double(d3 / 16.0D) * 16,
@@ -971,10 +955,8 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 				this.displayListEntitiesDirty = true;
 				if (this.mc.gameSettings.chunkFix ? this.isPositionInRenderChunkHack(blockpos1, renderchunk4)
 						: this.isPositionInRenderChunk(blockpos, renderchunk4)) {
-					this.mc.mcProfiler.startSection("build near");
 					this.renderDispatcher.updateChunkNow(renderchunk4);
 					renderchunk4.setNeedsUpdate(false);
-					this.mc.mcProfiler.endSection();
 				} else {
 					this.chunksToUpdate.add(renderchunk4);
 				}
@@ -982,7 +964,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 		}
 
 		this.chunksToUpdate.addAll(set);
-		this.mc.mcProfiler.endSection();
 	}
 
 	private boolean isPositionInRenderChunk(BlockPos pos, RenderChunk renderChunkIn) {
@@ -1080,7 +1061,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 	public int renderBlockLayer(EnumWorldBlockLayer blockLayerIn, double partialTicks, int pass, Entity entityIn) {
 		RenderHelper.disableStandardItemLighting();
 		if (blockLayerIn == EnumWorldBlockLayer.TRANSLUCENT) {
-			this.mc.mcProfiler.startSection("translucent_sort");
 			double d0 = entityIn.posX - this.prevRenderSortX;
 			double d1 = entityIn.posY - this.prevRenderSortY;
 			double d2 = entityIn.posZ - this.prevRenderSortZ;
@@ -1100,11 +1080,8 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 					}
 				}
 			}
-
-			this.mc.mcProfiler.endSection();
 		}
 
-		this.mc.mcProfiler.startSection("filterempty");
 		int l = 0;
 		boolean flag = blockLayerIn == EnumWorldBlockLayer.TRANSLUCENT;
 		int i1 = flag ? this.renderInfos.size() - 1 : 0;
@@ -1120,9 +1097,7 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 			}
 		}
 
-		this.mc.mcProfiler.endStartSection("render_" + blockLayerIn);
 		this.renderBlockLayer(blockLayerIn);
-		this.mc.mcProfiler.endSection();
 		return l;
 	}
 
@@ -1157,7 +1132,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 			}
 		}
 		if (i > 0) {
-			this.mc.mcProfiler.endStartSection("render_shadow_" + blockLayerIn);
 			this.renderContainer.renderChunkLayer(blockLayerIn);
 		}
 		return i;
@@ -1216,7 +1190,6 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 			}
 		}
 		if (i > 0) {
-			this.mc.mcProfiler.endStartSection("render_paraboloid_" + up + "_" + blockLayerIn);
 			this.mc.entityRenderer.enableLightmap();
 			this.renderContainer.renderChunkLayer(blockLayerIn);
 			this.mc.entityRenderer.disableLightmap();
@@ -1798,7 +1771,7 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 
 				renderchunk.setNeedsUpdate(false);
 				iterator.remove();
-				long i = finishTimeNano - System.nanoTime();
+				long i = finishTimeNano - EagRuntime.nanoTime();
 				if (i < 0L) {
 					break;
 				}
diff --git a/src/main/java/net/minecraft/client/renderer/RenderHelper.java b/src/game/java/net/minecraft/client/renderer/RenderHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/RenderHelper.java
rename to src/game/java/net/minecraft/client/renderer/RenderHelper.java
diff --git a/src/main/java/net/minecraft/client/renderer/RenderList.java b/src/game/java/net/minecraft/client/renderer/RenderList.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/RenderList.java
rename to src/game/java/net/minecraft/client/renderer/RenderList.java
diff --git a/src/main/java/net/minecraft/client/renderer/StitcherException.java b/src/game/java/net/minecraft/client/renderer/StitcherException.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/StitcherException.java
rename to src/game/java/net/minecraft/client/renderer/StitcherException.java
diff --git a/src/main/java/net/minecraft/client/renderer/Tessellator.java b/src/game/java/net/minecraft/client/renderer/Tessellator.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/Tessellator.java
rename to src/game/java/net/minecraft/client/renderer/Tessellator.java
diff --git a/src/main/java/net/minecraft/client/renderer/ViewFrustum.java b/src/game/java/net/minecraft/client/renderer/ViewFrustum.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/ViewFrustum.java
rename to src/game/java/net/minecraft/client/renderer/ViewFrustum.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/BakedQuad.java b/src/game/java/net/minecraft/client/renderer/block/model/BakedQuad.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/BakedQuad.java
rename to src/game/java/net/minecraft/client/renderer/block/model/BakedQuad.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/BlockFaceUV.java b/src/game/java/net/minecraft/client/renderer/block/model/BlockFaceUV.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/BlockFaceUV.java
rename to src/game/java/net/minecraft/client/renderer/block/model/BlockFaceUV.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/BlockPart.java b/src/game/java/net/minecraft/client/renderer/block/model/BlockPart.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/BlockPart.java
rename to src/game/java/net/minecraft/client/renderer/block/model/BlockPart.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/BlockPartFace.java b/src/game/java/net/minecraft/client/renderer/block/model/BlockPartFace.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/BlockPartFace.java
rename to src/game/java/net/minecraft/client/renderer/block/model/BlockPartFace.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/BlockPartRotation.java b/src/game/java/net/minecraft/client/renderer/block/model/BlockPartRotation.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/BlockPartRotation.java
rename to src/game/java/net/minecraft/client/renderer/block/model/BlockPartRotation.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/BreakingFour.java b/src/game/java/net/minecraft/client/renderer/block/model/BreakingFour.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/BreakingFour.java
rename to src/game/java/net/minecraft/client/renderer/block/model/BreakingFour.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/FaceBakery.java b/src/game/java/net/minecraft/client/renderer/block/model/FaceBakery.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/FaceBakery.java
rename to src/game/java/net/minecraft/client/renderer/block/model/FaceBakery.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java b/src/game/java/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java
rename to src/game/java/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/ItemModelGenerator.java b/src/game/java/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
rename to src/game/java/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java b/src/game/java/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java
rename to src/game/java/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/ModelBlock.java b/src/game/java/net/minecraft/client/renderer/block/model/ModelBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/ModelBlock.java
rename to src/game/java/net/minecraft/client/renderer/block/model/ModelBlock.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java b/src/game/java/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java
rename to src/game/java/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/statemap/BlockStateMapper.java b/src/game/java/net/minecraft/client/renderer/block/statemap/BlockStateMapper.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/statemap/BlockStateMapper.java
rename to src/game/java/net/minecraft/client/renderer/block/statemap/BlockStateMapper.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/statemap/DefaultStateMapper.java b/src/game/java/net/minecraft/client/renderer/block/statemap/DefaultStateMapper.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/statemap/DefaultStateMapper.java
rename to src/game/java/net/minecraft/client/renderer/block/statemap/DefaultStateMapper.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/statemap/IStateMapper.java b/src/game/java/net/minecraft/client/renderer/block/statemap/IStateMapper.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/statemap/IStateMapper.java
rename to src/game/java/net/minecraft/client/renderer/block/statemap/IStateMapper.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/statemap/StateMap.java b/src/game/java/net/minecraft/client/renderer/block/statemap/StateMap.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/statemap/StateMap.java
rename to src/game/java/net/minecraft/client/renderer/block/statemap/StateMap.java
diff --git a/src/main/java/net/minecraft/client/renderer/block/statemap/StateMapperBase.java b/src/game/java/net/minecraft/client/renderer/block/statemap/StateMapperBase.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/block/statemap/StateMapperBase.java
rename to src/game/java/net/minecraft/client/renderer/block/statemap/StateMapperBase.java
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java b/src/game/java/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java
rename to src/game/java/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java b/src/game/java/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java
rename to src/game/java/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/CompiledChunk.java b/src/game/java/net/minecraft/client/renderer/chunk/CompiledChunk.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/chunk/CompiledChunk.java
rename to src/game/java/net/minecraft/client/renderer/chunk/CompiledChunk.java
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java b/src/game/java/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java
rename to src/game/java/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/ListChunkFactory.java b/src/game/java/net/minecraft/client/renderer/chunk/ListChunkFactory.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/chunk/ListChunkFactory.java
rename to src/game/java/net/minecraft/client/renderer/chunk/ListChunkFactory.java
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java b/src/game/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java
rename to src/game/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/RenderChunk.java b/src/game/java/net/minecraft/client/renderer/chunk/RenderChunk.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/chunk/RenderChunk.java
rename to src/game/java/net/minecraft/client/renderer/chunk/RenderChunk.java
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/SetVisibility.java b/src/game/java/net/minecraft/client/renderer/chunk/SetVisibility.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/chunk/SetVisibility.java
rename to src/game/java/net/minecraft/client/renderer/chunk/SetVisibility.java
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java b/src/game/java/net/minecraft/client/renderer/chunk/VisGraph.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java
rename to src/game/java/net/minecraft/client/renderer/chunk/VisGraph.java
diff --git a/src/main/java/net/minecraft/client/renderer/culling/ClippingHelper.java b/src/game/java/net/minecraft/client/renderer/culling/ClippingHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/culling/ClippingHelper.java
rename to src/game/java/net/minecraft/client/renderer/culling/ClippingHelper.java
diff --git a/src/main/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java b/src/game/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java
rename to src/game/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java
diff --git a/src/main/java/net/minecraft/client/renderer/culling/Frustum.java b/src/game/java/net/minecraft/client/renderer/culling/Frustum.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/culling/Frustum.java
rename to src/game/java/net/minecraft/client/renderer/culling/Frustum.java
diff --git a/src/main/java/net/minecraft/client/renderer/culling/ICamera.java b/src/game/java/net/minecraft/client/renderer/culling/ICamera.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/culling/ICamera.java
rename to src/game/java/net/minecraft/client/renderer/culling/ICamera.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/ArmorStandRenderer.java b/src/game/java/net/minecraft/client/renderer/entity/ArmorStandRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/ArmorStandRenderer.java
rename to src/game/java/net/minecraft/client/renderer/entity/ArmorStandRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/Render.java b/src/game/java/net/minecraft/client/renderer/entity/Render.java
similarity index 97%
rename from src/main/java/net/minecraft/client/renderer/entity/Render.java
rename to src/game/java/net/minecraft/client/renderer/entity/Render.java
index c1a70da..ed72da1 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/Render.java
+++ b/src/game/java/net/minecraft/client/renderer/entity/Render.java
@@ -92,7 +92,7 @@ public abstract class Render<T extends Entity> {
 
 	protected void renderName(T entity, double x, double y, double z) {
 		if (this.canRenderName(entity)) {
-			this.renderLivingLabel(entity, entity.getDisplayName().getFormattedText(), x, y, z, 64);
+			this.renderLivingLabel(entity, entity.getDisplayNameProfanityFilter().getFormattedText(), x, y, z, 64);
 		}
 	}
 
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderArrow.java b/src/game/java/net/minecraft/client/renderer/entity/RenderArrow.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderArrow.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderArrow.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderBat.java b/src/game/java/net/minecraft/client/renderer/entity/RenderBat.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderBat.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderBat.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderBiped.java b/src/game/java/net/minecraft/client/renderer/entity/RenderBiped.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderBiped.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderBiped.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderBlaze.java b/src/game/java/net/minecraft/client/renderer/entity/RenderBlaze.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderBlaze.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderBlaze.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderBoat.java b/src/game/java/net/minecraft/client/renderer/entity/RenderBoat.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderBoat.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderBoat.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderCaveSpider.java b/src/game/java/net/minecraft/client/renderer/entity/RenderCaveSpider.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderCaveSpider.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderCaveSpider.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderChicken.java b/src/game/java/net/minecraft/client/renderer/entity/RenderChicken.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderChicken.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderChicken.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderCow.java b/src/game/java/net/minecraft/client/renderer/entity/RenderCow.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderCow.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderCow.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderCreeper.java b/src/game/java/net/minecraft/client/renderer/entity/RenderCreeper.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderCreeper.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderCreeper.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java b/src/game/java/net/minecraft/client/renderer/entity/RenderDragon.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderDragon.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderEnderman.java b/src/game/java/net/minecraft/client/renderer/entity/RenderEnderman.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderEnderman.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderEnderman.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderEndermite.java b/src/game/java/net/minecraft/client/renderer/entity/RenderEndermite.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderEndermite.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderEndermite.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderEntity.java b/src/game/java/net/minecraft/client/renderer/entity/RenderEntity.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderEntity.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderEntity.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java b/src/game/java/net/minecraft/client/renderer/entity/RenderEntityItem.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderEntityItem.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderFallingBlock.java b/src/game/java/net/minecraft/client/renderer/entity/RenderFallingBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderFallingBlock.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderFallingBlock.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderFireball.java b/src/game/java/net/minecraft/client/renderer/entity/RenderFireball.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderFireball.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderFireball.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderFish.java b/src/game/java/net/minecraft/client/renderer/entity/RenderFish.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderFish.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderFish.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderGhast.java b/src/game/java/net/minecraft/client/renderer/entity/RenderGhast.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderGhast.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderGhast.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderGiantZombie.java b/src/game/java/net/minecraft/client/renderer/entity/RenderGiantZombie.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderGiantZombie.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderGiantZombie.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderGuardian.java b/src/game/java/net/minecraft/client/renderer/entity/RenderGuardian.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderGuardian.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderGuardian.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderHorse.java b/src/game/java/net/minecraft/client/renderer/entity/RenderHorse.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderHorse.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderHorse.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderIronGolem.java b/src/game/java/net/minecraft/client/renderer/entity/RenderIronGolem.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderIronGolem.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderIronGolem.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderItem.java b/src/game/java/net/minecraft/client/renderer/entity/RenderItem.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderItem.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderItem.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderLeashKnot.java b/src/game/java/net/minecraft/client/renderer/entity/RenderLeashKnot.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderLeashKnot.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderLeashKnot.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderLightningBolt.java b/src/game/java/net/minecraft/client/renderer/entity/RenderLightningBolt.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderLightningBolt.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderLightningBolt.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderLiving.java b/src/game/java/net/minecraft/client/renderer/entity/RenderLiving.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderLiving.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderLiving.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderMagmaCube.java b/src/game/java/net/minecraft/client/renderer/entity/RenderMagmaCube.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderMagmaCube.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderMagmaCube.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderManager.java b/src/game/java/net/minecraft/client/renderer/entity/RenderManager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderManager.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderManager.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderMinecart.java b/src/game/java/net/minecraft/client/renderer/entity/RenderMinecart.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderMinecart.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderMinecart.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderMinecartMobSpawner.java b/src/game/java/net/minecraft/client/renderer/entity/RenderMinecartMobSpawner.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderMinecartMobSpawner.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderMinecartMobSpawner.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderMooshroom.java b/src/game/java/net/minecraft/client/renderer/entity/RenderMooshroom.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderMooshroom.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderMooshroom.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderOcelot.java b/src/game/java/net/minecraft/client/renderer/entity/RenderOcelot.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderOcelot.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderOcelot.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderPainting.java b/src/game/java/net/minecraft/client/renderer/entity/RenderPainting.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderPainting.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderPainting.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderPig.java b/src/game/java/net/minecraft/client/renderer/entity/RenderPig.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderPig.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderPig.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderPigZombie.java b/src/game/java/net/minecraft/client/renderer/entity/RenderPigZombie.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderPigZombie.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderPigZombie.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java b/src/game/java/net/minecraft/client/renderer/entity/RenderPlayer.java
similarity index 97%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderPlayer.java
index 5cc91b3..73061c1 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java
+++ b/src/game/java/net/minecraft/client/renderer/entity/RenderPlayer.java
@@ -159,7 +159,7 @@ public class RenderPlayer extends RendererLivingEntity<AbstractClientPlayer> {
 			if (scoreobjective != null) {
 				Score score = scoreboard.getValueFromObjective(abstractclientplayer.getName(), scoreobjective);
 				this.renderLivingLabel(abstractclientplayer,
-						score.getScorePoints() + " " + scoreobjective.getDisplayName(), d0, d1, d2, 64);
+						score.getScorePoints() + " " + scoreobjective.getDisplayNameProfanityFilter(), d0, d1, d2, 64);
 				d1 += (double) ((float) this.getFontRendererFromRenderManager().FONT_HEIGHT * 1.15F * f);
 			}
 		}
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderPotion.java b/src/game/java/net/minecraft/client/renderer/entity/RenderPotion.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderPotion.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderPotion.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderRabbit.java b/src/game/java/net/minecraft/client/renderer/entity/RenderRabbit.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderRabbit.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderRabbit.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderSheep.java b/src/game/java/net/minecraft/client/renderer/entity/RenderSheep.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderSheep.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderSheep.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderSilverfish.java b/src/game/java/net/minecraft/client/renderer/entity/RenderSilverfish.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderSilverfish.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderSilverfish.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderSkeleton.java b/src/game/java/net/minecraft/client/renderer/entity/RenderSkeleton.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderSkeleton.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderSkeleton.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderSlime.java b/src/game/java/net/minecraft/client/renderer/entity/RenderSlime.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderSlime.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderSlime.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderSnowMan.java b/src/game/java/net/minecraft/client/renderer/entity/RenderSnowMan.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderSnowMan.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderSnowMan.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderSnowball.java b/src/game/java/net/minecraft/client/renderer/entity/RenderSnowball.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderSnowball.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderSnowball.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderSpider.java b/src/game/java/net/minecraft/client/renderer/entity/RenderSpider.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderSpider.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderSpider.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderSquid.java b/src/game/java/net/minecraft/client/renderer/entity/RenderSquid.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderSquid.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderSquid.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderTNTPrimed.java b/src/game/java/net/minecraft/client/renderer/entity/RenderTNTPrimed.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderTNTPrimed.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderTNTPrimed.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderTntMinecart.java b/src/game/java/net/minecraft/client/renderer/entity/RenderTntMinecart.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderTntMinecart.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderTntMinecart.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderVillager.java b/src/game/java/net/minecraft/client/renderer/entity/RenderVillager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderVillager.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderVillager.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderWitch.java b/src/game/java/net/minecraft/client/renderer/entity/RenderWitch.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderWitch.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderWitch.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderWither.java b/src/game/java/net/minecraft/client/renderer/entity/RenderWither.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderWither.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderWither.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderWolf.java b/src/game/java/net/minecraft/client/renderer/entity/RenderWolf.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderWolf.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderWolf.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderXPOrb.java b/src/game/java/net/minecraft/client/renderer/entity/RenderXPOrb.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderXPOrb.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderXPOrb.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderZombie.java b/src/game/java/net/minecraft/client/renderer/entity/RenderZombie.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/RenderZombie.java
rename to src/game/java/net/minecraft/client/renderer/entity/RenderZombie.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java b/src/game/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java
similarity index 97%
rename from src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java
rename to src/game/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java
index b190419..cacb0d7 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java
+++ b/src/game/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java
@@ -449,7 +449,7 @@ public abstract class RendererLivingEntity<T extends EntityLivingBase> extends R
 			double d3 = entitylivingbase.getDistanceSqToEntity(this.renderManager.livingPlayer);
 			float f = entitylivingbase.isSneaking() ? 32.0F : 64.0F;
 			if (d3 < (double) (f * f)) {
-				String s = entitylivingbase.getDisplayName().getFormattedText();
+				String s = entitylivingbase.getDisplayNameProfanityFilter().getFormattedText();
 				float f1 = 0.02666667F;
 				GlStateManager.alphaFunc(GL_GREATER, 0.1F);
 				if (entitylivingbase.isSneaking()) {
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerCape.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerCape.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCustomHead.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerCustomHead.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerCustomHead.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerCustomHead.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerRenderer.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerRenderer.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSaddle.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerSaddle.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerSaddle.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerSaddle.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerVillagerArmor.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerVillagerArmor.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerVillagerArmor.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerVillagerArmor.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.java
rename to src/game/java/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/AbstractTexture.java b/src/game/java/net/minecraft/client/renderer/texture/AbstractTexture.java
similarity index 93%
rename from src/main/java/net/minecraft/client/renderer/texture/AbstractTexture.java
rename to src/game/java/net/minecraft/client/renderer/texture/AbstractTexture.java
index d815e38..bbf818c 100755
--- a/src/main/java/net/minecraft/client/renderer/texture/AbstractTexture.java
+++ b/src/game/java/net/minecraft/client/renderer/texture/AbstractTexture.java
@@ -90,7 +90,9 @@ public abstract class AbstractTexture implements ITextureObject {
 	protected void regenerateIfNotAllocated() {
 		if (this.glTextureId != -1) {
 			if (hasAllocated) {
-				EaglercraftGPU.regenerateTexture(glTextureId);
+				if (EaglercraftGPU.checkTexStorageCapable()) {
+					EaglercraftGPU.regenerateTexture(glTextureId);
+				}
 			}
 			hasAllocated = true;
 		}
diff --git a/src/main/java/net/minecraft/client/renderer/texture/DynamicTexture.java b/src/game/java/net/minecraft/client/renderer/texture/DynamicTexture.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/DynamicTexture.java
rename to src/game/java/net/minecraft/client/renderer/texture/DynamicTexture.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/IIconCreator.java b/src/game/java/net/minecraft/client/renderer/texture/IIconCreator.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/IIconCreator.java
rename to src/game/java/net/minecraft/client/renderer/texture/IIconCreator.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/ITextureObject.java b/src/game/java/net/minecraft/client/renderer/texture/ITextureObject.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/ITextureObject.java
rename to src/game/java/net/minecraft/client/renderer/texture/ITextureObject.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/ITickable.java b/src/game/java/net/minecraft/client/renderer/texture/ITickable.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/ITickable.java
rename to src/game/java/net/minecraft/client/renderer/texture/ITickable.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/ITickableTextureObject.java b/src/game/java/net/minecraft/client/renderer/texture/ITickableTextureObject.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/ITickableTextureObject.java
rename to src/game/java/net/minecraft/client/renderer/texture/ITickableTextureObject.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java b/src/game/java/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java
rename to src/game/java/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/LayeredTexture.java b/src/game/java/net/minecraft/client/renderer/texture/LayeredTexture.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/LayeredTexture.java
rename to src/game/java/net/minecraft/client/renderer/texture/LayeredTexture.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/SimpleTexture.java b/src/game/java/net/minecraft/client/renderer/texture/SimpleTexture.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/SimpleTexture.java
rename to src/game/java/net/minecraft/client/renderer/texture/SimpleTexture.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/Stitcher.java b/src/game/java/net/minecraft/client/renderer/texture/Stitcher.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/Stitcher.java
rename to src/game/java/net/minecraft/client/renderer/texture/Stitcher.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureClock.java b/src/game/java/net/minecraft/client/renderer/texture/TextureClock.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/TextureClock.java
rename to src/game/java/net/minecraft/client/renderer/texture/TextureClock.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java b/src/game/java/net/minecraft/client/renderer/texture/TextureCompass.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java
rename to src/game/java/net/minecraft/client/renderer/texture/TextureCompass.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureManager.java b/src/game/java/net/minecraft/client/renderer/texture/TextureManager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/texture/TextureManager.java
rename to src/game/java/net/minecraft/client/renderer/texture/TextureManager.java
diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java b/src/game/java/net/minecraft/client/renderer/texture/TextureMap.java
similarity index 95%
rename from src/main/java/net/minecraft/client/renderer/texture/TextureMap.java
rename to src/game/java/net/minecraft/client/renderer/texture/TextureMap.java
index a9d1454..19973cc 100755
--- a/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java
+++ b/src/game/java/net/minecraft/client/renderer/texture/TextureMap.java
@@ -75,6 +75,7 @@ public class TextureMap extends AbstractTexture implements ITickableTextureObjec
 	private boolean isEaglerPBRMode = false;
 	public int eaglerPBRMaterialTexture = -1;
 	private boolean hasAllocatedEaglerPBRMaterialTexture = false;
+	private boolean isGLES2 = false;
 
 	public static final int _GL_FRAMEBUFFER = 0x8D40;
 	public static final int _GL_COLOR_ATTACHMENT0 = 0x8CE0;
@@ -94,6 +95,7 @@ public class TextureMap extends AbstractTexture implements ITickableTextureObjec
 		this.missingImagePBR = new EaglerTextureAtlasSpritePBR("missingno");
 		this.basePath = parString1;
 		this.iconCreator = iconCreatorIn;
+		this.isGLES2 = EaglercraftGPU.checkOpenGLESVersion() == 200;
 	}
 
 	private void initMissingImage() {
@@ -427,6 +429,7 @@ public class TextureMap extends AbstractTexture implements ITickableTextureObjec
 		regenerateIfNotAllocated();
 		TextureUtil.allocateTextureImpl(this.getGlTextureId(), this.mipmapLevels, stitcher.getCurrentWidth(),
 				stitcher.getCurrentHeight());
+
 		if (isEaglerPBRMode) {
 			if (hasAllocatedEaglerPBRMaterialTexture) {
 				EaglercraftGPU.regenerateTexture(eaglerPBRMaterialTexture);
@@ -559,7 +562,12 @@ public class TextureMap extends AbstractTexture implements ITickableTextureObjec
 	}
 
 	public void setMipmapLevels(int mipmapLevelsIn) {
-		this.mipmapLevels = mipmapLevelsIn;
+		if (!isGLES2) {
+			this.mipmapLevels = mipmapLevelsIn;
+		} else {
+			this.mipmapLevels = 0; // Due to limitations in OpenGL ES 2.0 texture completeness, its easier to just
+									// make this zero
+		}
 	}
 
 	public EaglerTextureAtlasSprite getMissingSprite() {
@@ -579,12 +587,16 @@ public class TextureMap extends AbstractTexture implements ITickableTextureObjec
 	}
 
 	public void setBlurMipmapDirect0(boolean parFlag, boolean parFlag2) {
-		super.setBlurMipmapDirect0(parFlag, parFlag2);
-		if (isEaglerPBRMode && eaglerPBRMaterialTexture != -1) {
-			GlStateManager.setActiveTexture(GL_TEXTURE2);
-			GlStateManager.bindTexture(eaglerPBRMaterialTexture);
+		if (isGLES2) {
+			super.setBlurMipmapDirect0(parFlag, false);
+		} else {
 			super.setBlurMipmapDirect0(parFlag, parFlag2);
-			GlStateManager.setActiveTexture(GL_TEXTURE0);
+			if (isEaglerPBRMode && eaglerPBRMaterialTexture != -1) {
+				GlStateManager.setActiveTexture(GL_TEXTURE2);
+				GlStateManager.bindTexture(eaglerPBRMaterialTexture);
+				super.setBlurMipmapDirect0(parFlag, parFlag2);
+				GlStateManager.setActiveTexture(GL_TEXTURE0);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureUtil.java b/src/game/java/net/minecraft/client/renderer/texture/TextureUtil.java
similarity index 90%
rename from src/main/java/net/minecraft/client/renderer/texture/TextureUtil.java
rename to src/game/java/net/minecraft/client/renderer/texture/TextureUtil.java
index 688d44c..8e868dd 100755
--- a/src/main/java/net/minecraft/client/renderer/texture/TextureUtil.java
+++ b/src/game/java/net/minecraft/client/renderer/texture/TextureUtil.java
@@ -165,6 +165,11 @@ public class TextureUtil {
 			int parInt5, boolean parFlag, boolean parFlag2, boolean parFlag3) {
 		int i = 4194304 / parInt2;
 		setTextureBlurMipmap(parFlag, parFlag3);
+		if (!parFlag2 && !EaglercraftGPU.checkNPOTCapable() && ImageData.isNPOTStatic(parInt2, parInt3)) {
+			parFlag2 = true;
+			logger.warn(
+					"An NPOT (non-power-of-two) texture was allocated with GL_REPEAT wrapping in an OpenGL context where that isn't supported, changing to GL_CLAMP_TO_EDGE to avoid errors");
+		}
 		setTextureClamped(parFlag2);
 
 		int l;
@@ -193,10 +198,12 @@ public class TextureUtil {
 		// deleteTexture(parInt1); //TODO: why
 		bindTexture(parInt1);
 		if (parInt2 >= 0) {
-			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, '\u813d', parInt2);
-			EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u813a', 0.0F);
-			EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u813b', (float) parInt2);
-			// EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u8501', 0.0F);
+			if (EaglercraftGPU.checkOpenGLESVersion() >= 300) {
+				EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, '\u813d', parInt2);
+				EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u813a', 0.0F);
+				EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u813b', (float) parInt2);
+				// EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u8501', 0.0F);
+			}
 		}
 		EaglercraftGPU.glTexStorage2D(GL_TEXTURE_2D, parInt2 + 1, GL_RGBA8, parInt3, parInt4);
 	}
@@ -215,6 +222,11 @@ public class TextureUtil {
 		int k = 4194304 / i;
 		int[] aint = new int[k * i];
 		setTextureBlurred(parFlag);
+		if (!parFlag2 && !EaglercraftGPU.checkNPOTCapable() && parBufferedImage.isNPOT()) {
+			parFlag2 = true;
+			logger.warn(
+					"An NPOT (non-power-of-two) texture was allocated with GL_REPEAT wrapping in an OpenGL context where that isn't supported, changing to GL_CLAMP_TO_EDGE to avoid errors");
+		}
 		setTextureClamped(parFlag2);
 
 		for (int l = 0; l < i * j; l += i * k) {
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java b/src/game/java/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java b/src/game/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
similarity index 97%
rename from src/main/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
index c095995..5d1a243 100755
--- a/src/main/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
+++ b/src/game/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
@@ -177,7 +177,7 @@ public class RenderItemFrame extends Render<EntityItemFrame> {
 			double d3 = entityitemframe.getDistanceSqToEntity(this.renderManager.livingPlayer);
 			float f2 = entityitemframe.isSneaking() ? 32.0F : 64.0F;
 			if (d3 < (double) (f2 * f2)) {
-				String s = entityitemframe.getDisplayedItem().getDisplayName();
+				String s = entityitemframe.getDisplayedItem().getDisplayNameProfanityFilter();
 				if (entityitemframe.isSneaking()) {
 					if (DeferredStateManager.isInDeferredPass()) {
 						NameTagRenderer.renderNameTag(entityitemframe, null, d0, d1, d2, -69);
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/RenderWitherSkull.java b/src/game/java/net/minecraft/client/renderer/tileentity/RenderWitherSkull.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/RenderWitherSkull.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/RenderWitherSkull.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
similarity index 94%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
index 34e1995..7b70460 100755
--- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
+++ b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
@@ -8,6 +8,7 @@ import java.util.Map;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBanner;
@@ -104,7 +105,7 @@ public class TileEntityBannerRenderer extends TileEntitySpecialRenderer<TileEnti
 					.get(s);
 			if (tileentitybannerrenderer$timedbannertexture == null) {
 				if (DESIGNS.size() >= 256) {
-					long i = System.currentTimeMillis();
+					long i = EagRuntime.steadyTimeMillis();
 					Iterator iterator = DESIGNS.keySet().iterator();
 
 					while (iterator.hasNext()) {
@@ -140,7 +141,7 @@ public class TileEntityBannerRenderer extends TileEntitySpecialRenderer<TileEnti
 				DESIGNS.put(s, tileentitybannerrenderer$timedbannertexture);
 			}
 
-			tileentitybannerrenderer$timedbannertexture.systemTime = System.currentTimeMillis();
+			tileentitybannerrenderer$timedbannertexture.systemTime = EagRuntime.steadyTimeMillis();
 			return tileentitybannerrenderer$timedbannertexture.bannerTexture;
 		}
 	}
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java
similarity index 95%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java
index e88169c..6b11a95 100755
--- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java
+++ b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java
@@ -4,7 +4,6 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
 import java.util.Calendar;
 
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockChest;
@@ -49,7 +48,7 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer<TileEntit
 	private boolean isChristams;
 
 	public TileEntityChestRenderer() {
-		Calendar calendar = EagRuntime.getLocaleCalendar();
+		Calendar calendar = Calendar.getInstance();
 		if (calendar.get(2) + 1 == 12 && calendar.get(5) >= 24 && calendar.get(5) <= 26) {
 			this.isChristams = true;
 		}
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java
similarity index 90%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java
index e990559..205111f 100755
--- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java
+++ b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java
@@ -47,6 +47,8 @@ public class TileEntitySignRenderer extends TileEntitySpecialRenderer<TileEntity
 	 */
 	private final ModelSign model = new ModelSign();
 
+	public static boolean disableProfanityFilter = false;
+
 	public void renderTileEntityAt(TileEntitySign tileentitysign, double d0, double d1, double d2, float var8, int i) {
 		Block block = tileentitysign.getBlockType();
 		GlStateManager.pushMatrix();
@@ -106,18 +108,20 @@ public class TileEntitySignRenderer extends TileEntitySpecialRenderer<TileEntity
 				GlStateManager.colorMask(true, true, true, false);
 				GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
 			}
-			for (int j = 0; j < tileentitysign.signText.length; ++j) {
-				if (tileentitysign.signText[j] != null) {
-					IChatComponent ichatcomponent = tileentitysign.signText[j];
+			IChatComponent[] signText = disableProfanityFilter ? tileentitysign.signText
+					: tileentitysign.getSignTextProfanityFilter();
+			for (int j = 0; j < signText.length; ++j) {
+				if (signText[j] != null) {
+					IChatComponent ichatcomponent = signText[j];
 					List list = GuiUtilRenderComponents.func_178908_a(ichatcomponent, 90, fontrenderer, false, true);
 					String s = list != null && list.size() > 0 ? ((IChatComponent) list.get(0)).getFormattedText() : "";
 					if (j == tileentitysign.lineBeingEdited) {
 						s = "> " + s + " <";
-						fontrenderer.drawString(s, -fontrenderer.getStringWidth(s) / 2,
-								j * 10 - tileentitysign.signText.length * 5, b0);
+						fontrenderer.drawString(s, -fontrenderer.getStringWidth(s) / 2, j * 10 - signText.length * 5,
+								b0);
 					} else {
-						fontrenderer.drawString(s, -fontrenderer.getStringWidth(s) / 2,
-								j * 10 - tileentitysign.signText.length * 5, b0);
+						fontrenderer.drawString(s, -fontrenderer.getStringWidth(s) / 2, j * 10 - signText.length * 5,
+								b0);
 					}
 				}
 			}
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java b/src/game/java/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java
rename to src/game/java/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java
diff --git a/src/main/java/net/minecraft/client/renderer/vertex/DefaultVertexFormats.java b/src/game/java/net/minecraft/client/renderer/vertex/DefaultVertexFormats.java
similarity index 100%
rename from src/main/java/net/minecraft/client/renderer/vertex/DefaultVertexFormats.java
rename to src/game/java/net/minecraft/client/renderer/vertex/DefaultVertexFormats.java
diff --git a/src/main/java/net/minecraft/client/resources/AbstractResourcePack.java b/src/game/java/net/minecraft/client/resources/AbstractResourcePack.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/AbstractResourcePack.java
rename to src/game/java/net/minecraft/client/resources/AbstractResourcePack.java
diff --git a/src/main/java/net/minecraft/client/resources/DefaultPlayerSkin.java b/src/game/java/net/minecraft/client/resources/DefaultPlayerSkin.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/DefaultPlayerSkin.java
rename to src/game/java/net/minecraft/client/resources/DefaultPlayerSkin.java
diff --git a/src/main/java/net/minecraft/client/resources/DefaultResourcePack.java b/src/game/java/net/minecraft/client/resources/DefaultResourcePack.java
similarity index 87%
rename from src/main/java/net/minecraft/client/resources/DefaultResourcePack.java
rename to src/game/java/net/minecraft/client/resources/DefaultResourcePack.java
index fd09785..4a88483 100755
--- a/src/main/java/net/minecraft/client/resources/DefaultResourcePack.java
+++ b/src/game/java/net/minecraft/client/resources/DefaultResourcePack.java
@@ -60,8 +60,9 @@ public class DefaultResourcePack implements IResourcePack {
 				.getResourceStream("/assets/" + location.getResourceDomain() + "/" + location.getResourcePath());
 	}
 
-	public boolean resourceExists(ResourceLocation resourcelocation) {
-		return this.getResourceStream(resourcelocation) != null;
+	public boolean resourceExists(ResourceLocation location) {
+		return EagRuntime
+				.getResourceExists("/assets/" + location.getResourceDomain() + "/" + location.getResourcePath());
 	}
 
 	public Set<String> getResourceDomains() {
@@ -72,14 +73,14 @@ public class DefaultResourcePack implements IResourcePack {
 			throws IOException {
 		try {
 			return AbstractResourcePack.readMetadata(parIMetadataSerializer,
-					EagRuntime.getResourceStream("pack.mcmeta"), parString1);
+					EagRuntime.getRequiredResourceStream("pack.mcmeta"), parString1);
 		} catch (RuntimeException var4) {
 			return (T) null;
 		}
 	}
 
 	public ImageData getPackImage() throws IOException {
-		return TextureUtil.readBufferedImage(EagRuntime.getResourceStream("pack.png"));
+		return TextureUtil.readBufferedImage(EagRuntime.getRequiredResourceStream("pack.png"));
 	}
 
 	public String getPackName() {
diff --git a/src/main/java/net/minecraft/client/resources/FallbackResourceManager.java b/src/game/java/net/minecraft/client/resources/FallbackResourceManager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/FallbackResourceManager.java
rename to src/game/java/net/minecraft/client/resources/FallbackResourceManager.java
diff --git a/src/main/java/net/minecraft/client/resources/FoliageColorReloadListener.java b/src/game/java/net/minecraft/client/resources/FoliageColorReloadListener.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/FoliageColorReloadListener.java
rename to src/game/java/net/minecraft/client/resources/FoliageColorReloadListener.java
diff --git a/src/main/java/net/minecraft/client/resources/GrassColorReloadListener.java b/src/game/java/net/minecraft/client/resources/GrassColorReloadListener.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/GrassColorReloadListener.java
rename to src/game/java/net/minecraft/client/resources/GrassColorReloadListener.java
diff --git a/src/main/java/net/minecraft/client/resources/I18n.java b/src/game/java/net/minecraft/client/resources/I18n.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/I18n.java
rename to src/game/java/net/minecraft/client/resources/I18n.java
diff --git a/src/main/java/net/minecraft/client/resources/IReloadableResourceManager.java b/src/game/java/net/minecraft/client/resources/IReloadableResourceManager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/IReloadableResourceManager.java
rename to src/game/java/net/minecraft/client/resources/IReloadableResourceManager.java
diff --git a/src/main/java/net/minecraft/client/resources/IResource.java b/src/game/java/net/minecraft/client/resources/IResource.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/IResource.java
rename to src/game/java/net/minecraft/client/resources/IResource.java
diff --git a/src/main/java/net/minecraft/client/resources/IResourceManager.java b/src/game/java/net/minecraft/client/resources/IResourceManager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/IResourceManager.java
rename to src/game/java/net/minecraft/client/resources/IResourceManager.java
diff --git a/src/main/java/net/minecraft/client/resources/IResourceManagerReloadListener.java b/src/game/java/net/minecraft/client/resources/IResourceManagerReloadListener.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/IResourceManagerReloadListener.java
rename to src/game/java/net/minecraft/client/resources/IResourceManagerReloadListener.java
diff --git a/src/main/java/net/minecraft/client/resources/IResourcePack.java b/src/game/java/net/minecraft/client/resources/IResourcePack.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/IResourcePack.java
rename to src/game/java/net/minecraft/client/resources/IResourcePack.java
diff --git a/src/main/java/net/minecraft/client/resources/Language.java b/src/game/java/net/minecraft/client/resources/Language.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/Language.java
rename to src/game/java/net/minecraft/client/resources/Language.java
diff --git a/src/main/java/net/minecraft/client/resources/LanguageManager.java b/src/game/java/net/minecraft/client/resources/LanguageManager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/LanguageManager.java
rename to src/game/java/net/minecraft/client/resources/LanguageManager.java
diff --git a/src/main/java/net/minecraft/client/resources/Locale.java b/src/game/java/net/minecraft/client/resources/Locale.java
similarity index 95%
rename from src/main/java/net/minecraft/client/resources/Locale.java
rename to src/game/java/net/minecraft/client/resources/Locale.java
index 96891c6..bfef9b0 100755
--- a/src/main/java/net/minecraft/client/resources/Locale.java
+++ b/src/game/java/net/minecraft/client/resources/Locale.java
@@ -48,7 +48,7 @@ public class Locale {
 	Map<String, String> properties = Maps.newHashMap();
 	private boolean unicode;
 
-	private static final Set<String> hasShownMissing = new HashSet();
+	private static final Set<String> hasShownMissing = new HashSet<>();
 
 	/**+
 	 * par2 is a list of languages. For each language $L and domain
diff --git a/src/main/java/net/minecraft/client/resources/ResourcePackFileNotFoundException.java b/src/game/java/net/minecraft/client/resources/ResourcePackFileNotFoundException.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/ResourcePackFileNotFoundException.java
rename to src/game/java/net/minecraft/client/resources/ResourcePackFileNotFoundException.java
diff --git a/src/main/java/net/minecraft/client/resources/ResourcePackListEntry.java b/src/game/java/net/minecraft/client/resources/ResourcePackListEntry.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/ResourcePackListEntry.java
rename to src/game/java/net/minecraft/client/resources/ResourcePackListEntry.java
diff --git a/src/main/java/net/minecraft/client/resources/ResourcePackListEntryDefault.java b/src/game/java/net/minecraft/client/resources/ResourcePackListEntryDefault.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/ResourcePackListEntryDefault.java
rename to src/game/java/net/minecraft/client/resources/ResourcePackListEntryDefault.java
diff --git a/src/main/java/net/minecraft/client/resources/ResourcePackListEntryFound.java b/src/game/java/net/minecraft/client/resources/ResourcePackListEntryFound.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/ResourcePackListEntryFound.java
rename to src/game/java/net/minecraft/client/resources/ResourcePackListEntryFound.java
diff --git a/src/main/java/net/minecraft/client/resources/ResourcePackRepository.java b/src/game/java/net/minecraft/client/resources/ResourcePackRepository.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/ResourcePackRepository.java
rename to src/game/java/net/minecraft/client/resources/ResourcePackRepository.java
diff --git a/src/main/java/net/minecraft/client/resources/SimpleReloadableResourceManager.java b/src/game/java/net/minecraft/client/resources/SimpleReloadableResourceManager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/SimpleReloadableResourceManager.java
rename to src/game/java/net/minecraft/client/resources/SimpleReloadableResourceManager.java
diff --git a/src/main/java/net/minecraft/client/resources/SimpleResource.java b/src/game/java/net/minecraft/client/resources/SimpleResource.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/SimpleResource.java
rename to src/game/java/net/minecraft/client/resources/SimpleResource.java
diff --git a/src/main/java/net/minecraft/client/resources/data/AnimationFrame.java b/src/game/java/net/minecraft/client/resources/data/AnimationFrame.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/AnimationFrame.java
rename to src/game/java/net/minecraft/client/resources/data/AnimationFrame.java
diff --git a/src/main/java/net/minecraft/client/resources/data/AnimationMetadataSection.java b/src/game/java/net/minecraft/client/resources/data/AnimationMetadataSection.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/AnimationMetadataSection.java
rename to src/game/java/net/minecraft/client/resources/data/AnimationMetadataSection.java
diff --git a/src/main/java/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.java b/src/game/java/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.java
rename to src/game/java/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.java
diff --git a/src/main/java/net/minecraft/client/resources/data/BaseMetadataSectionSerializer.java b/src/game/java/net/minecraft/client/resources/data/BaseMetadataSectionSerializer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/BaseMetadataSectionSerializer.java
rename to src/game/java/net/minecraft/client/resources/data/BaseMetadataSectionSerializer.java
diff --git a/src/main/java/net/minecraft/client/resources/data/FontMetadataSection.java b/src/game/java/net/minecraft/client/resources/data/FontMetadataSection.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/FontMetadataSection.java
rename to src/game/java/net/minecraft/client/resources/data/FontMetadataSection.java
diff --git a/src/main/java/net/minecraft/client/resources/data/FontMetadataSectionSerializer.java b/src/game/java/net/minecraft/client/resources/data/FontMetadataSectionSerializer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/FontMetadataSectionSerializer.java
rename to src/game/java/net/minecraft/client/resources/data/FontMetadataSectionSerializer.java
diff --git a/src/main/java/net/minecraft/client/resources/data/IMetadataSection.java b/src/game/java/net/minecraft/client/resources/data/IMetadataSection.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/IMetadataSection.java
rename to src/game/java/net/minecraft/client/resources/data/IMetadataSection.java
diff --git a/src/main/java/net/minecraft/client/resources/data/IMetadataSectionSerializer.java b/src/game/java/net/minecraft/client/resources/data/IMetadataSectionSerializer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/IMetadataSectionSerializer.java
rename to src/game/java/net/minecraft/client/resources/data/IMetadataSectionSerializer.java
diff --git a/src/main/java/net/minecraft/client/resources/data/IMetadataSerializer.java b/src/game/java/net/minecraft/client/resources/data/IMetadataSerializer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/IMetadataSerializer.java
rename to src/game/java/net/minecraft/client/resources/data/IMetadataSerializer.java
diff --git a/src/main/java/net/minecraft/client/resources/data/LanguageMetadataSection.java b/src/game/java/net/minecraft/client/resources/data/LanguageMetadataSection.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/LanguageMetadataSection.java
rename to src/game/java/net/minecraft/client/resources/data/LanguageMetadataSection.java
diff --git a/src/main/java/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.java b/src/game/java/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.java
rename to src/game/java/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.java
diff --git a/src/main/java/net/minecraft/client/resources/data/PackMetadataSection.java b/src/game/java/net/minecraft/client/resources/data/PackMetadataSection.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/PackMetadataSection.java
rename to src/game/java/net/minecraft/client/resources/data/PackMetadataSection.java
diff --git a/src/main/java/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java b/src/game/java/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java
rename to src/game/java/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java
diff --git a/src/main/java/net/minecraft/client/resources/data/TextureMetadataSection.java b/src/game/java/net/minecraft/client/resources/data/TextureMetadataSection.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/TextureMetadataSection.java
rename to src/game/java/net/minecraft/client/resources/data/TextureMetadataSection.java
diff --git a/src/main/java/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.java b/src/game/java/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.java
rename to src/game/java/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.java
diff --git a/src/main/java/net/minecraft/client/resources/model/BuiltInModel.java b/src/game/java/net/minecraft/client/resources/model/BuiltInModel.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/model/BuiltInModel.java
rename to src/game/java/net/minecraft/client/resources/model/BuiltInModel.java
diff --git a/src/main/java/net/minecraft/client/resources/model/IBakedModel.java b/src/game/java/net/minecraft/client/resources/model/IBakedModel.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/model/IBakedModel.java
rename to src/game/java/net/minecraft/client/resources/model/IBakedModel.java
diff --git a/src/main/java/net/minecraft/client/resources/model/ModelBakery.java b/src/game/java/net/minecraft/client/resources/model/ModelBakery.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/model/ModelBakery.java
rename to src/game/java/net/minecraft/client/resources/model/ModelBakery.java
diff --git a/src/main/java/net/minecraft/client/resources/model/ModelManager.java b/src/game/java/net/minecraft/client/resources/model/ModelManager.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/model/ModelManager.java
rename to src/game/java/net/minecraft/client/resources/model/ModelManager.java
diff --git a/src/main/java/net/minecraft/client/resources/model/ModelResourceLocation.java b/src/game/java/net/minecraft/client/resources/model/ModelResourceLocation.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/model/ModelResourceLocation.java
rename to src/game/java/net/minecraft/client/resources/model/ModelResourceLocation.java
diff --git a/src/main/java/net/minecraft/client/resources/model/ModelRotation.java b/src/game/java/net/minecraft/client/resources/model/ModelRotation.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/model/ModelRotation.java
rename to src/game/java/net/minecraft/client/resources/model/ModelRotation.java
diff --git a/src/main/java/net/minecraft/client/resources/model/SimpleBakedModel.java b/src/game/java/net/minecraft/client/resources/model/SimpleBakedModel.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/model/SimpleBakedModel.java
rename to src/game/java/net/minecraft/client/resources/model/SimpleBakedModel.java
diff --git a/src/main/java/net/minecraft/client/resources/model/WeightedBakedModel.java b/src/game/java/net/minecraft/client/resources/model/WeightedBakedModel.java
similarity index 100%
rename from src/main/java/net/minecraft/client/resources/model/WeightedBakedModel.java
rename to src/game/java/net/minecraft/client/resources/model/WeightedBakedModel.java
diff --git a/src/main/java/net/minecraft/client/settings/GameSettings.java b/src/game/java/net/minecraft/client/settings/GameSettings.java
similarity index 87%
rename from src/main/java/net/minecraft/client/settings/GameSettings.java
rename to src/game/java/net/minecraft/client/settings/GameSettings.java
index 87e1f69..ed92f09 100755
--- a/src/main/java/net/minecraft/client/settings/GameSettings.java
+++ b/src/game/java/net/minecraft/client/settings/GameSettings.java
@@ -25,12 +25,16 @@ import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
 import net.lax1dude.eaglercraft.v1_8.HString;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
-import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType;
 import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.EaglerDeferredConfig;
+import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.EaglerDeferredPipeline;
+import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.DynamicLightsStateManager;
+import net.lax1dude.eaglercraft.v1_8.recording.EnumScreenRecordingCodec;
+import net.lax1dude.eaglercraft.v1_8.recording.ScreenRecordingController;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.SoundCategory;
 import net.minecraft.client.gui.GuiNewChat;
@@ -203,12 +207,24 @@ public class GameSettings {
 	public boolean enableUpdateSvc = true;
 	public boolean enableFNAWSkins = true;
 	public boolean enableDynamicLights = false;
+	public boolean hasHiddenPhishWarning = false;
+	public boolean enableProfanityFilter = false;
+	public boolean hasShownProfanityFilter = false;
+	public float touchControlOpacity = 1.0f;
 
 	public int voiceListenRadius = 16;
 	public float voiceListenVolume = 0.5f;
 	public float voiceSpeakVolume = 0.5f;
 	public int voicePTTKey = 47; // V
 
+	public EnumScreenRecordingCodec screenRecordCodec;
+	public int screenRecordFPS = ScreenRecordingController.DEFAULT_FPS;
+	public int screenRecordResolution = ScreenRecordingController.DEFAULT_RESOLUTION;
+	public int screenRecordAudioBitrate = ScreenRecordingController.DEFAULT_AUDIO_BITRATE;
+	public int screenRecordVideoBitrate = ScreenRecordingController.DEFAULT_VIDEO_BITRATE;
+	public float screenRecordGameVolume = ScreenRecordingController.DEFAULT_GAME_VOLUME;
+	public float screenRecordMicVolume = ScreenRecordingController.DEFAULT_MIC_VOLUME;
+
 	public GameSettings(Minecraft mcIn) {
 		this.keyBindings = (KeyBinding[]) ArrayUtils.addAll(new KeyBinding[] { this.keyBindAttack, this.keyBindUseItem,
 				this.keyBindForward, this.keyBindLeft, this.keyBindBack, this.keyBindRight, this.keyBindJump,
@@ -225,9 +241,8 @@ public class GameSettings {
 		this.language = EagRuntime.getConfiguration().getDefaultLocale();
 		this.forceUnicodeFont = false;
 		this.mc = mcIn;
-		GameSettings.Options.RENDER_DISTANCE.setValueMax(18.0F);
-
 		this.renderDistanceChunks = 4;
+		this.screenRecordCodec = ScreenRecordingController.getDefaultCodec();
 		this.loadOptions();
 	}
 
@@ -247,7 +262,8 @@ public class GameSettings {
 	 */
 	public static boolean isKeyDown(KeyBinding parKeyBinding) {
 		return parKeyBinding.getKeyCode() == 0 ? false
-				: (parKeyBinding.getKeyCode() < 0 ? Mouse.isButtonDown(parKeyBinding.getKeyCode() + 100)
+				: (parKeyBinding.getKeyCode() < 0
+						? PointerInputAbstraction.getVCursorButtonDown(parKeyBinding.getKeyCode() + 100)
 						: Keyboard.isKeyDown(parKeyBinding.getKeyCode()));
 	}
 
@@ -325,6 +341,10 @@ public class GameSettings {
 			this.renderDistanceChunks = (int) parFloat1;
 			this.mc.renderGlobal.setDisplayListEntitiesDirty();
 		}
+
+		if (parOptions == GameSettings.Options.EAGLER_TOUCH_CONTROL_OPACITY) {
+			this.touchControlOpacity = parFloat1;
+		}
 	}
 
 	/**+
@@ -400,10 +420,6 @@ public class GameSettings {
 			this.snooperEnabled = !this.snooperEnabled;
 		}
 
-		if (parOptions == GameSettings.Options.TOUCHSCREEN) {
-			this.touchscreen = !this.touchscreen;
-		}
-
 		if (parOptions == GameSettings.Options.BLOCK_ALTERNATIVES) {
 			this.allowBlockAlternatives = !this.allowBlockAlternatives;
 			this.mc.renderGlobal.loadRenderers();
@@ -471,6 +487,10 @@ public class GameSettings {
 			this.mc.renderGlobal.loadRenderers();
 		}
 
+		if (parOptions == GameSettings.Options.EAGLER_PROFANITY_FILTER) {
+			this.enableProfanityFilter = !this.enableProfanityFilter;
+		}
+
 		this.saveOptions();
 	}
 
@@ -494,7 +514,9 @@ public class GameSettings {
 																								? (float) this.mipmapLevels
 																								: (parOptions == GameSettings.Options.RENDER_DISTANCE
 																										? (float) this.renderDistanceChunks
-																										: 0.0F)))))))))));
+																										: (parOptions == GameSettings.Options.EAGLER_TOUCH_CONTROL_OPACITY
+																												? this.touchControlOpacity
+																												: 0.0F))))))))))));
 	}
 
 	public boolean getOptionOrdinalValue(GameSettings.Options parOptions) {
@@ -515,8 +537,6 @@ public class GameSettings {
 			return this.chatLinksPrompt;
 		case SNOOPER_ENABLED:
 			return this.snooperEnabled;
-		case TOUCHSCREEN:
-			return this.touchscreen;
 		case FORCE_UNICODE_FONT:
 			return this.forceUnicodeFont;
 		case BLOCK_ALTERNATIVES:
@@ -549,6 +569,8 @@ public class GameSettings {
 			return this.enableVsync;
 		case EAGLER_DYNAMIC_LIGHTS:
 			return this.enableDynamicLights;
+		case EAGLER_PROFANITY_FILTER:
+			return this.enableProfanityFilter;
 		default:
 			return false;
 		}
@@ -630,7 +652,11 @@ public class GameSettings {
 																															: s + (int) (f
 																																	* 100.0F)
 																																	+ "%")
-																													: "yee"))))))))))));
+																													: (parOptions == GameSettings.Options.EAGLER_TOUCH_CONTROL_OPACITY
+																															? (s + (int) (f
+																																	* 100.0F)
+																																	+ "%")
+																															: "yee")))))))))))));
 		} else if (parOptions.getEnumBoolean()) {
 			boolean flag = this.getOptionOrdinalValue(parOptions);
 			return flag ? s + I18n.format("options.on", new Object[0]) : s + I18n.format("options.off", new Object[0]);
@@ -851,10 +877,6 @@ public class GameSettings {
 						this.pauseOnLostFocus = astring[1].equals("true");
 					}
 
-					if (astring[0].equals("touchscreen")) {
-						this.touchscreen = astring[1].equals("true");
-					}
-
 					if (astring[0].equals("overrideHeight")) {
 						this.overrideHeight = Integer.parseInt(astring[1]);
 					}
@@ -998,6 +1020,58 @@ public class GameSettings {
 						this.enableDynamicLights = astring[1].equals("true");
 					}
 
+					if (astring[0].equals("hasHiddenPhishWarning")) {
+						this.hasHiddenPhishWarning = astring[1].equals("true");
+					}
+
+					if (astring[0].equals("enableProfanityFilter")) {
+						this.enableProfanityFilter = astring[1].equals("true");
+					}
+
+					if (astring[0].equals("hasShownProfanityFilter")) {
+						this.hasShownProfanityFilter = astring[1].equals("true");
+					}
+
+					if (astring[0].equals("screenRecordCodec")) {
+						EnumScreenRecordingCodec codec = EnumScreenRecordingCodec.valueOf(astring[1]);
+						if (!ScreenRecordingController.codecs.contains(codec)) {
+							throw new IllegalStateException("Selected codec is not supported: " + codec.name);
+						}
+						screenRecordCodec = codec;
+					}
+
+					if (astring[0].equals("screenRecordFPS")) {
+						screenRecordFPS = Integer.parseInt(astring[1]);
+					}
+
+					if (astring[0].equals("screenRecordFPS")) {
+						screenRecordFPS = Integer.parseInt(astring[1]);
+					}
+
+					if (astring[0].equals("screenRecordResolution")) {
+						screenRecordResolution = Integer.parseInt(astring[1]);
+					}
+
+					if (astring[0].equals("screenRecordAudioBitrate")) {
+						screenRecordAudioBitrate = Integer.parseInt(astring[1]);
+					}
+
+					if (astring[0].equals("screenRecordVideoBitrate")) {
+						screenRecordVideoBitrate = Integer.parseInt(astring[1]);
+					}
+
+					if (astring[0].equals("screenRecordGameVolume")) {
+						screenRecordGameVolume = parseFloat(astring[1]);
+					}
+
+					if (astring[0].equals("screenRecordMicVolume")) {
+						screenRecordMicVolume = parseFloat(astring[1]);
+					}
+
+					if (astring[0].equals("touchControlOpacity")) {
+						touchControlOpacity = parseFloat(astring[1]);
+					}
+
 					deferredShaderConf.readOption(astring[0], astring[1]);
 				} catch (Exception var8) {
 					logger.warn("Skipping bad option: " + s);
@@ -1010,8 +1084,18 @@ public class GameSettings {
 			VoiceClientController.setVoiceListenVolume(voiceListenVolume);
 			VoiceClientController.setVoiceSpeakVolume(voiceSpeakVolume);
 			VoiceClientController.setVoiceProximity(voiceListenRadius);
+			ScreenRecordingController.setGameVolume(screenRecordGameVolume);
+			ScreenRecordingController.setMicrophoneVolume(screenRecordMicVolume);
 			if (this.mc.getRenderManager() != null)
 				this.mc.getRenderManager().setEnableFNAWSkins(this.enableFNAWSkins);
+			if (this.shaders && !EaglerDeferredPipeline.isSupported()) {
+				logger.error("Setting shaders to false because they are not supported");
+				this.shaders = false;
+			}
+			if (this.enableDynamicLights && !DynamicLightsStateManager.isSupported()) {
+				logger.error("Setting dynamic lights to false because they are not supported");
+				this.enableDynamicLights = false;
+			}
 		} catch (Exception exception) {
 			logger.error("Failed to load options");
 			logger.error(exception);
@@ -1085,7 +1169,6 @@ public class GameSettings {
 			printwriter.println("hideServerAddress:" + this.hideServerAddress);
 			printwriter.println("advancedItemTooltips:" + this.advancedItemTooltips);
 			printwriter.println("pauseOnLostFocus:" + this.pauseOnLostFocus);
-			printwriter.println("touchscreen:" + this.touchscreen);
 			printwriter.println("overrideWidth:" + this.overrideWidth);
 			printwriter.println("overrideHeight:" + this.overrideHeight);
 			printwriter.println("heldItemTooltips:" + this.heldItemTooltips);
@@ -1117,6 +1200,19 @@ public class GameSettings {
 			printwriter.println("voicePTTKey:" + this.voicePTTKey);
 			printwriter.println("enableFNAWSkins:" + this.enableFNAWSkins);
 			printwriter.println("enableDynamicLights:" + this.enableDynamicLights);
+			printwriter.println("hasHiddenPhishWarning:" + this.hasHiddenPhishWarning);
+			printwriter.println("enableProfanityFilter:" + this.enableProfanityFilter);
+			printwriter.println("hasShownProfanityFilter:" + this.hasShownProfanityFilter);
+			if (screenRecordCodec != null) {
+				printwriter.println("screenRecordCodec:" + this.screenRecordCodec);
+			}
+			printwriter.println("screenRecordFPS:" + this.screenRecordFPS);
+			printwriter.println("screenRecordResolution:" + this.screenRecordResolution);
+			printwriter.println("screenRecordAudioBitrate:" + this.screenRecordAudioBitrate);
+			printwriter.println("screenRecordVideoBitrate:" + this.screenRecordVideoBitrate);
+			printwriter.println("screenRecordGameVolume:" + this.screenRecordGameVolume);
+			printwriter.println("screenRecordMicVolume:" + this.screenRecordMicVolume);
+			printwriter.println("touchControlOpacity:" + this.touchControlOpacity);
 
 			for (KeyBinding keybinding : this.keyBindings) {
 				printwriter.println("key_" + keybinding.getKeyDescription() + ":" + keybinding.getKeyCode());
@@ -1149,7 +1245,7 @@ public class GameSettings {
 	public float getSoundLevel(SoundCategory parSoundCategory) {
 		return this.mapSoundLevels.containsKey(parSoundCategory)
 				? ((Float) this.mapSoundLevels.get(parSoundCategory)).floatValue()
-				: (parSoundCategory == SoundCategory.VOICE ? 0.0F : 1.0F);
+				: 1.0F;
 	}
 
 	public void setSoundLevel(SoundCategory parSoundCategory, float parFloat1) {
@@ -1228,8 +1324,8 @@ public class GameSettings {
 		CHAT_VISIBILITY("options.chat.visibility", false, false), CHAT_COLOR("options.chat.color", false, true),
 		CHAT_LINKS("options.chat.links", false, true), CHAT_OPACITY("options.chat.opacity", true, false),
 		CHAT_LINKS_PROMPT("options.chat.links.prompt", false, true), SNOOPER_ENABLED("options.snooper", false, true),
-		TOUCHSCREEN("options.touchscreen", false, true), CHAT_SCALE("options.chat.scale", true, false),
-		CHAT_WIDTH("options.chat.width", true, false), CHAT_HEIGHT_FOCUSED("options.chat.height.focused", true, false),
+		CHAT_SCALE("options.chat.scale", true, false), CHAT_WIDTH("options.chat.width", true, false),
+		CHAT_HEIGHT_FOCUSED("options.chat.height.focused", true, false),
 		CHAT_HEIGHT_UNFOCUSED("options.chat.height.unfocused", true, false),
 		MIPMAP_LEVELS("options.mipmapLevels", true, false, 0.0F, 4.0F, 1.0F),
 		FORCE_UNICODE_FONT("options.forceUnicodeFont", false, true),
@@ -1251,7 +1347,9 @@ public class GameSettings {
 		FOG("options.fog", false, true), FXAA("options.fxaa", false, false),
 		FULLSCREEN("options.fullscreen", false, true),
 		FNAW_SKINS("options.skinCustomisation.enableFNAWSkins", false, true),
-		EAGLER_VSYNC("options.vsync", false, true), EAGLER_DYNAMIC_LIGHTS("options.dynamicLights", false, true);
+		EAGLER_VSYNC("options.vsync", false, true), EAGLER_DYNAMIC_LIGHTS("options.dynamicLights", false, true),
+		EAGLER_PROFANITY_FILTER("options.profanityFilterButton", false, true),
+		EAGLER_TOUCH_CONTROL_OPACITY("options.touchControlOpacity", true, false);
 
 		private final boolean enumFloat;
 		private final boolean enumBoolean;
diff --git a/src/main/java/net/minecraft/client/settings/KeyBinding.java b/src/game/java/net/minecraft/client/settings/KeyBinding.java
similarity index 100%
rename from src/main/java/net/minecraft/client/settings/KeyBinding.java
rename to src/game/java/net/minecraft/client/settings/KeyBinding.java
diff --git a/src/main/java/net/minecraft/client/stream/IStream.java b/src/game/java/net/minecraft/client/stream/IStream.java
similarity index 100%
rename from src/main/java/net/minecraft/client/stream/IStream.java
rename to src/game/java/net/minecraft/client/stream/IStream.java
diff --git a/src/main/java/net/minecraft/client/util/JsonBlendingMode.java b/src/game/java/net/minecraft/client/util/JsonBlendingMode.java
similarity index 100%
rename from src/main/java/net/minecraft/client/util/JsonBlendingMode.java
rename to src/game/java/net/minecraft/client/util/JsonBlendingMode.java
diff --git a/src/main/java/net/minecraft/client/util/JsonException.java b/src/game/java/net/minecraft/client/util/JsonException.java
similarity index 100%
rename from src/main/java/net/minecraft/client/util/JsonException.java
rename to src/game/java/net/minecraft/client/util/JsonException.java
diff --git a/src/main/java/net/minecraft/command/CommandBase.java b/src/game/java/net/minecraft/command/CommandBase.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandBase.java
rename to src/game/java/net/minecraft/command/CommandBase.java
diff --git a/src/main/java/net/minecraft/command/CommandBlockData.java b/src/game/java/net/minecraft/command/CommandBlockData.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandBlockData.java
rename to src/game/java/net/minecraft/command/CommandBlockData.java
diff --git a/src/main/java/net/minecraft/command/CommandClearInventory.java b/src/game/java/net/minecraft/command/CommandClearInventory.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandClearInventory.java
rename to src/game/java/net/minecraft/command/CommandClearInventory.java
diff --git a/src/main/java/net/minecraft/command/CommandClone.java b/src/game/java/net/minecraft/command/CommandClone.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandClone.java
rename to src/game/java/net/minecraft/command/CommandClone.java
diff --git a/src/main/java/net/minecraft/command/CommandCompare.java b/src/game/java/net/minecraft/command/CommandCompare.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandCompare.java
rename to src/game/java/net/minecraft/command/CommandCompare.java
diff --git a/src/main/java/net/minecraft/command/CommandDefaultGameMode.java b/src/game/java/net/minecraft/command/CommandDefaultGameMode.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandDefaultGameMode.java
rename to src/game/java/net/minecraft/command/CommandDefaultGameMode.java
diff --git a/src/main/java/net/minecraft/command/CommandDifficulty.java b/src/game/java/net/minecraft/command/CommandDifficulty.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandDifficulty.java
rename to src/game/java/net/minecraft/command/CommandDifficulty.java
diff --git a/src/main/java/net/minecraft/command/CommandEffect.java b/src/game/java/net/minecraft/command/CommandEffect.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandEffect.java
rename to src/game/java/net/minecraft/command/CommandEffect.java
diff --git a/src/main/java/net/minecraft/command/CommandEnchant.java b/src/game/java/net/minecraft/command/CommandEnchant.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandEnchant.java
rename to src/game/java/net/minecraft/command/CommandEnchant.java
diff --git a/src/main/java/net/minecraft/command/CommandEntityData.java b/src/game/java/net/minecraft/command/CommandEntityData.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandEntityData.java
rename to src/game/java/net/minecraft/command/CommandEntityData.java
diff --git a/src/main/java/net/minecraft/command/CommandException.java b/src/game/java/net/minecraft/command/CommandException.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandException.java
rename to src/game/java/net/minecraft/command/CommandException.java
diff --git a/src/main/java/net/minecraft/command/CommandExecuteAt.java b/src/game/java/net/minecraft/command/CommandExecuteAt.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandExecuteAt.java
rename to src/game/java/net/minecraft/command/CommandExecuteAt.java
diff --git a/src/main/java/net/minecraft/command/CommandFill.java b/src/game/java/net/minecraft/command/CommandFill.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandFill.java
rename to src/game/java/net/minecraft/command/CommandFill.java
diff --git a/src/main/java/net/minecraft/command/CommandGameMode.java b/src/game/java/net/minecraft/command/CommandGameMode.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandGameMode.java
rename to src/game/java/net/minecraft/command/CommandGameMode.java
diff --git a/src/main/java/net/minecraft/command/CommandGameRule.java b/src/game/java/net/minecraft/command/CommandGameRule.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandGameRule.java
rename to src/game/java/net/minecraft/command/CommandGameRule.java
diff --git a/src/main/java/net/minecraft/command/CommandGive.java b/src/game/java/net/minecraft/command/CommandGive.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandGive.java
rename to src/game/java/net/minecraft/command/CommandGive.java
diff --git a/src/main/java/net/minecraft/command/CommandHandler.java b/src/game/java/net/minecraft/command/CommandHandler.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandHandler.java
rename to src/game/java/net/minecraft/command/CommandHandler.java
diff --git a/src/main/java/net/minecraft/command/CommandHelp.java b/src/game/java/net/minecraft/command/CommandHelp.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandHelp.java
rename to src/game/java/net/minecraft/command/CommandHelp.java
diff --git a/src/main/java/net/minecraft/command/CommandKill.java b/src/game/java/net/minecraft/command/CommandKill.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandKill.java
rename to src/game/java/net/minecraft/command/CommandKill.java
diff --git a/src/main/java/net/minecraft/command/CommandNotFoundException.java b/src/game/java/net/minecraft/command/CommandNotFoundException.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandNotFoundException.java
rename to src/game/java/net/minecraft/command/CommandNotFoundException.java
diff --git a/src/main/java/net/minecraft/command/CommandParticle.java b/src/game/java/net/minecraft/command/CommandParticle.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandParticle.java
rename to src/game/java/net/minecraft/command/CommandParticle.java
diff --git a/src/main/java/net/minecraft/command/CommandPlaySound.java b/src/game/java/net/minecraft/command/CommandPlaySound.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandPlaySound.java
rename to src/game/java/net/minecraft/command/CommandPlaySound.java
diff --git a/src/main/java/net/minecraft/command/CommandReplaceItem.java b/src/game/java/net/minecraft/command/CommandReplaceItem.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandReplaceItem.java
rename to src/game/java/net/minecraft/command/CommandReplaceItem.java
diff --git a/src/main/java/net/minecraft/command/CommandResultStats.java b/src/game/java/net/minecraft/command/CommandResultStats.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandResultStats.java
rename to src/game/java/net/minecraft/command/CommandResultStats.java
diff --git a/src/main/java/net/minecraft/command/CommandServerKick.java b/src/game/java/net/minecraft/command/CommandServerKick.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandServerKick.java
rename to src/game/java/net/minecraft/command/CommandServerKick.java
diff --git a/src/main/java/net/minecraft/command/CommandSetPlayerTimeout.java b/src/game/java/net/minecraft/command/CommandSetPlayerTimeout.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandSetPlayerTimeout.java
rename to src/game/java/net/minecraft/command/CommandSetPlayerTimeout.java
diff --git a/src/main/java/net/minecraft/command/CommandSetSpawnpoint.java b/src/game/java/net/minecraft/command/CommandSetSpawnpoint.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandSetSpawnpoint.java
rename to src/game/java/net/minecraft/command/CommandSetSpawnpoint.java
diff --git a/src/main/java/net/minecraft/command/CommandShowSeed.java b/src/game/java/net/minecraft/command/CommandShowSeed.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandShowSeed.java
rename to src/game/java/net/minecraft/command/CommandShowSeed.java
diff --git a/src/main/java/net/minecraft/command/CommandSpreadPlayers.java b/src/game/java/net/minecraft/command/CommandSpreadPlayers.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandSpreadPlayers.java
rename to src/game/java/net/minecraft/command/CommandSpreadPlayers.java
diff --git a/src/main/java/net/minecraft/command/CommandStats.java b/src/game/java/net/minecraft/command/CommandStats.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandStats.java
rename to src/game/java/net/minecraft/command/CommandStats.java
diff --git a/src/main/java/net/minecraft/command/CommandTime.java b/src/game/java/net/minecraft/command/CommandTime.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandTime.java
rename to src/game/java/net/minecraft/command/CommandTime.java
diff --git a/src/main/java/net/minecraft/command/CommandTitle.java b/src/game/java/net/minecraft/command/CommandTitle.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandTitle.java
rename to src/game/java/net/minecraft/command/CommandTitle.java
diff --git a/src/main/java/net/minecraft/command/CommandToggleDownfall.java b/src/game/java/net/minecraft/command/CommandToggleDownfall.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandToggleDownfall.java
rename to src/game/java/net/minecraft/command/CommandToggleDownfall.java
diff --git a/src/main/java/net/minecraft/command/CommandTrigger.java b/src/game/java/net/minecraft/command/CommandTrigger.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandTrigger.java
rename to src/game/java/net/minecraft/command/CommandTrigger.java
diff --git a/src/main/java/net/minecraft/command/CommandWeather.java b/src/game/java/net/minecraft/command/CommandWeather.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandWeather.java
rename to src/game/java/net/minecraft/command/CommandWeather.java
diff --git a/src/main/java/net/minecraft/command/CommandWorldBorder.java b/src/game/java/net/minecraft/command/CommandWorldBorder.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandWorldBorder.java
rename to src/game/java/net/minecraft/command/CommandWorldBorder.java
diff --git a/src/main/java/net/minecraft/command/CommandXP.java b/src/game/java/net/minecraft/command/CommandXP.java
similarity index 100%
rename from src/main/java/net/minecraft/command/CommandXP.java
rename to src/game/java/net/minecraft/command/CommandXP.java
diff --git a/src/main/java/net/minecraft/command/EntityNotFoundException.java b/src/game/java/net/minecraft/command/EntityNotFoundException.java
similarity index 100%
rename from src/main/java/net/minecraft/command/EntityNotFoundException.java
rename to src/game/java/net/minecraft/command/EntityNotFoundException.java
diff --git a/src/main/java/net/minecraft/command/IAdminCommand.java b/src/game/java/net/minecraft/command/IAdminCommand.java
similarity index 100%
rename from src/main/java/net/minecraft/command/IAdminCommand.java
rename to src/game/java/net/minecraft/command/IAdminCommand.java
diff --git a/src/main/java/net/minecraft/command/ICommand.java b/src/game/java/net/minecraft/command/ICommand.java
similarity index 100%
rename from src/main/java/net/minecraft/command/ICommand.java
rename to src/game/java/net/minecraft/command/ICommand.java
diff --git a/src/main/java/net/minecraft/command/ICommandManager.java b/src/game/java/net/minecraft/command/ICommandManager.java
similarity index 100%
rename from src/main/java/net/minecraft/command/ICommandManager.java
rename to src/game/java/net/minecraft/command/ICommandManager.java
diff --git a/src/main/java/net/minecraft/command/ICommandSender.java b/src/game/java/net/minecraft/command/ICommandSender.java
similarity index 100%
rename from src/main/java/net/minecraft/command/ICommandSender.java
rename to src/game/java/net/minecraft/command/ICommandSender.java
diff --git a/src/main/java/net/minecraft/command/NumberInvalidException.java b/src/game/java/net/minecraft/command/NumberInvalidException.java
similarity index 100%
rename from src/main/java/net/minecraft/command/NumberInvalidException.java
rename to src/game/java/net/minecraft/command/NumberInvalidException.java
diff --git a/src/main/java/net/minecraft/command/PlayerNotFoundException.java b/src/game/java/net/minecraft/command/PlayerNotFoundException.java
similarity index 100%
rename from src/main/java/net/minecraft/command/PlayerNotFoundException.java
rename to src/game/java/net/minecraft/command/PlayerNotFoundException.java
diff --git a/src/main/java/net/minecraft/command/PlayerSelector.java b/src/game/java/net/minecraft/command/PlayerSelector.java
similarity index 100%
rename from src/main/java/net/minecraft/command/PlayerSelector.java
rename to src/game/java/net/minecraft/command/PlayerSelector.java
diff --git a/src/main/java/net/minecraft/command/ServerCommandManager.java b/src/game/java/net/minecraft/command/ServerCommandManager.java
similarity index 100%
rename from src/main/java/net/minecraft/command/ServerCommandManager.java
rename to src/game/java/net/minecraft/command/ServerCommandManager.java
diff --git a/src/main/java/net/minecraft/command/SyntaxErrorException.java b/src/game/java/net/minecraft/command/SyntaxErrorException.java
similarity index 100%
rename from src/main/java/net/minecraft/command/SyntaxErrorException.java
rename to src/game/java/net/minecraft/command/SyntaxErrorException.java
diff --git a/src/main/java/net/minecraft/command/WrongUsageException.java b/src/game/java/net/minecraft/command/WrongUsageException.java
similarity index 100%
rename from src/main/java/net/minecraft/command/WrongUsageException.java
rename to src/game/java/net/minecraft/command/WrongUsageException.java
diff --git a/src/main/java/net/minecraft/command/server/CommandAchievement.java b/src/game/java/net/minecraft/command/server/CommandAchievement.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandAchievement.java
rename to src/game/java/net/minecraft/command/server/CommandAchievement.java
diff --git a/src/main/java/net/minecraft/command/server/CommandBlockLogic.java b/src/game/java/net/minecraft/command/server/CommandBlockLogic.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandBlockLogic.java
rename to src/game/java/net/minecraft/command/server/CommandBlockLogic.java
diff --git a/src/main/java/net/minecraft/command/server/CommandBroadcast.java b/src/game/java/net/minecraft/command/server/CommandBroadcast.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandBroadcast.java
rename to src/game/java/net/minecraft/command/server/CommandBroadcast.java
diff --git a/src/main/java/net/minecraft/command/server/CommandEmote.java b/src/game/java/net/minecraft/command/server/CommandEmote.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandEmote.java
rename to src/game/java/net/minecraft/command/server/CommandEmote.java
diff --git a/src/main/java/net/minecraft/command/server/CommandListPlayers.java b/src/game/java/net/minecraft/command/server/CommandListPlayers.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandListPlayers.java
rename to src/game/java/net/minecraft/command/server/CommandListPlayers.java
diff --git a/src/main/java/net/minecraft/command/server/CommandMessage.java b/src/game/java/net/minecraft/command/server/CommandMessage.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandMessage.java
rename to src/game/java/net/minecraft/command/server/CommandMessage.java
diff --git a/src/main/java/net/minecraft/command/server/CommandMessageRaw.java b/src/game/java/net/minecraft/command/server/CommandMessageRaw.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandMessageRaw.java
rename to src/game/java/net/minecraft/command/server/CommandMessageRaw.java
diff --git a/src/main/java/net/minecraft/command/server/CommandScoreboard.java b/src/game/java/net/minecraft/command/server/CommandScoreboard.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandScoreboard.java
rename to src/game/java/net/minecraft/command/server/CommandScoreboard.java
diff --git a/src/main/java/net/minecraft/command/server/CommandSetBlock.java b/src/game/java/net/minecraft/command/server/CommandSetBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandSetBlock.java
rename to src/game/java/net/minecraft/command/server/CommandSetBlock.java
diff --git a/src/main/java/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java b/src/game/java/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java
rename to src/game/java/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java
diff --git a/src/main/java/net/minecraft/command/server/CommandSummon.java b/src/game/java/net/minecraft/command/server/CommandSummon.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandSummon.java
rename to src/game/java/net/minecraft/command/server/CommandSummon.java
diff --git a/src/main/java/net/minecraft/command/server/CommandTeleport.java b/src/game/java/net/minecraft/command/server/CommandTeleport.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandTeleport.java
rename to src/game/java/net/minecraft/command/server/CommandTeleport.java
diff --git a/src/main/java/net/minecraft/command/server/CommandTestFor.java b/src/game/java/net/minecraft/command/server/CommandTestFor.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandTestFor.java
rename to src/game/java/net/minecraft/command/server/CommandTestFor.java
diff --git a/src/main/java/net/minecraft/command/server/CommandTestForBlock.java b/src/game/java/net/minecraft/command/server/CommandTestForBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/command/server/CommandTestForBlock.java
rename to src/game/java/net/minecraft/command/server/CommandTestForBlock.java
diff --git a/src/main/java/net/minecraft/crash/CrashReport.java b/src/game/java/net/minecraft/crash/CrashReport.java
similarity index 100%
rename from src/main/java/net/minecraft/crash/CrashReport.java
rename to src/game/java/net/minecraft/crash/CrashReport.java
diff --git a/src/main/java/net/minecraft/crash/CrashReportCategory.java b/src/game/java/net/minecraft/crash/CrashReportCategory.java
similarity index 100%
rename from src/main/java/net/minecraft/crash/CrashReportCategory.java
rename to src/game/java/net/minecraft/crash/CrashReportCategory.java
diff --git a/src/main/java/net/minecraft/creativetab/CreativeTabs.java b/src/game/java/net/minecraft/creativetab/CreativeTabs.java
similarity index 100%
rename from src/main/java/net/minecraft/creativetab/CreativeTabs.java
rename to src/game/java/net/minecraft/creativetab/CreativeTabs.java
diff --git a/src/main/java/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java b/src/game/java/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java
similarity index 100%
rename from src/main/java/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java
rename to src/game/java/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java
diff --git a/src/main/java/net/minecraft/dispenser/BehaviorProjectileDispense.java b/src/game/java/net/minecraft/dispenser/BehaviorProjectileDispense.java
similarity index 100%
rename from src/main/java/net/minecraft/dispenser/BehaviorProjectileDispense.java
rename to src/game/java/net/minecraft/dispenser/BehaviorProjectileDispense.java
diff --git a/src/main/java/net/minecraft/dispenser/IBehaviorDispenseItem.java b/src/game/java/net/minecraft/dispenser/IBehaviorDispenseItem.java
similarity index 100%
rename from src/main/java/net/minecraft/dispenser/IBehaviorDispenseItem.java
rename to src/game/java/net/minecraft/dispenser/IBehaviorDispenseItem.java
diff --git a/src/main/java/net/minecraft/dispenser/IBlockSource.java b/src/game/java/net/minecraft/dispenser/IBlockSource.java
similarity index 100%
rename from src/main/java/net/minecraft/dispenser/IBlockSource.java
rename to src/game/java/net/minecraft/dispenser/IBlockSource.java
diff --git a/src/main/java/net/minecraft/dispenser/ILocatableSource.java b/src/game/java/net/minecraft/dispenser/ILocatableSource.java
similarity index 100%
rename from src/main/java/net/minecraft/dispenser/ILocatableSource.java
rename to src/game/java/net/minecraft/dispenser/ILocatableSource.java
diff --git a/src/main/java/net/minecraft/dispenser/ILocation.java b/src/game/java/net/minecraft/dispenser/ILocation.java
similarity index 100%
rename from src/main/java/net/minecraft/dispenser/ILocation.java
rename to src/game/java/net/minecraft/dispenser/ILocation.java
diff --git a/src/main/java/net/minecraft/dispenser/IPosition.java b/src/game/java/net/minecraft/dispenser/IPosition.java
similarity index 100%
rename from src/main/java/net/minecraft/dispenser/IPosition.java
rename to src/game/java/net/minecraft/dispenser/IPosition.java
diff --git a/src/main/java/net/minecraft/dispenser/PositionImpl.java b/src/game/java/net/minecraft/dispenser/PositionImpl.java
similarity index 100%
rename from src/main/java/net/minecraft/dispenser/PositionImpl.java
rename to src/game/java/net/minecraft/dispenser/PositionImpl.java
diff --git a/src/main/java/net/minecraft/enchantment/Enchantment.java b/src/game/java/net/minecraft/enchantment/Enchantment.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/Enchantment.java
rename to src/game/java/net/minecraft/enchantment/Enchantment.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentArrowDamage.java b/src/game/java/net/minecraft/enchantment/EnchantmentArrowDamage.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentArrowDamage.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentArrowDamage.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentArrowFire.java b/src/game/java/net/minecraft/enchantment/EnchantmentArrowFire.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentArrowFire.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentArrowFire.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentArrowInfinite.java b/src/game/java/net/minecraft/enchantment/EnchantmentArrowInfinite.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentArrowInfinite.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentArrowInfinite.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentArrowKnockback.java b/src/game/java/net/minecraft/enchantment/EnchantmentArrowKnockback.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentArrowKnockback.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentArrowKnockback.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentDamage.java b/src/game/java/net/minecraft/enchantment/EnchantmentDamage.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentDamage.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentDamage.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentData.java b/src/game/java/net/minecraft/enchantment/EnchantmentData.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentData.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentData.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentDigging.java b/src/game/java/net/minecraft/enchantment/EnchantmentDigging.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentDigging.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentDigging.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentDurability.java b/src/game/java/net/minecraft/enchantment/EnchantmentDurability.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentDurability.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentDurability.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentFireAspect.java b/src/game/java/net/minecraft/enchantment/EnchantmentFireAspect.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentFireAspect.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentFireAspect.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentFishingSpeed.java b/src/game/java/net/minecraft/enchantment/EnchantmentFishingSpeed.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentFishingSpeed.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentFishingSpeed.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentHelper.java b/src/game/java/net/minecraft/enchantment/EnchantmentHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentHelper.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentHelper.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentKnockback.java b/src/game/java/net/minecraft/enchantment/EnchantmentKnockback.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentKnockback.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentKnockback.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentLootBonus.java b/src/game/java/net/minecraft/enchantment/EnchantmentLootBonus.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentLootBonus.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentLootBonus.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentOxygen.java b/src/game/java/net/minecraft/enchantment/EnchantmentOxygen.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentOxygen.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentOxygen.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentProtection.java b/src/game/java/net/minecraft/enchantment/EnchantmentProtection.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentProtection.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentProtection.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentThorns.java b/src/game/java/net/minecraft/enchantment/EnchantmentThorns.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentThorns.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentThorns.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentUntouching.java b/src/game/java/net/minecraft/enchantment/EnchantmentUntouching.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentUntouching.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentUntouching.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentWaterWalker.java b/src/game/java/net/minecraft/enchantment/EnchantmentWaterWalker.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentWaterWalker.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentWaterWalker.java
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentWaterWorker.java b/src/game/java/net/minecraft/enchantment/EnchantmentWaterWorker.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnchantmentWaterWorker.java
rename to src/game/java/net/minecraft/enchantment/EnchantmentWaterWorker.java
diff --git a/src/main/java/net/minecraft/enchantment/EnumEnchantmentType.java b/src/game/java/net/minecraft/enchantment/EnumEnchantmentType.java
similarity index 100%
rename from src/main/java/net/minecraft/enchantment/EnumEnchantmentType.java
rename to src/game/java/net/minecraft/enchantment/EnumEnchantmentType.java
diff --git a/src/main/java/net/minecraft/entity/DataWatcher.java b/src/game/java/net/minecraft/entity/DataWatcher.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/DataWatcher.java
rename to src/game/java/net/minecraft/entity/DataWatcher.java
diff --git a/src/main/java/net/minecraft/entity/Entity.java b/src/game/java/net/minecraft/entity/Entity.java
similarity index 95%
rename from src/main/java/net/minecraft/entity/Entity.java
rename to src/game/java/net/minecraft/entity/Entity.java
index ca3796b..d8eacca 100755
--- a/src/main/java/net/minecraft/entity/Entity.java
+++ b/src/game/java/net/minecraft/entity/Entity.java
@@ -6,6 +6,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.HString;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.DynamicLightsStateManager;
+import net.lax1dude.eaglercraft.v1_8.profanity_filter.ProfanityFilter;
 
 import java.util.concurrent.Callable;
 
@@ -17,6 +18,7 @@ import net.minecraft.block.BlockWall;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.block.state.pattern.BlockPattern;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.command.CommandResultStats;
 import net.minecraft.command.ICommandSender;
@@ -302,7 +304,6 @@ public abstract class Entity implements ICommandSender {
 	 * Gets called every tick from main Entity class
 	 */
 	public void onEntityUpdate() {
-		this.worldObj.theProfiler.startSection("entityBaseTick");
 		if (this.ridingEntity != null && this.ridingEntity.isDead) {
 			this.ridingEntity = null;
 		}
@@ -314,7 +315,6 @@ public abstract class Entity implements ICommandSender {
 		this.prevRotationPitch = this.rotationPitch;
 		this.prevRotationYaw = this.rotationYaw;
 		if (!this.worldObj.isRemote && this.worldObj instanceof WorldServer) {
-			this.worldObj.theProfiler.startSection("portal");
 			MinecraftServer minecraftserver = ((WorldServer) this.worldObj).getMinecraftServer();
 			int i = this.getMaxInPortalTime();
 			if (this.inPortal) {
@@ -347,8 +347,6 @@ public abstract class Entity implements ICommandSender {
 			if (this.timeUntilPortal > 0) {
 				--this.timeUntilPortal;
 			}
-
-			this.worldObj.theProfiler.endSection();
 		}
 
 		this.spawnRunningParticles();
@@ -384,7 +382,6 @@ public abstract class Entity implements ICommandSender {
 		}
 
 		this.firstUpdate = false;
-		this.worldObj.theProfiler.endSection();
 	}
 
 	/**+
@@ -459,7 +456,6 @@ public abstract class Entity implements ICommandSender {
 			this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, y, z));
 			this.resetPositionToBB();
 		} else {
-			this.worldObj.theProfiler.startSection("move");
 			double d0 = this.posX;
 			double d1 = this.posY;
 			double d2 = this.posZ;
@@ -629,8 +625,6 @@ public abstract class Entity implements ICommandSender {
 				}
 			}
 
-			this.worldObj.theProfiler.endSection();
-			this.worldObj.theProfiler.startSection("rest");
 			this.resetPositionToBB();
 			this.isCollidedHorizontally = d3 != x || d5 != z;
 			this.isCollidedVertically = d4 != y;
@@ -724,8 +718,6 @@ public abstract class Entity implements ICommandSender {
 				this.playSound("random.fizz", 0.7F, 1.6F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.4F);
 				this.fire = -this.fireResistance;
 			}
-
-			this.worldObj.theProfiler.endSection();
 		}
 	}
 
@@ -1985,6 +1977,19 @@ public abstract class Entity implements ICommandSender {
 		}
 	}
 
+	public String getNameProfanityFilter() {
+		if (this.hasCustomName()) {
+			return this.getCustomNameTagProfanityFilter();
+		} else {
+			String s = EntityList.getEntityString(this);
+			if (s == null) {
+				s = "generic";
+			}
+
+			return StatCollector.translateToLocal("entity." + s + ".name");
+		}
+	}
+
 	/**+
 	 * Return the Entity parts making up this Entity (currently only
 	 * for dragons)
@@ -2069,7 +2074,6 @@ public abstract class Entity implements ICommandSender {
 	 */
 	public void travelToDimension(int i) {
 		if (!this.worldObj.isRemote && !this.isDead) {
-			this.worldObj.theProfiler.startSection("changeDimension");
 			MinecraftServer minecraftserver = MinecraftServer.getServer();
 			int j = this.dimension;
 			WorldServer worldserver = minecraftserver.worldServerForDimension(j);
@@ -2082,9 +2086,7 @@ public abstract class Entity implements ICommandSender {
 
 			this.worldObj.removeEntity(this);
 			this.isDead = false;
-			this.worldObj.theProfiler.startSection("reposition");
 			minecraftserver.getConfigurationManager().transferEntityToWorld(this, j, worldserver, worldserver1);
-			this.worldObj.theProfiler.endStartSection("reloading");
 			Entity entity = EntityList.createEntityByName(EntityList.getEntityString(this), worldserver1);
 			if (entity != null) {
 				entity.copyDataFromOld(this);
@@ -2097,10 +2099,8 @@ public abstract class Entity implements ICommandSender {
 			}
 
 			this.isDead = true;
-			this.worldObj.theProfiler.endSection();
 			worldserver.resetUpdateEntityTick();
 			worldserver1.resetUpdateEntityTick();
-			this.worldObj.theProfiler.endSection();
 		}
 	}
 
@@ -2197,6 +2197,13 @@ public abstract class Entity implements ICommandSender {
 		return chatcomponenttext;
 	}
 
+	public IChatComponent getDisplayNameProfanityFilter() {
+		ChatComponentText chatcomponenttext = new ChatComponentText(this.getNameProfanityFilter());
+		chatcomponenttext.getChatStyle().setChatHoverEvent(this.getHoverEvent());
+		chatcomponenttext.getChatStyle().setInsertion(this.getUniqueID().toString());
+		return chatcomponenttext;
+	}
+
 	/**+
 	 * Sets the custom name tag for this entity
 	 */
@@ -2208,6 +2215,26 @@ public abstract class Entity implements ICommandSender {
 		return this.dataWatcher.getWatchableObjectString(2);
 	}
 
+	private String lastNameTagForFilter = null;
+	private String lastFilteredNameTagForFilter = null;
+
+	public String getCustomNameTagProfanityFilter() {
+		if (Minecraft.getMinecraft().isEnableProfanityFilter()) {
+			String str = getCustomNameTag();
+			if (str != null) {
+				if (!str.equals(lastNameTagForFilter)) {
+					lastNameTagForFilter = str;
+					lastFilteredNameTagForFilter = ProfanityFilter.getInstance().profanityFilterString(str);
+				}
+				return lastFilteredNameTagForFilter;
+			} else {
+				return null;
+			}
+		} else {
+			return getCustomNameTag();
+		}
+	}
+
 	/**+
 	 * Returns true if this thing is named
 	 */
diff --git a/src/main/java/net/minecraft/entity/EntityAgeable.java b/src/game/java/net/minecraft/entity/EntityAgeable.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntityAgeable.java
rename to src/game/java/net/minecraft/entity/EntityAgeable.java
diff --git a/src/main/java/net/minecraft/entity/EntityBodyHelper.java b/src/game/java/net/minecraft/entity/EntityBodyHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntityBodyHelper.java
rename to src/game/java/net/minecraft/entity/EntityBodyHelper.java
diff --git a/src/main/java/net/minecraft/entity/EntityCreature.java b/src/game/java/net/minecraft/entity/EntityCreature.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntityCreature.java
rename to src/game/java/net/minecraft/entity/EntityCreature.java
diff --git a/src/main/java/net/minecraft/entity/EntityFlying.java b/src/game/java/net/minecraft/entity/EntityFlying.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntityFlying.java
rename to src/game/java/net/minecraft/entity/EntityFlying.java
diff --git a/src/main/java/net/minecraft/entity/EntityHanging.java b/src/game/java/net/minecraft/entity/EntityHanging.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntityHanging.java
rename to src/game/java/net/minecraft/entity/EntityHanging.java
diff --git a/src/main/java/net/minecraft/entity/EntityLeashKnot.java b/src/game/java/net/minecraft/entity/EntityLeashKnot.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntityLeashKnot.java
rename to src/game/java/net/minecraft/entity/EntityLeashKnot.java
diff --git a/src/main/java/net/minecraft/entity/EntityList.java b/src/game/java/net/minecraft/entity/EntityList.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntityList.java
rename to src/game/java/net/minecraft/entity/EntityList.java
diff --git a/src/main/java/net/minecraft/entity/EntityLiving.java b/src/game/java/net/minecraft/entity/EntityLiving.java
similarity index 92%
rename from src/main/java/net/minecraft/entity/EntityLiving.java
rename to src/game/java/net/minecraft/entity/EntityLiving.java
index 1b1cbd3..d4647ee 100755
--- a/src/main/java/net/minecraft/entity/EntityLiving.java
+++ b/src/game/java/net/minecraft/entity/EntityLiving.java
@@ -87,9 +87,8 @@ public abstract class EntityLiving extends EntityLivingBase {
 
 	public EntityLiving(World worldIn) {
 		super(worldIn);
-		this.tasks = new EntityAITasks(worldIn != null && worldIn.theProfiler != null ? worldIn.theProfiler : null);
-		this.targetTasks = new EntityAITasks(
-				worldIn != null && worldIn.theProfiler != null ? worldIn.theProfiler : null);
+		this.tasks = new EntityAITasks();
+		this.targetTasks = new EntityAITasks();
 		this.lookHelper = new EntityLookHelper(this);
 		this.moveHelper = new EntityMoveHelper(this);
 		this.jumpHelper = new EntityJumpHelper(this);
@@ -197,13 +196,10 @@ public abstract class EntityLiving extends EntityLivingBase {
 	 */
 	public void onEntityUpdate() {
 		super.onEntityUpdate();
-		this.worldObj.theProfiler.startSection("mobBaseTick");
 		if (this.isEntityAlive() && this.rand.nextInt(1000) < this.livingSoundTime++) {
 			this.livingSoundTime = -this.getTalkInterval();
 			this.playLivingSound();
 		}
-
-		this.worldObj.theProfiler.endSection();
 	}
 
 	/**+
@@ -406,7 +402,6 @@ public abstract class EntityLiving extends EntityLivingBase {
 	 */
 	public void onLivingUpdate() {
 		super.onLivingUpdate();
-		this.worldObj.theProfiler.startSection("looting");
 		if (!this.worldObj.isRemote && this.canPickUpLoot() && !this.dead
 				&& this.worldObj.getGameRules().getBoolean("mobGriefing")) {
 			List<EntityItem> lst = this.worldObj.getEntitiesWithinAABB(EntityItem.class,
@@ -418,8 +413,6 @@ public abstract class EntityLiving extends EntityLivingBase {
 				}
 			}
 		}
-
-		this.worldObj.theProfiler.endSection();
 	}
 
 	/**+
@@ -530,33 +523,15 @@ public abstract class EntityLiving extends EntityLivingBase {
 
 	protected final void updateEntityActionState() {
 		++this.entityAge;
-		this.worldObj.theProfiler.startSection("checkDespawn");
 		this.despawnEntity();
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.startSection("sensing");
 		this.senses.clearSensingCache();
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.startSection("targetSelector");
 		this.targetTasks.onUpdateTasks();
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.startSection("goalSelector");
 		this.tasks.onUpdateTasks();
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.startSection("navigation");
 		this.navigator.onUpdateNavigation();
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.startSection("mob tick");
 		this.updateAITasks();
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.startSection("controls");
-		this.worldObj.theProfiler.startSection("move");
 		this.moveHelper.onUpdateMoveHelper();
-		this.worldObj.theProfiler.endStartSection("look");
 		this.lookHelper.onUpdateLook();
-		this.worldObj.theProfiler.endStartSection("jump");
 		this.jumpHelper.doJump();
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.endSection();
 	}
 
 	protected void updateAITasks() {
diff --git a/src/main/java/net/minecraft/entity/EntityLivingBase.java b/src/game/java/net/minecraft/entity/EntityLivingBase.java
similarity index 95%
rename from src/main/java/net/minecraft/entity/EntityLivingBase.java
rename to src/game/java/net/minecraft/entity/EntityLivingBase.java
index ea12cfc..b97a83b 100755
--- a/src/main/java/net/minecraft/entity/EntityLivingBase.java
+++ b/src/game/java/net/minecraft/entity/EntityLivingBase.java
@@ -214,7 +214,6 @@ public abstract class EntityLivingBase extends Entity {
 	public void onEntityUpdate() {
 		this.prevSwingProgress = this.swingProgress;
 		super.onEntityUpdate();
-		this.worldObj.theProfiler.startSection("livingEntityBaseTick");
 		boolean flag = this instanceof EntityPlayer;
 		if (this.isEntityAlive()) {
 			if (this.isEntityInsideOpaqueBlock()) {
@@ -303,7 +302,6 @@ public abstract class EntityLivingBase extends Entity {
 		this.prevRotationYawHead = this.rotationYawHead;
 		this.prevRotationYaw = this.rotationYaw;
 		this.prevRotationPitch = this.rotationPitch;
-		this.worldObj.theProfiler.endSection();
 	}
 
 	/**+
@@ -1531,10 +1529,7 @@ public abstract class EntityLivingBase extends Entity {
 		}
 
 		this.onGroundSpeedFactor += (f3 - this.onGroundSpeedFactor) * 0.3F;
-		this.worldObj.theProfiler.startSection("headTurn");
 		f2 = this.func_110146_f(f1, f2);
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.startSection("rangeChecks");
 
 		while (this.rotationYaw - this.prevRotationYaw < -180.0F) {
 			this.prevRotationYaw -= 360.0F;
@@ -1568,7 +1563,6 @@ public abstract class EntityLivingBase extends Entity {
 			this.prevRotationYawHead += 360.0F;
 		}
 
-		this.worldObj.theProfiler.endSection();
 		this.movedDistance += f2;
 	}
 
@@ -1636,20 +1630,15 @@ public abstract class EntityLivingBase extends Entity {
 			this.motionZ = 0.0D;
 		}
 
-		this.worldObj.theProfiler.startSection("ai");
 		if (this.isMovementBlocked()) {
 			this.isJumping = false;
 			this.moveStrafing = 0.0F;
 			this.moveForward = 0.0F;
 			this.randomYawVelocity = 0.0F;
 		} else if (this.isServerWorld()) {
-			this.worldObj.theProfiler.startSection("newAi");
 			this.updateEntityActionState();
-			this.worldObj.theProfiler.endSection();
 		}
 
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.startSection("jump");
 		if (this.isJumping) {
 			if (this.isInWater()) {
 				this.updateAITick();
@@ -1663,19 +1652,13 @@ public abstract class EntityLivingBase extends Entity {
 			this.jumpTicks = 0;
 		}
 
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.startSection("travel");
 		this.moveStrafing *= 0.98F;
 		this.moveForward *= 0.98F;
 		this.randomYawVelocity *= 0.9F;
 		this.moveEntityWithHeading(this.moveStrafing, this.moveForward);
-		this.worldObj.theProfiler.endSection();
-		this.worldObj.theProfiler.startSection("push");
 		if (!this.worldObj.isRemote) {
 			this.collideWithNearbyEntities();
 		}
-
-		this.worldObj.theProfiler.endSection();
 	}
 
 	protected void updateEntityActionState() {
@@ -1917,7 +1900,7 @@ public abstract class EntityLivingBase extends Entity {
 		if (itm != null && itm.stackSize > 0) {
 			Item item = itm.getItem();
 			if (item != null) {
-				float f2 = item.getHeldItemBrightnessEagler();
+				float f2 = item.getHeldItemBrightnessEagler(itm);
 				f = Math.min(f + f2 * 0.5f, 1.0f) + f2 * 0.5f;
 			}
 		}
diff --git a/src/main/java/net/minecraft/entity/EntityMinecartCommandBlock.java b/src/game/java/net/minecraft/entity/EntityMinecartCommandBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntityMinecartCommandBlock.java
rename to src/game/java/net/minecraft/entity/EntityMinecartCommandBlock.java
diff --git a/src/main/java/net/minecraft/entity/EntitySpawnPlacementRegistry.java b/src/game/java/net/minecraft/entity/EntitySpawnPlacementRegistry.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntitySpawnPlacementRegistry.java
rename to src/game/java/net/minecraft/entity/EntitySpawnPlacementRegistry.java
diff --git a/src/main/java/net/minecraft/entity/EntityTracker.java b/src/game/java/net/minecraft/entity/EntityTracker.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntityTracker.java
rename to src/game/java/net/minecraft/entity/EntityTracker.java
diff --git a/src/main/java/net/minecraft/entity/EntityTrackerEntry.java b/src/game/java/net/minecraft/entity/EntityTrackerEntry.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EntityTrackerEntry.java
rename to src/game/java/net/minecraft/entity/EntityTrackerEntry.java
diff --git a/src/main/java/net/minecraft/entity/EnumCreatureAttribute.java b/src/game/java/net/minecraft/entity/EnumCreatureAttribute.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EnumCreatureAttribute.java
rename to src/game/java/net/minecraft/entity/EnumCreatureAttribute.java
diff --git a/src/main/java/net/minecraft/entity/EnumCreatureType.java b/src/game/java/net/minecraft/entity/EnumCreatureType.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/EnumCreatureType.java
rename to src/game/java/net/minecraft/entity/EnumCreatureType.java
diff --git a/src/main/java/net/minecraft/entity/IEntityLivingData.java b/src/game/java/net/minecraft/entity/IEntityLivingData.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/IEntityLivingData.java
rename to src/game/java/net/minecraft/entity/IEntityLivingData.java
diff --git a/src/main/java/net/minecraft/entity/IEntityMultiPart.java b/src/game/java/net/minecraft/entity/IEntityMultiPart.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/IEntityMultiPart.java
rename to src/game/java/net/minecraft/entity/IEntityMultiPart.java
diff --git a/src/main/java/net/minecraft/entity/IEntityOwnable.java b/src/game/java/net/minecraft/entity/IEntityOwnable.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/IEntityOwnable.java
rename to src/game/java/net/minecraft/entity/IEntityOwnable.java
diff --git a/src/main/java/net/minecraft/entity/IMerchant.java b/src/game/java/net/minecraft/entity/IMerchant.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/IMerchant.java
rename to src/game/java/net/minecraft/entity/IMerchant.java
diff --git a/src/main/java/net/minecraft/entity/INpc.java b/src/game/java/net/minecraft/entity/INpc.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/INpc.java
rename to src/game/java/net/minecraft/entity/INpc.java
diff --git a/src/main/java/net/minecraft/entity/IProjectile.java b/src/game/java/net/minecraft/entity/IProjectile.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/IProjectile.java
rename to src/game/java/net/minecraft/entity/IProjectile.java
diff --git a/src/main/java/net/minecraft/entity/IRangedAttackMob.java b/src/game/java/net/minecraft/entity/IRangedAttackMob.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/IRangedAttackMob.java
rename to src/game/java/net/minecraft/entity/IRangedAttackMob.java
diff --git a/src/main/java/net/minecraft/entity/NpcMerchant.java b/src/game/java/net/minecraft/entity/NpcMerchant.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/NpcMerchant.java
rename to src/game/java/net/minecraft/entity/NpcMerchant.java
diff --git a/src/main/java/net/minecraft/entity/SharedMonsterAttributes.java b/src/game/java/net/minecraft/entity/SharedMonsterAttributes.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/SharedMonsterAttributes.java
rename to src/game/java/net/minecraft/entity/SharedMonsterAttributes.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIArrowAttack.java b/src/game/java/net/minecraft/entity/ai/EntityAIArrowAttack.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIArrowAttack.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIArrowAttack.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java b/src/game/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java b/src/game/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIBase.java b/src/game/java/net/minecraft/entity/ai/EntityAIBase.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIBase.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIBase.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIBeg.java b/src/game/java/net/minecraft/entity/ai/EntityAIBeg.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIBeg.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIBeg.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIBreakDoor.java b/src/game/java/net/minecraft/entity/ai/EntityAIBreakDoor.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIBreakDoor.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIBreakDoor.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java b/src/game/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAICreeperSwell.java b/src/game/java/net/minecraft/entity/ai/EntityAICreeperSwell.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAICreeperSwell.java
rename to src/game/java/net/minecraft/entity/ai/EntityAICreeperSwell.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIDefendVillage.java b/src/game/java/net/minecraft/entity/ai/EntityAIDefendVillage.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIDefendVillage.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIDefendVillage.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIDoorInteract.java b/src/game/java/net/minecraft/entity/ai/EntityAIDoorInteract.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIDoorInteract.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIDoorInteract.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIEatGrass.java b/src/game/java/net/minecraft/entity/ai/EntityAIEatGrass.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIEatGrass.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIEatGrass.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearest.java b/src/game/java/net/minecraft/entity/ai/EntityAIFindEntityNearest.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearest.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIFindEntityNearest.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java b/src/game/java/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFleeSun.java b/src/game/java/net/minecraft/entity/ai/EntityAIFleeSun.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIFleeSun.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIFleeSun.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFollowGolem.java b/src/game/java/net/minecraft/entity/ai/EntityAIFollowGolem.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIFollowGolem.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIFollowGolem.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFollowOwner.java b/src/game/java/net/minecraft/entity/ai/EntityAIFollowOwner.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIFollowOwner.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIFollowOwner.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFollowParent.java b/src/game/java/net/minecraft/entity/ai/EntityAIFollowParent.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIFollowParent.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIFollowParent.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java b/src/game/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java b/src/game/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java b/src/game/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java
rename to src/game/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java b/src/game/java/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java
rename to src/game/java/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAILookAtVillager.java b/src/game/java/net/minecraft/entity/ai/EntityAILookAtVillager.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAILookAtVillager.java
rename to src/game/java/net/minecraft/entity/ai/EntityAILookAtVillager.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAILookIdle.java b/src/game/java/net/minecraft/entity/ai/EntityAILookIdle.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAILookIdle.java
rename to src/game/java/net/minecraft/entity/ai/EntityAILookIdle.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMate.java b/src/game/java/net/minecraft/entity/ai/EntityAIMate.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIMate.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIMate.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java b/src/game/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java b/src/game/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java b/src/game/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java b/src/game/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java b/src/game/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java b/src/game/java/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java
rename to src/game/java/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOcelotAttack.java b/src/game/java/net/minecraft/entity/ai/EntityAIOcelotAttack.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIOcelotAttack.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIOcelotAttack.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOcelotSit.java b/src/game/java/net/minecraft/entity/ai/EntityAIOcelotSit.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIOcelotSit.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIOcelotSit.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOpenDoor.java b/src/game/java/net/minecraft/entity/ai/EntityAIOpenDoor.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIOpenDoor.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIOpenDoor.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java b/src/game/java/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java b/src/game/java/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIPanic.java b/src/game/java/net/minecraft/entity/ai/EntityAIPanic.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIPanic.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIPanic.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIPlay.java b/src/game/java/net/minecraft/entity/ai/EntityAIPlay.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIPlay.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIPlay.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java b/src/game/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIRestrictSun.java b/src/game/java/net/minecraft/entity/ai/EntityAIRestrictSun.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIRestrictSun.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIRestrictSun.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java b/src/game/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAISit.java b/src/game/java/net/minecraft/entity/ai/EntityAISit.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAISit.java
rename to src/game/java/net/minecraft/entity/ai/EntityAISit.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAISwimming.java b/src/game/java/net/minecraft/entity/ai/EntityAISwimming.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAISwimming.java
rename to src/game/java/net/minecraft/entity/ai/EntityAISwimming.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITarget.java b/src/game/java/net/minecraft/entity/ai/EntityAITarget.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAITarget.java
rename to src/game/java/net/minecraft/entity/ai/EntityAITarget.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITargetNonTamed.java b/src/game/java/net/minecraft/entity/ai/EntityAITargetNonTamed.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAITargetNonTamed.java
rename to src/game/java/net/minecraft/entity/ai/EntityAITargetNonTamed.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITasks.java b/src/game/java/net/minecraft/entity/ai/EntityAITasks.java
similarity index 92%
rename from src/main/java/net/minecraft/entity/ai/EntityAITasks.java
rename to src/game/java/net/minecraft/entity/ai/EntityAITasks.java
index 6b6c831..ceb0f23 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAITasks.java
+++ b/src/game/java/net/minecraft/entity/ai/EntityAITasks.java
@@ -3,7 +3,6 @@ package net.minecraft.entity.ai;
 import com.google.common.collect.Lists;
 import java.util.Iterator;
 import java.util.List;
-import net.minecraft.profiler.Profiler;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -38,14 +37,9 @@ public class EntityAITasks {
 	 * executed.
 	 */
 	private List<EntityAITasks.EntityAITaskEntry> executingTaskEntries = Lists.newArrayList();
-	private final Profiler theProfiler;
 	private int tickCount;
 	private int tickRate = 3;
 
-	public EntityAITasks(Profiler profilerIn) {
-		this.theProfiler = profilerIn;
-	}
-
 	/**+
 	 * Add a now AITask. Args : priority, task
 	 */
@@ -76,7 +70,6 @@ public class EntityAITasks {
 	}
 
 	public void onUpdateTasks() {
-		this.theProfiler.startSection("goalSetup");
 		if (this.tickCount++ % this.tickRate == 0) {
 			Iterator iterator = this.taskEntries.iterator();
 
@@ -120,14 +113,9 @@ public class EntityAITasks {
 			}
 		}
 
-		this.theProfiler.endSection();
-		this.theProfiler.startSection("goalTick");
-
 		for (int i = 0, l = this.executingTaskEntries.size(); i < l; ++i) {
 			this.executingTaskEntries.get(i).action.updateTask();
 		}
-
-		this.theProfiler.endSection();
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITempt.java b/src/game/java/net/minecraft/entity/ai/EntityAITempt.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAITempt.java
rename to src/game/java/net/minecraft/entity/ai/EntityAITempt.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITradePlayer.java b/src/game/java/net/minecraft/entity/ai/EntityAITradePlayer.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAITradePlayer.java
rename to src/game/java/net/minecraft/entity/ai/EntityAITradePlayer.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java b/src/game/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIVillagerMate.java b/src/game/java/net/minecraft/entity/ai/EntityAIVillagerMate.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIVillagerMate.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIVillagerMate.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIWander.java b/src/game/java/net/minecraft/entity/ai/EntityAIWander.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIWander.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIWander.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest.java b/src/game/java/net/minecraft/entity/ai/EntityAIWatchClosest.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIWatchClosest.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest2.java b/src/game/java/net/minecraft/entity/ai/EntityAIWatchClosest2.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest2.java
rename to src/game/java/net/minecraft/entity/ai/EntityAIWatchClosest2.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityJumpHelper.java b/src/game/java/net/minecraft/entity/ai/EntityJumpHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityJumpHelper.java
rename to src/game/java/net/minecraft/entity/ai/EntityJumpHelper.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityLookHelper.java b/src/game/java/net/minecraft/entity/ai/EntityLookHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityLookHelper.java
rename to src/game/java/net/minecraft/entity/ai/EntityLookHelper.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityMinecartMobSpawner.java b/src/game/java/net/minecraft/entity/ai/EntityMinecartMobSpawner.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityMinecartMobSpawner.java
rename to src/game/java/net/minecraft/entity/ai/EntityMinecartMobSpawner.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntityMoveHelper.java b/src/game/java/net/minecraft/entity/ai/EntityMoveHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/EntityMoveHelper.java
rename to src/game/java/net/minecraft/entity/ai/EntityMoveHelper.java
diff --git a/src/main/java/net/minecraft/entity/ai/EntitySenses.java b/src/game/java/net/minecraft/entity/ai/EntitySenses.java
similarity index 92%
rename from src/main/java/net/minecraft/entity/ai/EntitySenses.java
rename to src/game/java/net/minecraft/entity/ai/EntitySenses.java
index 5450b10..df71fe8 100755
--- a/src/main/java/net/minecraft/entity/ai/EntitySenses.java
+++ b/src/game/java/net/minecraft/entity/ai/EntitySenses.java
@@ -52,9 +52,7 @@ public class EntitySenses {
 		} else if (this.unseenEntities.contains(entityIn)) {
 			return false;
 		} else {
-			this.entityObj.worldObj.theProfiler.startSection("canSee");
 			boolean flag = this.entityObj.canEntityBeSeen(entityIn);
-			this.entityObj.worldObj.theProfiler.endSection();
 			if (flag) {
 				this.seenEntities.add(entityIn);
 			} else {
diff --git a/src/main/java/net/minecraft/entity/ai/RandomPositionGenerator.java b/src/game/java/net/minecraft/entity/ai/RandomPositionGenerator.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/RandomPositionGenerator.java
rename to src/game/java/net/minecraft/entity/ai/RandomPositionGenerator.java
diff --git a/src/main/java/net/minecraft/entity/ai/attributes/AttributeModifier.java b/src/game/java/net/minecraft/entity/ai/attributes/AttributeModifier.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/attributes/AttributeModifier.java
rename to src/game/java/net/minecraft/entity/ai/attributes/AttributeModifier.java
diff --git a/src/main/java/net/minecraft/entity/ai/attributes/BaseAttribute.java b/src/game/java/net/minecraft/entity/ai/attributes/BaseAttribute.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/attributes/BaseAttribute.java
rename to src/game/java/net/minecraft/entity/ai/attributes/BaseAttribute.java
diff --git a/src/main/java/net/minecraft/entity/ai/attributes/BaseAttributeMap.java b/src/game/java/net/minecraft/entity/ai/attributes/BaseAttributeMap.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/attributes/BaseAttributeMap.java
rename to src/game/java/net/minecraft/entity/ai/attributes/BaseAttributeMap.java
diff --git a/src/main/java/net/minecraft/entity/ai/attributes/IAttribute.java b/src/game/java/net/minecraft/entity/ai/attributes/IAttribute.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/attributes/IAttribute.java
rename to src/game/java/net/minecraft/entity/ai/attributes/IAttribute.java
diff --git a/src/main/java/net/minecraft/entity/ai/attributes/IAttributeInstance.java b/src/game/java/net/minecraft/entity/ai/attributes/IAttributeInstance.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/attributes/IAttributeInstance.java
rename to src/game/java/net/minecraft/entity/ai/attributes/IAttributeInstance.java
diff --git a/src/main/java/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java b/src/game/java/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java
rename to src/game/java/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java
diff --git a/src/main/java/net/minecraft/entity/ai/attributes/RangedAttribute.java b/src/game/java/net/minecraft/entity/ai/attributes/RangedAttribute.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/attributes/RangedAttribute.java
rename to src/game/java/net/minecraft/entity/ai/attributes/RangedAttribute.java
diff --git a/src/main/java/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java b/src/game/java/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java
rename to src/game/java/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java
diff --git a/src/main/java/net/minecraft/entity/boss/BossStatus.java b/src/game/java/net/minecraft/entity/boss/BossStatus.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/boss/BossStatus.java
rename to src/game/java/net/minecraft/entity/boss/BossStatus.java
diff --git a/src/main/java/net/minecraft/entity/boss/EntityDragon.java b/src/game/java/net/minecraft/entity/boss/EntityDragon.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/boss/EntityDragon.java
rename to src/game/java/net/minecraft/entity/boss/EntityDragon.java
diff --git a/src/main/java/net/minecraft/entity/boss/EntityDragonPart.java b/src/game/java/net/minecraft/entity/boss/EntityDragonPart.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/boss/EntityDragonPart.java
rename to src/game/java/net/minecraft/entity/boss/EntityDragonPart.java
diff --git a/src/main/java/net/minecraft/entity/boss/EntityWither.java b/src/game/java/net/minecraft/entity/boss/EntityWither.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/boss/EntityWither.java
rename to src/game/java/net/minecraft/entity/boss/EntityWither.java
diff --git a/src/main/java/net/minecraft/entity/boss/IBossDisplayData.java b/src/game/java/net/minecraft/entity/boss/IBossDisplayData.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/boss/IBossDisplayData.java
rename to src/game/java/net/minecraft/entity/boss/IBossDisplayData.java
diff --git a/src/main/java/net/minecraft/entity/effect/EntityLightningBolt.java b/src/game/java/net/minecraft/entity/effect/EntityLightningBolt.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/effect/EntityLightningBolt.java
rename to src/game/java/net/minecraft/entity/effect/EntityLightningBolt.java
diff --git a/src/main/java/net/minecraft/entity/effect/EntityWeatherEffect.java b/src/game/java/net/minecraft/entity/effect/EntityWeatherEffect.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/effect/EntityWeatherEffect.java
rename to src/game/java/net/minecraft/entity/effect/EntityWeatherEffect.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityArmorStand.java b/src/game/java/net/minecraft/entity/item/EntityArmorStand.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityArmorStand.java
rename to src/game/java/net/minecraft/entity/item/EntityArmorStand.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityBoat.java b/src/game/java/net/minecraft/entity/item/EntityBoat.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityBoat.java
rename to src/game/java/net/minecraft/entity/item/EntityBoat.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityEnderCrystal.java b/src/game/java/net/minecraft/entity/item/EntityEnderCrystal.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityEnderCrystal.java
rename to src/game/java/net/minecraft/entity/item/EntityEnderCrystal.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityEnderEye.java b/src/game/java/net/minecraft/entity/item/EntityEnderEye.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityEnderEye.java
rename to src/game/java/net/minecraft/entity/item/EntityEnderEye.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityEnderPearl.java b/src/game/java/net/minecraft/entity/item/EntityEnderPearl.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityEnderPearl.java
rename to src/game/java/net/minecraft/entity/item/EntityEnderPearl.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityExpBottle.java b/src/game/java/net/minecraft/entity/item/EntityExpBottle.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityExpBottle.java
rename to src/game/java/net/minecraft/entity/item/EntityExpBottle.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityFallingBlock.java b/src/game/java/net/minecraft/entity/item/EntityFallingBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityFallingBlock.java
rename to src/game/java/net/minecraft/entity/item/EntityFallingBlock.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java b/src/game/java/net/minecraft/entity/item/EntityFireworkRocket.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java
rename to src/game/java/net/minecraft/entity/item/EntityFireworkRocket.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityItem.java b/src/game/java/net/minecraft/entity/item/EntityItem.java
similarity index 96%
rename from src/main/java/net/minecraft/entity/item/EntityItem.java
rename to src/game/java/net/minecraft/entity/item/EntityItem.java
index 7c5cb51..df3b79c 100755
--- a/src/main/java/net/minecraft/entity/item/EntityItem.java
+++ b/src/game/java/net/minecraft/entity/item/EntityItem.java
@@ -482,7 +482,7 @@ public class EntityItem extends Entity {
 		if (itm != null && itm.stackSize > 0) {
 			Item item = itm.getItem();
 			if (item != null) {
-				float f2 = item.getHeldItemBrightnessEagler() * 0.75f;
+				float f2 = item.getHeldItemBrightnessEagler(itm) * 0.75f;
 				f = Math.min(f + f2 * 0.5f, 1.0f) + f2 * 0.5f;
 			}
 		}
diff --git a/src/main/java/net/minecraft/entity/item/EntityItemFrame.java b/src/game/java/net/minecraft/entity/item/EntityItemFrame.java
similarity index 96%
rename from src/main/java/net/minecraft/entity/item/EntityItemFrame.java
rename to src/game/java/net/minecraft/entity/item/EntityItemFrame.java
index 13627df..421e55f 100755
--- a/src/main/java/net/minecraft/entity/item/EntityItemFrame.java
+++ b/src/game/java/net/minecraft/entity/item/EntityItemFrame.java
@@ -260,7 +260,7 @@ public class EntityItemFrame extends EntityHanging {
 		if (itm != null && itm.stackSize > 0) {
 			Item item = itm.getItem();
 			if (item != null) {
-				float f2 = item.getHeldItemBrightnessEagler() * 0.75f;
+				float f2 = item.getHeldItemBrightnessEagler(itm) * 0.75f;
 				f = Math.min(f + f2 * 0.5f, 1.0f) + f2 * 0.5f;
 			}
 		}
diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecart.java b/src/game/java/net/minecraft/entity/item/EntityMinecart.java
similarity index 96%
rename from src/main/java/net/minecraft/entity/item/EntityMinecart.java
rename to src/game/java/net/minecraft/entity/item/EntityMinecart.java
index c76c9fb..168e5bb 100755
--- a/src/main/java/net/minecraft/entity/item/EntityMinecart.java
+++ b/src/game/java/net/minecraft/entity/item/EntityMinecart.java
@@ -248,7 +248,6 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable {
 		}
 
 		if (!this.worldObj.isRemote && this.worldObj instanceof WorldServer) {
-			this.worldObj.theProfiler.startSection("portal");
 			MinecraftServer minecraftserver = ((WorldServer) this.worldObj).getMinecraftServer();
 			int i = this.getMaxInPortalTime();
 			if (this.inPortal) {
@@ -281,8 +280,6 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable {
 			if (this.timeUntilPortal > 0) {
 				--this.timeUntilPortal;
 			}
-
-			this.worldObj.theProfiler.endSection();
 		}
 
 		if (this.worldObj.isRemote) {
@@ -942,6 +939,14 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable {
 		return this.entityName != null ? this.entityName : super.getName();
 	}
 
+	public String getNameProfanityFilter() {
+		/**+
+		 * Gets the name of this command sender (usually username, but
+		 * possibly "Rcon")
+		 */
+		return getName();
+	}
+
 	/**+
 	 * Returns true if this thing is named
 	 */
@@ -972,6 +977,14 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable {
 		}
 	}
 
+	public IChatComponent getDisplayNameProfanityFilter() {
+		/**+
+		 * Get the formatted ChatComponent that will be used for the
+		 * sender's username in chat
+		 */
+		return getDisplayName();
+	}
+
 	public static enum EnumMinecartType {
 		RIDEABLE(0, "MinecartRideable"), CHEST(1, "MinecartChest"), FURNACE(2, "MinecartFurnace"),
 		TNT(3, "MinecartTNT"), SPAWNER(4, "MinecartSpawner"), HOPPER(5, "MinecartHopper"),
diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecartChest.java b/src/game/java/net/minecraft/entity/item/EntityMinecartChest.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityMinecartChest.java
rename to src/game/java/net/minecraft/entity/item/EntityMinecartChest.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecartContainer.java b/src/game/java/net/minecraft/entity/item/EntityMinecartContainer.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityMinecartContainer.java
rename to src/game/java/net/minecraft/entity/item/EntityMinecartContainer.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecartEmpty.java b/src/game/java/net/minecraft/entity/item/EntityMinecartEmpty.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityMinecartEmpty.java
rename to src/game/java/net/minecraft/entity/item/EntityMinecartEmpty.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecartFurnace.java b/src/game/java/net/minecraft/entity/item/EntityMinecartFurnace.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityMinecartFurnace.java
rename to src/game/java/net/minecraft/entity/item/EntityMinecartFurnace.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecartHopper.java b/src/game/java/net/minecraft/entity/item/EntityMinecartHopper.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityMinecartHopper.java
rename to src/game/java/net/minecraft/entity/item/EntityMinecartHopper.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecartTNT.java b/src/game/java/net/minecraft/entity/item/EntityMinecartTNT.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityMinecartTNT.java
rename to src/game/java/net/minecraft/entity/item/EntityMinecartTNT.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityPainting.java b/src/game/java/net/minecraft/entity/item/EntityPainting.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityPainting.java
rename to src/game/java/net/minecraft/entity/item/EntityPainting.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityTNTPrimed.java b/src/game/java/net/minecraft/entity/item/EntityTNTPrimed.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityTNTPrimed.java
rename to src/game/java/net/minecraft/entity/item/EntityTNTPrimed.java
diff --git a/src/main/java/net/minecraft/entity/item/EntityXPOrb.java b/src/game/java/net/minecraft/entity/item/EntityXPOrb.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/item/EntityXPOrb.java
rename to src/game/java/net/minecraft/entity/item/EntityXPOrb.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityBlaze.java b/src/game/java/net/minecraft/entity/monster/EntityBlaze.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityBlaze.java
rename to src/game/java/net/minecraft/entity/monster/EntityBlaze.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityCaveSpider.java b/src/game/java/net/minecraft/entity/monster/EntityCaveSpider.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityCaveSpider.java
rename to src/game/java/net/minecraft/entity/monster/EntityCaveSpider.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityCreeper.java b/src/game/java/net/minecraft/entity/monster/EntityCreeper.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityCreeper.java
rename to src/game/java/net/minecraft/entity/monster/EntityCreeper.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityEnderman.java b/src/game/java/net/minecraft/entity/monster/EntityEnderman.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityEnderman.java
rename to src/game/java/net/minecraft/entity/monster/EntityEnderman.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityEndermite.java b/src/game/java/net/minecraft/entity/monster/EntityEndermite.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityEndermite.java
rename to src/game/java/net/minecraft/entity/monster/EntityEndermite.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityGhast.java b/src/game/java/net/minecraft/entity/monster/EntityGhast.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityGhast.java
rename to src/game/java/net/minecraft/entity/monster/EntityGhast.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityGiantZombie.java b/src/game/java/net/minecraft/entity/monster/EntityGiantZombie.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityGiantZombie.java
rename to src/game/java/net/minecraft/entity/monster/EntityGiantZombie.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityGolem.java b/src/game/java/net/minecraft/entity/monster/EntityGolem.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityGolem.java
rename to src/game/java/net/minecraft/entity/monster/EntityGolem.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityGuardian.java b/src/game/java/net/minecraft/entity/monster/EntityGuardian.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityGuardian.java
rename to src/game/java/net/minecraft/entity/monster/EntityGuardian.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityIronGolem.java b/src/game/java/net/minecraft/entity/monster/EntityIronGolem.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityIronGolem.java
rename to src/game/java/net/minecraft/entity/monster/EntityIronGolem.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityMagmaCube.java b/src/game/java/net/minecraft/entity/monster/EntityMagmaCube.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityMagmaCube.java
rename to src/game/java/net/minecraft/entity/monster/EntityMagmaCube.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityMob.java b/src/game/java/net/minecraft/entity/monster/EntityMob.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityMob.java
rename to src/game/java/net/minecraft/entity/monster/EntityMob.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityPigZombie.java b/src/game/java/net/minecraft/entity/monster/EntityPigZombie.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityPigZombie.java
rename to src/game/java/net/minecraft/entity/monster/EntityPigZombie.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntitySilverfish.java b/src/game/java/net/minecraft/entity/monster/EntitySilverfish.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntitySilverfish.java
rename to src/game/java/net/minecraft/entity/monster/EntitySilverfish.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntitySkeleton.java b/src/game/java/net/minecraft/entity/monster/EntitySkeleton.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntitySkeleton.java
rename to src/game/java/net/minecraft/entity/monster/EntitySkeleton.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntitySlime.java b/src/game/java/net/minecraft/entity/monster/EntitySlime.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntitySlime.java
rename to src/game/java/net/minecraft/entity/monster/EntitySlime.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntitySnowman.java b/src/game/java/net/minecraft/entity/monster/EntitySnowman.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntitySnowman.java
rename to src/game/java/net/minecraft/entity/monster/EntitySnowman.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntitySpider.java b/src/game/java/net/minecraft/entity/monster/EntitySpider.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntitySpider.java
rename to src/game/java/net/minecraft/entity/monster/EntitySpider.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityWitch.java b/src/game/java/net/minecraft/entity/monster/EntityWitch.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityWitch.java
rename to src/game/java/net/minecraft/entity/monster/EntityWitch.java
diff --git a/src/main/java/net/minecraft/entity/monster/EntityZombie.java b/src/game/java/net/minecraft/entity/monster/EntityZombie.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/EntityZombie.java
rename to src/game/java/net/minecraft/entity/monster/EntityZombie.java
diff --git a/src/main/java/net/minecraft/entity/monster/IMob.java b/src/game/java/net/minecraft/entity/monster/IMob.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/monster/IMob.java
rename to src/game/java/net/minecraft/entity/monster/IMob.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntityAmbientCreature.java b/src/game/java/net/minecraft/entity/passive/EntityAmbientCreature.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntityAmbientCreature.java
rename to src/game/java/net/minecraft/entity/passive/EntityAmbientCreature.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntityAnimal.java b/src/game/java/net/minecraft/entity/passive/EntityAnimal.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntityAnimal.java
rename to src/game/java/net/minecraft/entity/passive/EntityAnimal.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntityBat.java b/src/game/java/net/minecraft/entity/passive/EntityBat.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntityBat.java
rename to src/game/java/net/minecraft/entity/passive/EntityBat.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntityChicken.java b/src/game/java/net/minecraft/entity/passive/EntityChicken.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntityChicken.java
rename to src/game/java/net/minecraft/entity/passive/EntityChicken.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntityCow.java b/src/game/java/net/minecraft/entity/passive/EntityCow.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntityCow.java
rename to src/game/java/net/minecraft/entity/passive/EntityCow.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntityHorse.java b/src/game/java/net/minecraft/entity/passive/EntityHorse.java
similarity index 96%
rename from src/main/java/net/minecraft/entity/passive/EntityHorse.java
rename to src/game/java/net/minecraft/entity/passive/EntityHorse.java
index 5829480..44fde57 100755
--- a/src/main/java/net/minecraft/entity/passive/EntityHorse.java
+++ b/src/game/java/net/minecraft/entity/passive/EntityHorse.java
@@ -162,8 +162,16 @@ public class EntityHorse extends EntityAnimal implements IInvBasic {
 	 * possibly "Rcon")
 	 */
 	public String getName() {
+		return getNameImpl(false);
+	}
+
+	public String getNameProfanityFilter() {
+		return getNameImpl(true);
+	}
+
+	private String getNameImpl(boolean filter) {
 		if (this.hasCustomName()) {
-			return this.getCustomNameTag();
+			return filter ? this.getCustomNameTagProfanityFilter() : this.getCustomNameTag();
 		} else {
 			int i = this.getHorseType();
 			switch (i) {
diff --git a/src/main/java/net/minecraft/entity/passive/EntityMooshroom.java b/src/game/java/net/minecraft/entity/passive/EntityMooshroom.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntityMooshroom.java
rename to src/game/java/net/minecraft/entity/passive/EntityMooshroom.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntityOcelot.java b/src/game/java/net/minecraft/entity/passive/EntityOcelot.java
similarity index 94%
rename from src/main/java/net/minecraft/entity/passive/EntityOcelot.java
rename to src/game/java/net/minecraft/entity/passive/EntityOcelot.java
index fee4165..6cc07c7 100755
--- a/src/main/java/net/minecraft/entity/passive/EntityOcelot.java
+++ b/src/game/java/net/minecraft/entity/passive/EntityOcelot.java
@@ -308,8 +308,17 @@ public class EntityOcelot extends EntityTameable {
 	 * possibly "Rcon")
 	 */
 	public String getName() {
-		return this.hasCustomName() ? this.getCustomNameTag()
-				: (this.isTamed() ? StatCollector.translateToLocal("entity.Cat.name") : super.getName());
+		return getNameImpl(false);
+	}
+
+	public String getNameProfanityFilter() {
+		return getNameImpl(true);
+	}
+
+	private String getNameImpl(boolean filter) {
+		return this.hasCustomName() ? (filter ? this.getCustomNameTagProfanityFilter() : this.getCustomNameTag())
+				: (this.isTamed() ? StatCollector.translateToLocal("entity.Cat.name")
+						: (filter ? super.getNameProfanityFilter() : super.getName()));
 	}
 
 	public void setTamed(boolean flag) {
diff --git a/src/main/java/net/minecraft/entity/passive/EntityPig.java b/src/game/java/net/minecraft/entity/passive/EntityPig.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntityPig.java
rename to src/game/java/net/minecraft/entity/passive/EntityPig.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntityRabbit.java b/src/game/java/net/minecraft/entity/passive/EntityRabbit.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntityRabbit.java
rename to src/game/java/net/minecraft/entity/passive/EntityRabbit.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntitySheep.java b/src/game/java/net/minecraft/entity/passive/EntitySheep.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntitySheep.java
rename to src/game/java/net/minecraft/entity/passive/EntitySheep.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntitySquid.java b/src/game/java/net/minecraft/entity/passive/EntitySquid.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntitySquid.java
rename to src/game/java/net/minecraft/entity/passive/EntitySquid.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntityTameable.java b/src/game/java/net/minecraft/entity/passive/EntityTameable.java
similarity index 93%
rename from src/main/java/net/minecraft/entity/passive/EntityTameable.java
rename to src/game/java/net/minecraft/entity/passive/EntityTameable.java
index f657958..f9998a0 100755
--- a/src/main/java/net/minecraft/entity/passive/EntityTameable.java
+++ b/src/game/java/net/minecraft/entity/passive/EntityTameable.java
@@ -1,5 +1,7 @@
 package net.minecraft.entity.passive;
 
+import org.apache.commons.lang3.StringUtils;
+
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.minecraft.entity.EntityLivingBase;
@@ -171,11 +173,15 @@ public abstract class EntityTameable extends EntityAnimal implements IEntityOwna
 	}
 
 	public EntityLivingBase getOwner() {
+		String ownerName = this.getOwnerId();
+		if (StringUtils.isEmpty(ownerName)) {
+			return null;
+		}
 		try {
-			EaglercraftUUID uuid = EaglercraftUUID.fromString(this.getOwnerId());
+			EaglercraftUUID uuid = EaglercraftUUID.fromString(ownerName);
 			return uuid == null ? null : this.worldObj.getPlayerEntityByUUID(uuid);
 		} catch (IllegalArgumentException var2) {
-			return null;
+			return this.worldObj.getPlayerEntityByName(ownerName);
 		}
 	}
 
diff --git a/src/main/java/net/minecraft/entity/passive/EntityVillager.java b/src/game/java/net/minecraft/entity/passive/EntityVillager.java
similarity index 96%
rename from src/main/java/net/minecraft/entity/passive/EntityVillager.java
rename to src/game/java/net/minecraft/entity/passive/EntityVillager.java
index d2c9859..e4978e3 100755
--- a/src/main/java/net/minecraft/entity/passive/EntityVillager.java
+++ b/src/game/java/net/minecraft/entity/passive/EntityVillager.java
@@ -729,7 +729,15 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc {
 	 * sender's username in chat
 	 */
 	public IChatComponent getDisplayName() {
-		String s = this.getCustomNameTag();
+		return getDisplayNameImpl(false);
+	}
+
+	public IChatComponent getDisplayNameProfanityFilter() {
+		return getDisplayNameImpl(true);
+	}
+
+	private IChatComponent getDisplayNameImpl(boolean filter) {
+		String s = filter ? this.getCustomNameTagProfanityFilter() : this.getCustomNameTag();
 		if (s != null && s.length() > 0) {
 			ChatComponentText chatcomponenttext = new ChatComponentText(s);
 			chatcomponenttext.getChatStyle().setChatHoverEvent(this.getHoverEvent());
@@ -783,7 +791,7 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc {
 				chatcomponenttranslation.getChatStyle().setInsertion(this.getUniqueID().toString());
 				return chatcomponenttranslation;
 			} else {
-				return super.getDisplayName();
+				return filter ? super.getDisplayNameProfanityFilter() : super.getDisplayName();
 			}
 		}
 	}
diff --git a/src/main/java/net/minecraft/entity/passive/EntityWaterMob.java b/src/game/java/net/minecraft/entity/passive/EntityWaterMob.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntityWaterMob.java
rename to src/game/java/net/minecraft/entity/passive/EntityWaterMob.java
diff --git a/src/main/java/net/minecraft/entity/passive/EntityWolf.java b/src/game/java/net/minecraft/entity/passive/EntityWolf.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/EntityWolf.java
rename to src/game/java/net/minecraft/entity/passive/EntityWolf.java
diff --git a/src/main/java/net/minecraft/entity/passive/IAnimals.java b/src/game/java/net/minecraft/entity/passive/IAnimals.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/passive/IAnimals.java
rename to src/game/java/net/minecraft/entity/passive/IAnimals.java
diff --git a/src/main/java/net/minecraft/entity/player/EntityPlayer.java b/src/game/java/net/minecraft/entity/player/EntityPlayer.java
similarity index 96%
rename from src/main/java/net/minecraft/entity/player/EntityPlayer.java
rename to src/game/java/net/minecraft/entity/player/EntityPlayer.java
index 1cf27ce..a1941f5 100755
--- a/src/main/java/net/minecraft/entity/player/EntityPlayer.java
+++ b/src/game/java/net/minecraft/entity/player/EntityPlayer.java
@@ -194,6 +194,15 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
 		return this.itemInUse != null;
 	}
 
+	public boolean getItemShouldUseOnTouchEagler() {
+		if (itemInUse != null) {
+			return itemInUse.getItem().shouldUseOnTouchEagler(itemInUse);
+		} else {
+			ItemStack st = getHeldItem();
+			return st != null && st.getItem().shouldUseOnTouchEagler(st);
+		}
+	}
+
 	/**+
 	 * gets the duration for how long the current itemInUse has been
 	 * in use
diff --git a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java b/src/game/java/net/minecraft/entity/player/EntityPlayerMP.java
similarity index 96%
rename from src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
rename to src/game/java/net/minecraft/entity/player/EntityPlayerMP.java
index 6462174..2bb2b37 100755
--- a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
+++ b/src/game/java/net/minecraft/entity/player/EntityPlayerMP.java
@@ -94,6 +94,8 @@ import net.minecraft.world.WorldServer;
 import net.minecraft.world.WorldSettings;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.Chunk;
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -159,7 +161,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting {
 	private int respawnInvulnerabilityTicks = 60;
 	private EntityPlayer.EnumChatVisibility chatVisibility;
 	private boolean chatColours = true;
-	private long playerLastActiveTime = System.currentTimeMillis();
+	private long playerLastActiveTime = EagRuntime.steadyTimeMillis();
 	/**+
 	 * The entity the player is currently spectating through.
 	 */
@@ -169,6 +171,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting {
 	public int ping;
 	public boolean playerConqueredTheEnd;
 	public byte[] updateCertificate = null;
+	public EaglercraftUUID clientBrandUUID = null;
 
 	public EntityPlayerMP(MinecraftServer server, WorldServer worldIn, GameProfile profile,
 			ItemInWorldManager interactionManager) {
diff --git a/src/main/java/net/minecraft/entity/player/EnumPlayerModelParts.java b/src/game/java/net/minecraft/entity/player/EnumPlayerModelParts.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/player/EnumPlayerModelParts.java
rename to src/game/java/net/minecraft/entity/player/EnumPlayerModelParts.java
diff --git a/src/main/java/net/minecraft/entity/player/InventoryPlayer.java b/src/game/java/net/minecraft/entity/player/InventoryPlayer.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/player/InventoryPlayer.java
rename to src/game/java/net/minecraft/entity/player/InventoryPlayer.java
diff --git a/src/main/java/net/minecraft/entity/player/PlayerCapabilities.java b/src/game/java/net/minecraft/entity/player/PlayerCapabilities.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/player/PlayerCapabilities.java
rename to src/game/java/net/minecraft/entity/player/PlayerCapabilities.java
diff --git a/src/main/java/net/minecraft/entity/projectile/EntityArrow.java b/src/game/java/net/minecraft/entity/projectile/EntityArrow.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/projectile/EntityArrow.java
rename to src/game/java/net/minecraft/entity/projectile/EntityArrow.java
diff --git a/src/main/java/net/minecraft/entity/projectile/EntityEgg.java b/src/game/java/net/minecraft/entity/projectile/EntityEgg.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/projectile/EntityEgg.java
rename to src/game/java/net/minecraft/entity/projectile/EntityEgg.java
diff --git a/src/main/java/net/minecraft/entity/projectile/EntityFireball.java b/src/game/java/net/minecraft/entity/projectile/EntityFireball.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/projectile/EntityFireball.java
rename to src/game/java/net/minecraft/entity/projectile/EntityFireball.java
diff --git a/src/main/java/net/minecraft/entity/projectile/EntityFishHook.java b/src/game/java/net/minecraft/entity/projectile/EntityFishHook.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/projectile/EntityFishHook.java
rename to src/game/java/net/minecraft/entity/projectile/EntityFishHook.java
diff --git a/src/main/java/net/minecraft/entity/projectile/EntityLargeFireball.java b/src/game/java/net/minecraft/entity/projectile/EntityLargeFireball.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/projectile/EntityLargeFireball.java
rename to src/game/java/net/minecraft/entity/projectile/EntityLargeFireball.java
diff --git a/src/main/java/net/minecraft/entity/projectile/EntityPotion.java b/src/game/java/net/minecraft/entity/projectile/EntityPotion.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/projectile/EntityPotion.java
rename to src/game/java/net/minecraft/entity/projectile/EntityPotion.java
diff --git a/src/main/java/net/minecraft/entity/projectile/EntitySmallFireball.java b/src/game/java/net/minecraft/entity/projectile/EntitySmallFireball.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/projectile/EntitySmallFireball.java
rename to src/game/java/net/minecraft/entity/projectile/EntitySmallFireball.java
diff --git a/src/main/java/net/minecraft/entity/projectile/EntitySnowball.java b/src/game/java/net/minecraft/entity/projectile/EntitySnowball.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/projectile/EntitySnowball.java
rename to src/game/java/net/minecraft/entity/projectile/EntitySnowball.java
diff --git a/src/main/java/net/minecraft/entity/projectile/EntityThrowable.java b/src/game/java/net/minecraft/entity/projectile/EntityThrowable.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/projectile/EntityThrowable.java
rename to src/game/java/net/minecraft/entity/projectile/EntityThrowable.java
diff --git a/src/main/java/net/minecraft/entity/projectile/EntityWitherSkull.java b/src/game/java/net/minecraft/entity/projectile/EntityWitherSkull.java
similarity index 100%
rename from src/main/java/net/minecraft/entity/projectile/EntityWitherSkull.java
rename to src/game/java/net/minecraft/entity/projectile/EntityWitherSkull.java
diff --git a/src/main/java/net/minecraft/event/ClickEvent.java b/src/game/java/net/minecraft/event/ClickEvent.java
similarity index 100%
rename from src/main/java/net/minecraft/event/ClickEvent.java
rename to src/game/java/net/minecraft/event/ClickEvent.java
diff --git a/src/main/java/net/minecraft/event/HoverEvent.java b/src/game/java/net/minecraft/event/HoverEvent.java
similarity index 100%
rename from src/main/java/net/minecraft/event/HoverEvent.java
rename to src/game/java/net/minecraft/event/HoverEvent.java
diff --git a/src/main/java/net/minecraft/init/Blocks.java b/src/game/java/net/minecraft/init/Blocks.java
similarity index 100%
rename from src/main/java/net/minecraft/init/Blocks.java
rename to src/game/java/net/minecraft/init/Blocks.java
diff --git a/src/main/java/net/minecraft/init/Bootstrap.java b/src/game/java/net/minecraft/init/Bootstrap.java
similarity index 100%
rename from src/main/java/net/minecraft/init/Bootstrap.java
rename to src/game/java/net/minecraft/init/Bootstrap.java
diff --git a/src/main/java/net/minecraft/init/Items.java b/src/game/java/net/minecraft/init/Items.java
similarity index 100%
rename from src/main/java/net/minecraft/init/Items.java
rename to src/game/java/net/minecraft/init/Items.java
diff --git a/src/main/java/net/minecraft/inventory/AnimalChest.java b/src/game/java/net/minecraft/inventory/AnimalChest.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/AnimalChest.java
rename to src/game/java/net/minecraft/inventory/AnimalChest.java
diff --git a/src/main/java/net/minecraft/inventory/Container.java b/src/game/java/net/minecraft/inventory/Container.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/Container.java
rename to src/game/java/net/minecraft/inventory/Container.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerBeacon.java b/src/game/java/net/minecraft/inventory/ContainerBeacon.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerBeacon.java
rename to src/game/java/net/minecraft/inventory/ContainerBeacon.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerBrewingStand.java b/src/game/java/net/minecraft/inventory/ContainerBrewingStand.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerBrewingStand.java
rename to src/game/java/net/minecraft/inventory/ContainerBrewingStand.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerChest.java b/src/game/java/net/minecraft/inventory/ContainerChest.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerChest.java
rename to src/game/java/net/minecraft/inventory/ContainerChest.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerDispenser.java b/src/game/java/net/minecraft/inventory/ContainerDispenser.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerDispenser.java
rename to src/game/java/net/minecraft/inventory/ContainerDispenser.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerEnchantment.java b/src/game/java/net/minecraft/inventory/ContainerEnchantment.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerEnchantment.java
rename to src/game/java/net/minecraft/inventory/ContainerEnchantment.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerFurnace.java b/src/game/java/net/minecraft/inventory/ContainerFurnace.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerFurnace.java
rename to src/game/java/net/minecraft/inventory/ContainerFurnace.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerHopper.java b/src/game/java/net/minecraft/inventory/ContainerHopper.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerHopper.java
rename to src/game/java/net/minecraft/inventory/ContainerHopper.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerHorseInventory.java b/src/game/java/net/minecraft/inventory/ContainerHorseInventory.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerHorseInventory.java
rename to src/game/java/net/minecraft/inventory/ContainerHorseInventory.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerMerchant.java b/src/game/java/net/minecraft/inventory/ContainerMerchant.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerMerchant.java
rename to src/game/java/net/minecraft/inventory/ContainerMerchant.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerPlayer.java b/src/game/java/net/minecraft/inventory/ContainerPlayer.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerPlayer.java
rename to src/game/java/net/minecraft/inventory/ContainerPlayer.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerRepair.java b/src/game/java/net/minecraft/inventory/ContainerRepair.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerRepair.java
rename to src/game/java/net/minecraft/inventory/ContainerRepair.java
diff --git a/src/main/java/net/minecraft/inventory/ContainerWorkbench.java b/src/game/java/net/minecraft/inventory/ContainerWorkbench.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ContainerWorkbench.java
rename to src/game/java/net/minecraft/inventory/ContainerWorkbench.java
diff --git a/src/main/java/net/minecraft/inventory/ICrafting.java b/src/game/java/net/minecraft/inventory/ICrafting.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ICrafting.java
rename to src/game/java/net/minecraft/inventory/ICrafting.java
diff --git a/src/main/java/net/minecraft/inventory/IInvBasic.java b/src/game/java/net/minecraft/inventory/IInvBasic.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/IInvBasic.java
rename to src/game/java/net/minecraft/inventory/IInvBasic.java
diff --git a/src/main/java/net/minecraft/inventory/IInventory.java b/src/game/java/net/minecraft/inventory/IInventory.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/IInventory.java
rename to src/game/java/net/minecraft/inventory/IInventory.java
diff --git a/src/main/java/net/minecraft/inventory/ISidedInventory.java b/src/game/java/net/minecraft/inventory/ISidedInventory.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/ISidedInventory.java
rename to src/game/java/net/minecraft/inventory/ISidedInventory.java
diff --git a/src/main/java/net/minecraft/inventory/InventoryBasic.java b/src/game/java/net/minecraft/inventory/InventoryBasic.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/InventoryBasic.java
rename to src/game/java/net/minecraft/inventory/InventoryBasic.java
diff --git a/src/main/java/net/minecraft/inventory/InventoryCraftResult.java b/src/game/java/net/minecraft/inventory/InventoryCraftResult.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/InventoryCraftResult.java
rename to src/game/java/net/minecraft/inventory/InventoryCraftResult.java
diff --git a/src/main/java/net/minecraft/inventory/InventoryCrafting.java b/src/game/java/net/minecraft/inventory/InventoryCrafting.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/InventoryCrafting.java
rename to src/game/java/net/minecraft/inventory/InventoryCrafting.java
diff --git a/src/main/java/net/minecraft/inventory/InventoryEnderChest.java b/src/game/java/net/minecraft/inventory/InventoryEnderChest.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/InventoryEnderChest.java
rename to src/game/java/net/minecraft/inventory/InventoryEnderChest.java
diff --git a/src/main/java/net/minecraft/inventory/InventoryHelper.java b/src/game/java/net/minecraft/inventory/InventoryHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/InventoryHelper.java
rename to src/game/java/net/minecraft/inventory/InventoryHelper.java
diff --git a/src/main/java/net/minecraft/inventory/InventoryLargeChest.java b/src/game/java/net/minecraft/inventory/InventoryLargeChest.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/InventoryLargeChest.java
rename to src/game/java/net/minecraft/inventory/InventoryLargeChest.java
diff --git a/src/main/java/net/minecraft/inventory/InventoryMerchant.java b/src/game/java/net/minecraft/inventory/InventoryMerchant.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/InventoryMerchant.java
rename to src/game/java/net/minecraft/inventory/InventoryMerchant.java
diff --git a/src/main/java/net/minecraft/inventory/Slot.java b/src/game/java/net/minecraft/inventory/Slot.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/Slot.java
rename to src/game/java/net/minecraft/inventory/Slot.java
diff --git a/src/main/java/net/minecraft/inventory/SlotCrafting.java b/src/game/java/net/minecraft/inventory/SlotCrafting.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/SlotCrafting.java
rename to src/game/java/net/minecraft/inventory/SlotCrafting.java
diff --git a/src/main/java/net/minecraft/inventory/SlotFurnaceFuel.java b/src/game/java/net/minecraft/inventory/SlotFurnaceFuel.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/SlotFurnaceFuel.java
rename to src/game/java/net/minecraft/inventory/SlotFurnaceFuel.java
diff --git a/src/main/java/net/minecraft/inventory/SlotFurnaceOutput.java b/src/game/java/net/minecraft/inventory/SlotFurnaceOutput.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/SlotFurnaceOutput.java
rename to src/game/java/net/minecraft/inventory/SlotFurnaceOutput.java
diff --git a/src/main/java/net/minecraft/inventory/SlotMerchantResult.java b/src/game/java/net/minecraft/inventory/SlotMerchantResult.java
similarity index 100%
rename from src/main/java/net/minecraft/inventory/SlotMerchantResult.java
rename to src/game/java/net/minecraft/inventory/SlotMerchantResult.java
diff --git a/src/main/java/net/minecraft/item/EnumAction.java b/src/game/java/net/minecraft/item/EnumAction.java
similarity index 100%
rename from src/main/java/net/minecraft/item/EnumAction.java
rename to src/game/java/net/minecraft/item/EnumAction.java
diff --git a/src/main/java/net/minecraft/item/EnumDyeColor.java b/src/game/java/net/minecraft/item/EnumDyeColor.java
similarity index 100%
rename from src/main/java/net/minecraft/item/EnumDyeColor.java
rename to src/game/java/net/minecraft/item/EnumDyeColor.java
diff --git a/src/main/java/net/minecraft/item/EnumRarity.java b/src/game/java/net/minecraft/item/EnumRarity.java
similarity index 100%
rename from src/main/java/net/minecraft/item/EnumRarity.java
rename to src/game/java/net/minecraft/item/EnumRarity.java
diff --git a/src/main/java/net/minecraft/item/Item.java b/src/game/java/net/minecraft/item/Item.java
similarity index 97%
rename from src/main/java/net/minecraft/item/Item.java
rename to src/game/java/net/minecraft/item/Item.java
index 16043c6..15f7316 100755
--- a/src/main/java/net/minecraft/item/Item.java
+++ b/src/game/java/net/minecraft/item/Item.java
@@ -1114,7 +1114,15 @@ public class Item {
 		}
 	}
 
-	public float getHeldItemBrightnessEagler() {
+	public float getHeldItemBrightnessEagler(ItemStack itemStack) {
 		return 0.0f;
 	}
+
+	public boolean shouldUseOnTouchEagler(ItemStack itemStack) {
+		/**+
+		 * returns the action that specifies what animation to play when
+		 * the items is being used
+		 */
+		return getItemUseAction(itemStack) != EnumAction.NONE;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/item/ItemAnvilBlock.java b/src/game/java/net/minecraft/item/ItemAnvilBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemAnvilBlock.java
rename to src/game/java/net/minecraft/item/ItemAnvilBlock.java
diff --git a/src/main/java/net/minecraft/item/ItemAppleGold.java b/src/game/java/net/minecraft/item/ItemAppleGold.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemAppleGold.java
rename to src/game/java/net/minecraft/item/ItemAppleGold.java
diff --git a/src/main/java/net/minecraft/item/ItemArmor.java b/src/game/java/net/minecraft/item/ItemArmor.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemArmor.java
rename to src/game/java/net/minecraft/item/ItemArmor.java
diff --git a/src/main/java/net/minecraft/item/ItemArmorStand.java b/src/game/java/net/minecraft/item/ItemArmorStand.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemArmorStand.java
rename to src/game/java/net/minecraft/item/ItemArmorStand.java
diff --git a/src/main/java/net/minecraft/item/ItemAxe.java b/src/game/java/net/minecraft/item/ItemAxe.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemAxe.java
rename to src/game/java/net/minecraft/item/ItemAxe.java
diff --git a/src/main/java/net/minecraft/item/ItemBanner.java b/src/game/java/net/minecraft/item/ItemBanner.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemBanner.java
rename to src/game/java/net/minecraft/item/ItemBanner.java
diff --git a/src/main/java/net/minecraft/item/ItemBed.java b/src/game/java/net/minecraft/item/ItemBed.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemBed.java
rename to src/game/java/net/minecraft/item/ItemBed.java
diff --git a/src/main/java/net/minecraft/item/ItemBlock.java b/src/game/java/net/minecraft/item/ItemBlock.java
similarity index 96%
rename from src/main/java/net/minecraft/item/ItemBlock.java
rename to src/game/java/net/minecraft/item/ItemBlock.java
index 1e90ea7..c6411ee 100755
--- a/src/main/java/net/minecraft/item/ItemBlock.java
+++ b/src/game/java/net/minecraft/item/ItemBlock.java
@@ -168,7 +168,7 @@ public class ItemBlock extends Item {
 		return this.block;
 	}
 
-	public float getHeldItemBrightnessEagler() {
+	public float getHeldItemBrightnessEagler(ItemStack itemStack) {
 		return this.block.getLightValue() * 0.06667f;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/item/ItemBoat.java b/src/game/java/net/minecraft/item/ItemBoat.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemBoat.java
rename to src/game/java/net/minecraft/item/ItemBoat.java
diff --git a/src/main/java/net/minecraft/item/ItemBook.java b/src/game/java/net/minecraft/item/ItemBook.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemBook.java
rename to src/game/java/net/minecraft/item/ItemBook.java
diff --git a/src/main/java/net/minecraft/item/ItemBow.java b/src/game/java/net/minecraft/item/ItemBow.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemBow.java
rename to src/game/java/net/minecraft/item/ItemBow.java
diff --git a/src/main/java/net/minecraft/item/ItemBucket.java b/src/game/java/net/minecraft/item/ItemBucket.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemBucket.java
rename to src/game/java/net/minecraft/item/ItemBucket.java
diff --git a/src/main/java/net/minecraft/item/ItemBucketMilk.java b/src/game/java/net/minecraft/item/ItemBucketMilk.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemBucketMilk.java
rename to src/game/java/net/minecraft/item/ItemBucketMilk.java
diff --git a/src/main/java/net/minecraft/item/ItemCarrotOnAStick.java b/src/game/java/net/minecraft/item/ItemCarrotOnAStick.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemCarrotOnAStick.java
rename to src/game/java/net/minecraft/item/ItemCarrotOnAStick.java
diff --git a/src/main/java/net/minecraft/item/ItemCloth.java b/src/game/java/net/minecraft/item/ItemCloth.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemCloth.java
rename to src/game/java/net/minecraft/item/ItemCloth.java
diff --git a/src/main/java/net/minecraft/item/ItemCoal.java b/src/game/java/net/minecraft/item/ItemCoal.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemCoal.java
rename to src/game/java/net/minecraft/item/ItemCoal.java
diff --git a/src/main/java/net/minecraft/item/ItemColored.java b/src/game/java/net/minecraft/item/ItemColored.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemColored.java
rename to src/game/java/net/minecraft/item/ItemColored.java
diff --git a/src/main/java/net/minecraft/item/ItemDoor.java b/src/game/java/net/minecraft/item/ItemDoor.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemDoor.java
rename to src/game/java/net/minecraft/item/ItemDoor.java
diff --git a/src/main/java/net/minecraft/item/ItemDoublePlant.java b/src/game/java/net/minecraft/item/ItemDoublePlant.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemDoublePlant.java
rename to src/game/java/net/minecraft/item/ItemDoublePlant.java
diff --git a/src/main/java/net/minecraft/item/ItemDye.java b/src/game/java/net/minecraft/item/ItemDye.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemDye.java
rename to src/game/java/net/minecraft/item/ItemDye.java
diff --git a/src/main/java/net/minecraft/item/ItemEditableBook.java b/src/game/java/net/minecraft/item/ItemEditableBook.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemEditableBook.java
rename to src/game/java/net/minecraft/item/ItemEditableBook.java
diff --git a/src/main/java/net/minecraft/item/ItemEgg.java b/src/game/java/net/minecraft/item/ItemEgg.java
similarity index 94%
rename from src/main/java/net/minecraft/item/ItemEgg.java
rename to src/game/java/net/minecraft/item/ItemEgg.java
index 434f10c..c4644a7 100755
--- a/src/main/java/net/minecraft/item/ItemEgg.java
+++ b/src/game/java/net/minecraft/item/ItemEgg.java
@@ -49,4 +49,8 @@ public class ItemEgg extends Item {
 		entityplayer.triggerAchievement(StatList.objectUseStats[Item.getIdFromItem(this)]);
 		return itemstack;
 	}
+
+	public boolean shouldUseOnTouchEagler(ItemStack itemStack) {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/item/ItemEmptyMap.java b/src/game/java/net/minecraft/item/ItemEmptyMap.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemEmptyMap.java
rename to src/game/java/net/minecraft/item/ItemEmptyMap.java
diff --git a/src/main/java/net/minecraft/item/ItemEnchantedBook.java b/src/game/java/net/minecraft/item/ItemEnchantedBook.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemEnchantedBook.java
rename to src/game/java/net/minecraft/item/ItemEnchantedBook.java
diff --git a/src/main/java/net/minecraft/item/ItemEnderEye.java b/src/game/java/net/minecraft/item/ItemEnderEye.java
similarity index 96%
rename from src/main/java/net/minecraft/item/ItemEnderEye.java
rename to src/game/java/net/minecraft/item/ItemEnderEye.java
index 37e1522..caf2d75 100755
--- a/src/main/java/net/minecraft/item/ItemEnderEye.java
+++ b/src/game/java/net/minecraft/item/ItemEnderEye.java
@@ -167,4 +167,8 @@ public class ItemEnderEye extends Item {
 			return itemstack;
 		}
 	}
+
+	public boolean shouldUseOnTouchEagler(ItemStack itemStack) {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/item/ItemEnderPearl.java b/src/game/java/net/minecraft/item/ItemEnderPearl.java
similarity index 94%
rename from src/main/java/net/minecraft/item/ItemEnderPearl.java
rename to src/game/java/net/minecraft/item/ItemEnderPearl.java
index f820c62..db9b268 100755
--- a/src/main/java/net/minecraft/item/ItemEnderPearl.java
+++ b/src/game/java/net/minecraft/item/ItemEnderPearl.java
@@ -54,4 +54,8 @@ public class ItemEnderPearl extends Item {
 			return itemstack;
 		}
 	}
+
+	public boolean shouldUseOnTouchEagler(ItemStack itemStack) {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/item/ItemExpBottle.java b/src/game/java/net/minecraft/item/ItemExpBottle.java
similarity index 94%
rename from src/main/java/net/minecraft/item/ItemExpBottle.java
rename to src/game/java/net/minecraft/item/ItemExpBottle.java
index 6b440c9..1c03ac2 100755
--- a/src/main/java/net/minecraft/item/ItemExpBottle.java
+++ b/src/game/java/net/minecraft/item/ItemExpBottle.java
@@ -52,4 +52,8 @@ public class ItemExpBottle extends Item {
 		entityplayer.triggerAchievement(StatList.objectUseStats[Item.getIdFromItem(this)]);
 		return itemstack;
 	}
+
+	public boolean shouldUseOnTouchEagler(ItemStack itemStack) {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/item/ItemFireball.java b/src/game/java/net/minecraft/item/ItemFireball.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemFireball.java
rename to src/game/java/net/minecraft/item/ItemFireball.java
diff --git a/src/main/java/net/minecraft/item/ItemFirework.java b/src/game/java/net/minecraft/item/ItemFirework.java
similarity index 95%
rename from src/main/java/net/minecraft/item/ItemFirework.java
rename to src/game/java/net/minecraft/item/ItemFirework.java
index 8179764..bf68ec4 100755
--- a/src/main/java/net/minecraft/item/ItemFirework.java
+++ b/src/game/java/net/minecraft/item/ItemFirework.java
@@ -86,4 +86,8 @@ public class ItemFirework extends Item {
 			}
 		}
 	}
+
+	public boolean shouldUseOnTouchEagler(ItemStack itemStack) {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/item/ItemFireworkCharge.java b/src/game/java/net/minecraft/item/ItemFireworkCharge.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemFireworkCharge.java
rename to src/game/java/net/minecraft/item/ItemFireworkCharge.java
diff --git a/src/main/java/net/minecraft/item/ItemFishFood.java b/src/game/java/net/minecraft/item/ItemFishFood.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemFishFood.java
rename to src/game/java/net/minecraft/item/ItemFishFood.java
diff --git a/src/main/java/net/minecraft/item/ItemFishingRod.java b/src/game/java/net/minecraft/item/ItemFishingRod.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemFishingRod.java
rename to src/game/java/net/minecraft/item/ItemFishingRod.java
diff --git a/src/main/java/net/minecraft/item/ItemFlintAndSteel.java b/src/game/java/net/minecraft/item/ItemFlintAndSteel.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemFlintAndSteel.java
rename to src/game/java/net/minecraft/item/ItemFlintAndSteel.java
diff --git a/src/main/java/net/minecraft/item/ItemFood.java b/src/game/java/net/minecraft/item/ItemFood.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemFood.java
rename to src/game/java/net/minecraft/item/ItemFood.java
diff --git a/src/main/java/net/minecraft/item/ItemGlassBottle.java b/src/game/java/net/minecraft/item/ItemGlassBottle.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemGlassBottle.java
rename to src/game/java/net/minecraft/item/ItemGlassBottle.java
diff --git a/src/main/java/net/minecraft/item/ItemHangingEntity.java b/src/game/java/net/minecraft/item/ItemHangingEntity.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemHangingEntity.java
rename to src/game/java/net/minecraft/item/ItemHangingEntity.java
diff --git a/src/main/java/net/minecraft/item/ItemHoe.java b/src/game/java/net/minecraft/item/ItemHoe.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemHoe.java
rename to src/game/java/net/minecraft/item/ItemHoe.java
diff --git a/src/main/java/net/minecraft/item/ItemLead.java b/src/game/java/net/minecraft/item/ItemLead.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemLead.java
rename to src/game/java/net/minecraft/item/ItemLead.java
diff --git a/src/main/java/net/minecraft/item/ItemLeaves.java b/src/game/java/net/minecraft/item/ItemLeaves.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemLeaves.java
rename to src/game/java/net/minecraft/item/ItemLeaves.java
diff --git a/src/main/java/net/minecraft/item/ItemLilyPad.java b/src/game/java/net/minecraft/item/ItemLilyPad.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemLilyPad.java
rename to src/game/java/net/minecraft/item/ItemLilyPad.java
diff --git a/src/main/java/net/minecraft/item/ItemMap.java b/src/game/java/net/minecraft/item/ItemMap.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemMap.java
rename to src/game/java/net/minecraft/item/ItemMap.java
diff --git a/src/main/java/net/minecraft/item/ItemMapBase.java b/src/game/java/net/minecraft/item/ItemMapBase.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemMapBase.java
rename to src/game/java/net/minecraft/item/ItemMapBase.java
diff --git a/src/main/java/net/minecraft/item/ItemMinecart.java b/src/game/java/net/minecraft/item/ItemMinecart.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemMinecart.java
rename to src/game/java/net/minecraft/item/ItemMinecart.java
diff --git a/src/main/java/net/minecraft/item/ItemMonsterPlacer.java b/src/game/java/net/minecraft/item/ItemMonsterPlacer.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemMonsterPlacer.java
rename to src/game/java/net/minecraft/item/ItemMonsterPlacer.java
diff --git a/src/main/java/net/minecraft/item/ItemMultiTexture.java b/src/game/java/net/minecraft/item/ItemMultiTexture.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemMultiTexture.java
rename to src/game/java/net/minecraft/item/ItemMultiTexture.java
diff --git a/src/main/java/net/minecraft/item/ItemNameTag.java b/src/game/java/net/minecraft/item/ItemNameTag.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemNameTag.java
rename to src/game/java/net/minecraft/item/ItemNameTag.java
diff --git a/src/main/java/net/minecraft/item/ItemPickaxe.java b/src/game/java/net/minecraft/item/ItemPickaxe.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemPickaxe.java
rename to src/game/java/net/minecraft/item/ItemPickaxe.java
diff --git a/src/main/java/net/minecraft/item/ItemPiston.java b/src/game/java/net/minecraft/item/ItemPiston.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemPiston.java
rename to src/game/java/net/minecraft/item/ItemPiston.java
diff --git a/src/main/java/net/minecraft/item/ItemPotion.java b/src/game/java/net/minecraft/item/ItemPotion.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemPotion.java
rename to src/game/java/net/minecraft/item/ItemPotion.java
diff --git a/src/main/java/net/minecraft/item/ItemRecord.java b/src/game/java/net/minecraft/item/ItemRecord.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemRecord.java
rename to src/game/java/net/minecraft/item/ItemRecord.java
diff --git a/src/main/java/net/minecraft/item/ItemRedstone.java b/src/game/java/net/minecraft/item/ItemRedstone.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemRedstone.java
rename to src/game/java/net/minecraft/item/ItemRedstone.java
diff --git a/src/main/java/net/minecraft/item/ItemReed.java b/src/game/java/net/minecraft/item/ItemReed.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemReed.java
rename to src/game/java/net/minecraft/item/ItemReed.java
diff --git a/src/main/java/net/minecraft/item/ItemSaddle.java b/src/game/java/net/minecraft/item/ItemSaddle.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSaddle.java
rename to src/game/java/net/minecraft/item/ItemSaddle.java
diff --git a/src/main/java/net/minecraft/item/ItemSeedFood.java b/src/game/java/net/minecraft/item/ItemSeedFood.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSeedFood.java
rename to src/game/java/net/minecraft/item/ItemSeedFood.java
diff --git a/src/main/java/net/minecraft/item/ItemSeeds.java b/src/game/java/net/minecraft/item/ItemSeeds.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSeeds.java
rename to src/game/java/net/minecraft/item/ItemSeeds.java
diff --git a/src/main/java/net/minecraft/item/ItemShears.java b/src/game/java/net/minecraft/item/ItemShears.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemShears.java
rename to src/game/java/net/minecraft/item/ItemShears.java
diff --git a/src/main/java/net/minecraft/item/ItemSign.java b/src/game/java/net/minecraft/item/ItemSign.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSign.java
rename to src/game/java/net/minecraft/item/ItemSign.java
diff --git a/src/main/java/net/minecraft/item/ItemSimpleFoiled.java b/src/game/java/net/minecraft/item/ItemSimpleFoiled.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSimpleFoiled.java
rename to src/game/java/net/minecraft/item/ItemSimpleFoiled.java
diff --git a/src/main/java/net/minecraft/item/ItemSkull.java b/src/game/java/net/minecraft/item/ItemSkull.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSkull.java
rename to src/game/java/net/minecraft/item/ItemSkull.java
diff --git a/src/main/java/net/minecraft/item/ItemSlab.java b/src/game/java/net/minecraft/item/ItemSlab.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSlab.java
rename to src/game/java/net/minecraft/item/ItemSlab.java
diff --git a/src/main/java/net/minecraft/item/ItemSnow.java b/src/game/java/net/minecraft/item/ItemSnow.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSnow.java
rename to src/game/java/net/minecraft/item/ItemSnow.java
diff --git a/src/main/java/net/minecraft/item/ItemSnowball.java b/src/game/java/net/minecraft/item/ItemSnowball.java
similarity index 94%
rename from src/main/java/net/minecraft/item/ItemSnowball.java
rename to src/game/java/net/minecraft/item/ItemSnowball.java
index 434db7f..ff344c6 100755
--- a/src/main/java/net/minecraft/item/ItemSnowball.java
+++ b/src/game/java/net/minecraft/item/ItemSnowball.java
@@ -49,4 +49,8 @@ public class ItemSnowball extends Item {
 		entityplayer.triggerAchievement(StatList.objectUseStats[Item.getIdFromItem(this)]);
 		return itemstack;
 	}
+
+	public boolean shouldUseOnTouchEagler(ItemStack itemStack) {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/item/ItemSoup.java b/src/game/java/net/minecraft/item/ItemSoup.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSoup.java
rename to src/game/java/net/minecraft/item/ItemSoup.java
diff --git a/src/main/java/net/minecraft/item/ItemSpade.java b/src/game/java/net/minecraft/item/ItemSpade.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSpade.java
rename to src/game/java/net/minecraft/item/ItemSpade.java
diff --git a/src/main/java/net/minecraft/item/ItemStack.java b/src/game/java/net/minecraft/item/ItemStack.java
similarity index 92%
rename from src/main/java/net/minecraft/item/ItemStack.java
rename to src/game/java/net/minecraft/item/ItemStack.java
index 6d30a65..d88d161 100755
--- a/src/main/java/net/minecraft/item/ItemStack.java
+++ b/src/game/java/net/minecraft/item/ItemStack.java
@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Map.Entry;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.HString;
+import net.lax1dude.eaglercraft.v1_8.profanity_filter.ProfanityFilter;
+
 import java.util.Set;
 
 import com.google.common.collect.HashMultimap;
@@ -13,6 +15,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentDurability;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -64,6 +67,8 @@ public final class ItemStack {
 	public int animationsToGo;
 	private Item item;
 	private NBTTagCompound stackTagCompound;
+	private String profanityFilteredName;
+	private String profanityFilteredNameFiltered;
 	private int itemDamage;
 	private EntityItemFrame itemFrame;
 	private Block canDestroyCacheBlock;
@@ -542,6 +547,27 @@ public final class ItemStack {
 		return s;
 	}
 
+	public String getDisplayNameProfanityFilter() {
+		String s = this.getItem().getItemStackDisplayName(this);
+		if (this.stackTagCompound != null && this.stackTagCompound.hasKey("display", 10)) {
+			NBTTagCompound nbttagcompound = this.stackTagCompound.getCompoundTag("display");
+			if (nbttagcompound.hasKey("Name", 8)) {
+				s = nbttagcompound.getString("Name");
+				if (Minecraft.getMinecraft().isEnableProfanityFilter()) {
+					if (!s.equals(profanityFilteredName)) {
+						profanityFilteredName = s;
+						profanityFilteredNameFiltered = ProfanityFilter.getInstance().profanityFilterString(s);
+					}
+					if (profanityFilteredNameFiltered != null) {
+						s = profanityFilteredNameFiltered;
+					}
+				}
+			}
+		}
+
+		return s;
+	}
+
 	public ItemStack setStackDisplayName(String displayName) {
 		if (this.stackTagCompound == null) {
 			this.stackTagCompound = new NBTTagCompound();
@@ -588,8 +614,16 @@ public final class ItemStack {
 	 * item
 	 */
 	public List<String> getTooltip(EntityPlayer playerIn, boolean advanced) {
+		return getTooltipImpl(playerIn, advanced, false);
+	}
+
+	public List<String> getTooltipProfanityFilter(EntityPlayer playerIn, boolean advanced) {
+		return getTooltipImpl(playerIn, advanced, true);
+	}
+
+	public List<String> getTooltipImpl(EntityPlayer playerIn, boolean advanced, boolean profanityFilter) {
 		ArrayList arraylist = Lists.newArrayList();
-		String s = this.getDisplayName();
+		String s = profanityFilter ? this.getDisplayNameProfanityFilter() : this.getDisplayName();
 		if (this.hasDisplayName()) {
 			s = EnumChatFormatting.ITALIC + s;
 		}
diff --git a/src/main/java/net/minecraft/item/ItemSword.java b/src/game/java/net/minecraft/item/ItemSword.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemSword.java
rename to src/game/java/net/minecraft/item/ItemSword.java
diff --git a/src/main/java/net/minecraft/item/ItemTool.java b/src/game/java/net/minecraft/item/ItemTool.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemTool.java
rename to src/game/java/net/minecraft/item/ItemTool.java
diff --git a/src/main/java/net/minecraft/item/ItemWritableBook.java b/src/game/java/net/minecraft/item/ItemWritableBook.java
similarity index 100%
rename from src/main/java/net/minecraft/item/ItemWritableBook.java
rename to src/game/java/net/minecraft/item/ItemWritableBook.java
diff --git a/src/main/java/net/minecraft/item/crafting/CraftingManager.java b/src/game/java/net/minecraft/item/crafting/CraftingManager.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/CraftingManager.java
rename to src/game/java/net/minecraft/item/crafting/CraftingManager.java
diff --git a/src/main/java/net/minecraft/item/crafting/FurnaceRecipes.java b/src/game/java/net/minecraft/item/crafting/FurnaceRecipes.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/FurnaceRecipes.java
rename to src/game/java/net/minecraft/item/crafting/FurnaceRecipes.java
diff --git a/src/main/java/net/minecraft/item/crafting/IRecipe.java b/src/game/java/net/minecraft/item/crafting/IRecipe.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/IRecipe.java
rename to src/game/java/net/minecraft/item/crafting/IRecipe.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipeBookCloning.java b/src/game/java/net/minecraft/item/crafting/RecipeBookCloning.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipeBookCloning.java
rename to src/game/java/net/minecraft/item/crafting/RecipeBookCloning.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipeFireworks.java b/src/game/java/net/minecraft/item/crafting/RecipeFireworks.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipeFireworks.java
rename to src/game/java/net/minecraft/item/crafting/RecipeFireworks.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipeRepairItem.java b/src/game/java/net/minecraft/item/crafting/RecipeRepairItem.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipeRepairItem.java
rename to src/game/java/net/minecraft/item/crafting/RecipeRepairItem.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesArmor.java b/src/game/java/net/minecraft/item/crafting/RecipesArmor.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesArmor.java
rename to src/game/java/net/minecraft/item/crafting/RecipesArmor.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesArmorDyes.java b/src/game/java/net/minecraft/item/crafting/RecipesArmorDyes.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesArmorDyes.java
rename to src/game/java/net/minecraft/item/crafting/RecipesArmorDyes.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesBanners.java b/src/game/java/net/minecraft/item/crafting/RecipesBanners.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesBanners.java
rename to src/game/java/net/minecraft/item/crafting/RecipesBanners.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesCrafting.java b/src/game/java/net/minecraft/item/crafting/RecipesCrafting.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesCrafting.java
rename to src/game/java/net/minecraft/item/crafting/RecipesCrafting.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesDyes.java b/src/game/java/net/minecraft/item/crafting/RecipesDyes.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesDyes.java
rename to src/game/java/net/minecraft/item/crafting/RecipesDyes.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesFood.java b/src/game/java/net/minecraft/item/crafting/RecipesFood.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesFood.java
rename to src/game/java/net/minecraft/item/crafting/RecipesFood.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesIngots.java b/src/game/java/net/minecraft/item/crafting/RecipesIngots.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesIngots.java
rename to src/game/java/net/minecraft/item/crafting/RecipesIngots.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesMapCloning.java b/src/game/java/net/minecraft/item/crafting/RecipesMapCloning.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesMapCloning.java
rename to src/game/java/net/minecraft/item/crafting/RecipesMapCloning.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesMapExtending.java b/src/game/java/net/minecraft/item/crafting/RecipesMapExtending.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesMapExtending.java
rename to src/game/java/net/minecraft/item/crafting/RecipesMapExtending.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesTools.java b/src/game/java/net/minecraft/item/crafting/RecipesTools.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesTools.java
rename to src/game/java/net/minecraft/item/crafting/RecipesTools.java
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesWeapons.java b/src/game/java/net/minecraft/item/crafting/RecipesWeapons.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/RecipesWeapons.java
rename to src/game/java/net/minecraft/item/crafting/RecipesWeapons.java
diff --git a/src/main/java/net/minecraft/item/crafting/ShapedRecipes.java b/src/game/java/net/minecraft/item/crafting/ShapedRecipes.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/ShapedRecipes.java
rename to src/game/java/net/minecraft/item/crafting/ShapedRecipes.java
diff --git a/src/main/java/net/minecraft/item/crafting/ShapelessRecipes.java b/src/game/java/net/minecraft/item/crafting/ShapelessRecipes.java
similarity index 100%
rename from src/main/java/net/minecraft/item/crafting/ShapelessRecipes.java
rename to src/game/java/net/minecraft/item/crafting/ShapelessRecipes.java
diff --git a/src/main/java/net/minecraft/nbt/CompressedStreamTools.java b/src/game/java/net/minecraft/nbt/CompressedStreamTools.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/CompressedStreamTools.java
rename to src/game/java/net/minecraft/nbt/CompressedStreamTools.java
diff --git a/src/main/java/net/minecraft/nbt/JsonToNBT.java b/src/game/java/net/minecraft/nbt/JsonToNBT.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/JsonToNBT.java
rename to src/game/java/net/minecraft/nbt/JsonToNBT.java
diff --git a/src/main/java/net/minecraft/nbt/NBTBase.java b/src/game/java/net/minecraft/nbt/NBTBase.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTBase.java
rename to src/game/java/net/minecraft/nbt/NBTBase.java
diff --git a/src/main/java/net/minecraft/nbt/NBTException.java b/src/game/java/net/minecraft/nbt/NBTException.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTException.java
rename to src/game/java/net/minecraft/nbt/NBTException.java
diff --git a/src/main/java/net/minecraft/nbt/NBTSizeTracker.java b/src/game/java/net/minecraft/nbt/NBTSizeTracker.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTSizeTracker.java
rename to src/game/java/net/minecraft/nbt/NBTSizeTracker.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagByte.java b/src/game/java/net/minecraft/nbt/NBTTagByte.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagByte.java
rename to src/game/java/net/minecraft/nbt/NBTTagByte.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagByteArray.java b/src/game/java/net/minecraft/nbt/NBTTagByteArray.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagByteArray.java
rename to src/game/java/net/minecraft/nbt/NBTTagByteArray.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagCompound.java b/src/game/java/net/minecraft/nbt/NBTTagCompound.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagCompound.java
rename to src/game/java/net/minecraft/nbt/NBTTagCompound.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagDouble.java b/src/game/java/net/minecraft/nbt/NBTTagDouble.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagDouble.java
rename to src/game/java/net/minecraft/nbt/NBTTagDouble.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagEnd.java b/src/game/java/net/minecraft/nbt/NBTTagEnd.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagEnd.java
rename to src/game/java/net/minecraft/nbt/NBTTagEnd.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagFloat.java b/src/game/java/net/minecraft/nbt/NBTTagFloat.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagFloat.java
rename to src/game/java/net/minecraft/nbt/NBTTagFloat.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagInt.java b/src/game/java/net/minecraft/nbt/NBTTagInt.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagInt.java
rename to src/game/java/net/minecraft/nbt/NBTTagInt.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagIntArray.java b/src/game/java/net/minecraft/nbt/NBTTagIntArray.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagIntArray.java
rename to src/game/java/net/minecraft/nbt/NBTTagIntArray.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagList.java b/src/game/java/net/minecraft/nbt/NBTTagList.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagList.java
rename to src/game/java/net/minecraft/nbt/NBTTagList.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagLong.java b/src/game/java/net/minecraft/nbt/NBTTagLong.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagLong.java
rename to src/game/java/net/minecraft/nbt/NBTTagLong.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagShort.java b/src/game/java/net/minecraft/nbt/NBTTagShort.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagShort.java
rename to src/game/java/net/minecraft/nbt/NBTTagShort.java
diff --git a/src/main/java/net/minecraft/nbt/NBTTagString.java b/src/game/java/net/minecraft/nbt/NBTTagString.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTTagString.java
rename to src/game/java/net/minecraft/nbt/NBTTagString.java
diff --git a/src/main/java/net/minecraft/nbt/NBTUtil.java b/src/game/java/net/minecraft/nbt/NBTUtil.java
similarity index 100%
rename from src/main/java/net/minecraft/nbt/NBTUtil.java
rename to src/game/java/net/minecraft/nbt/NBTUtil.java
diff --git a/src/main/java/net/minecraft/network/EnumConnectionState.java b/src/game/java/net/minecraft/network/EnumConnectionState.java
similarity index 100%
rename from src/main/java/net/minecraft/network/EnumConnectionState.java
rename to src/game/java/net/minecraft/network/EnumConnectionState.java
diff --git a/src/main/java/net/minecraft/network/EnumPacketDirection.java b/src/game/java/net/minecraft/network/EnumPacketDirection.java
similarity index 100%
rename from src/main/java/net/minecraft/network/EnumPacketDirection.java
rename to src/game/java/net/minecraft/network/EnumPacketDirection.java
diff --git a/src/main/java/net/minecraft/network/INetHandler.java b/src/game/java/net/minecraft/network/INetHandler.java
similarity index 100%
rename from src/main/java/net/minecraft/network/INetHandler.java
rename to src/game/java/net/minecraft/network/INetHandler.java
diff --git a/src/main/java/net/minecraft/network/NetHandlerPlayServer.java b/src/game/java/net/minecraft/network/NetHandlerPlayServer.java
similarity index 94%
rename from src/main/java/net/minecraft/network/NetHandlerPlayServer.java
rename to src/game/java/net/minecraft/network/NetHandlerPlayServer.java
index ff09bea..c1a3a06 100755
--- a/src/main/java/net/minecraft/network/NetHandlerPlayServer.java
+++ b/src/game/java/net/minecraft/network/NetHandlerPlayServer.java
@@ -3,7 +3,11 @@ package net.minecraft.network;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Doubles;
 import com.google.common.primitives.Floats;
-import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageProtocol;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.client.GameProtocolMessageController;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketUpdateCertEAG;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -11,7 +15,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
-import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer;
 import net.minecraft.block.material.Material;
 import net.minecraft.command.server.CommandBlockLogic;
 import net.minecraft.crash.CrashReport;
@@ -70,7 +73,6 @@ import net.minecraft.network.play.server.S23PacketBlockChange;
 import net.minecraft.network.play.server.S2FPacketSetSlot;
 import net.minecraft.network.play.server.S32PacketConfirmTransaction;
 import net.minecraft.network.play.server.S3APacketTabComplete;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
 import net.minecraft.network.play.server.S40PacketDisconnect;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.stats.AchievementList;
@@ -90,9 +92,10 @@ import net.minecraft.util.IntHashMap;
 import net.minecraft.util.ReportedException;
 import net.minecraft.world.WorldServer;
 import net.lax1dude.eaglercraft.v1_8.sp.server.socket.IntegratedServerPlayerNetworkManager;
-import net.lax1dude.eaglercraft.v1_8.sp.server.voice.IntegratedVoiceService;
 
 import org.apache.commons.lang3.StringUtils;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -120,7 +123,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 
 	private static final Logger logger = LogManager.getLogger();
 	public final IntegratedServerPlayerNetworkManager netManager;
-	private final MinecraftServer serverController;
+	public final MinecraftServer serverController;
 	public EntityPlayerMP playerEntity;
 	private int networkTickCount;
 	private int field_175090_f;
@@ -137,6 +140,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 	private double lastPosZ;
 	private boolean hasMoved = true;
 	private boolean hasDisconnected = false;
+	private GameProtocolMessageController eaglerMessageController = null;
 
 	public NetHandlerPlayServer(MinecraftServer server, IntegratedServerPlayerNetworkManager networkManagerIn,
 			EntityPlayerMP playerIn) {
@@ -147,13 +151,33 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 		playerIn.playerNetServerHandler = this;
 	}
 
+	public GameProtocolMessageController getEaglerMessageController() {
+		return eaglerMessageController;
+	}
+
+	public void setEaglerMessageController(GameProtocolMessageController eaglerMessageController) {
+		this.eaglerMessageController = eaglerMessageController;
+	}
+
+	public GamePluginMessageProtocol getEaglerMessageProtocol() {
+		return eaglerMessageController != null ? eaglerMessageController.protocol : null;
+	}
+
+	public void sendEaglerMessage(GameMessagePacket packet) {
+		try {
+			eaglerMessageController.sendPacket(packet);
+		} catch (IOException e) {
+			logger.error("Failed to send eaglercraft plugin message packet: " + packet);
+			logger.error(e);
+		}
+	}
+
 	/**+
 	 * Like the old updateEntity(), except more generic.
 	 */
 	public void update() {
 		this.field_147366_g = false;
 		++this.networkTickCount;
-		this.serverController.theProfiler.startSection("keepAlive");
 		if ((long) this.networkTickCount - this.lastSentPingPacket > 40L) {
 			this.lastSentPingPacket = (long) this.networkTickCount;
 			this.lastPingTime = this.currentTimeMillis();
@@ -161,7 +185,6 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 			this.sendPacket(new S00PacketKeepAlive(this.field_147378_h));
 		}
 
-		this.serverController.theProfiler.endSection();
 		if (this.chatSpamThresholdCount > 0) {
 			--this.chatSpamThresholdCount;
 		}
@@ -176,6 +199,9 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 			this.kickPlayerFromServer("You have been idle for too long!");
 		}
 
+		if (this.eaglerMessageController != null) {
+			this.eaglerMessageController.flush();
+		}
 	}
 
 	public IntegratedServerPlayerNetworkManager getNetworkManager() {
@@ -1049,7 +1075,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 	}
 
 	private long currentTimeMillis() {
-		return System.nanoTime() / 1000000L;
+		return EagRuntime.steadyTimeMillis();
 	}
 
 	/**+
@@ -1236,19 +1262,6 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 			} else {
 				containerrepair.updateItemName("");
 			}
-		} else if ("EAG|Skins-1.8".equals(c17packetcustompayload.getChannelName())) {
-			byte[] r = new byte[c17packetcustompayload.getBufferData().readableBytes()];
-			c17packetcustompayload.getBufferData().readBytes(r);
-			((EaglerMinecraftServer) serverController).getSkinService().processPacket(r, playerEntity);
-		} else if ("EAG|Capes-1.8".equals(c17packetcustompayload.getChannelName())) {
-			byte[] r = new byte[c17packetcustompayload.getBufferData().readableBytes()];
-			c17packetcustompayload.getBufferData().readBytes(r);
-			((EaglerMinecraftServer) serverController).getCapeService().processPacket(r, playerEntity);
-		} else if ("EAG|Voice-1.8".equals(c17packetcustompayload.getChannelName())) {
-			IntegratedVoiceService vcs = ((EaglerMinecraftServer) serverController).getVoiceService();
-			if (vcs != null) {
-				vcs.processPacket(c17packetcustompayload.getBufferData(), playerEntity);
-			}
 		} else if ("EAG|MyUpdCert-1.8".equals(c17packetcustompayload.getChannelName())) {
 			if (playerEntity.updateCertificate == null) {
 				PacketBuffer pb = c17packetcustompayload.getBufferData();
@@ -1259,11 +1272,19 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 				for (int i = 0, l = lst.size(); i < l; ++i) {
 					EntityPlayerMP player = lst.get(i);
 					if (player != playerEntity) {
-						player.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload("EAG|UpdateCert-1.8",
-								new PacketBuffer(Unpooled.buffer(cert, cert.length).writerIndex(cert.length))));
+						player.playerNetServerHandler.sendEaglerMessage(new SPacketUpdateCertEAG(cert));
 					}
 				}
 			}
+		} else {
+			try {
+				eaglerMessageController.handlePacket(c17packetcustompayload.getChannelName(),
+						c17packetcustompayload.getBufferData());
+			} catch (IOException e) {
+				logger.error("Couldn't read \"{}\" packet as an eaglercraft plugin message!",
+						c17packetcustompayload.getChannelName());
+				logger.error(e);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/network/Packet.java b/src/game/java/net/minecraft/network/Packet.java
similarity index 100%
rename from src/main/java/net/minecraft/network/Packet.java
rename to src/game/java/net/minecraft/network/Packet.java
diff --git a/src/main/java/net/minecraft/network/PacketBuffer.java b/src/game/java/net/minecraft/network/PacketBuffer.java
similarity index 100%
rename from src/main/java/net/minecraft/network/PacketBuffer.java
rename to src/game/java/net/minecraft/network/PacketBuffer.java
diff --git a/src/main/java/net/minecraft/network/ServerStatusResponse.java b/src/game/java/net/minecraft/network/ServerStatusResponse.java
similarity index 100%
rename from src/main/java/net/minecraft/network/ServerStatusResponse.java
rename to src/game/java/net/minecraft/network/ServerStatusResponse.java
diff --git a/src/main/java/net/minecraft/network/handshake/INetHandlerHandshakeServer.java b/src/game/java/net/minecraft/network/handshake/INetHandlerHandshakeServer.java
similarity index 100%
rename from src/main/java/net/minecraft/network/handshake/INetHandlerHandshakeServer.java
rename to src/game/java/net/minecraft/network/handshake/INetHandlerHandshakeServer.java
diff --git a/src/main/java/net/minecraft/network/handshake/client/C00Handshake.java b/src/game/java/net/minecraft/network/handshake/client/C00Handshake.java
similarity index 100%
rename from src/main/java/net/minecraft/network/handshake/client/C00Handshake.java
rename to src/game/java/net/minecraft/network/handshake/client/C00Handshake.java
diff --git a/src/main/java/net/minecraft/network/login/INetHandlerLoginClient.java b/src/game/java/net/minecraft/network/login/INetHandlerLoginClient.java
similarity index 100%
rename from src/main/java/net/minecraft/network/login/INetHandlerLoginClient.java
rename to src/game/java/net/minecraft/network/login/INetHandlerLoginClient.java
diff --git a/src/main/java/net/minecraft/network/login/INetHandlerLoginServer.java b/src/game/java/net/minecraft/network/login/INetHandlerLoginServer.java
similarity index 100%
rename from src/main/java/net/minecraft/network/login/INetHandlerLoginServer.java
rename to src/game/java/net/minecraft/network/login/INetHandlerLoginServer.java
diff --git a/src/main/java/net/minecraft/network/login/client/C00PacketLoginStart.java b/src/game/java/net/minecraft/network/login/client/C00PacketLoginStart.java
similarity index 80%
rename from src/main/java/net/minecraft/network/login/client/C00PacketLoginStart.java
rename to src/game/java/net/minecraft/network/login/client/C00PacketLoginStart.java
index 921e07c..c2674ba 100755
--- a/src/main/java/net/minecraft/network/login/client/C00PacketLoginStart.java
+++ b/src/game/java/net/minecraft/network/login/client/C00PacketLoginStart.java
@@ -31,14 +31,19 @@ public class C00PacketLoginStart implements Packet<INetHandlerLoginServer> {
 	private GameProfile profile;
 	private byte[] skin;
 	private byte[] cape;
+	private byte[] protocols;
+	private EaglercraftUUID brandUUID;
 
 	public C00PacketLoginStart() {
 	}
 
-	public C00PacketLoginStart(GameProfile profileIn, byte[] skin, byte[] cape) {
+	public C00PacketLoginStart(GameProfile profileIn, byte[] skin, byte[] cape, byte[] protocols,
+			EaglercraftUUID brandUUID) {
 		this.profile = profileIn;
 		this.skin = skin;
 		this.cape = cape;
+		this.protocols = protocols;
+		this.brandUUID = brandUUID;
 	}
 
 	/**+
@@ -48,6 +53,8 @@ public class C00PacketLoginStart implements Packet<INetHandlerLoginServer> {
 		this.profile = new GameProfile((EaglercraftUUID) null, parPacketBuffer.readStringFromBuffer(16));
 		this.skin = parPacketBuffer.readByteArray();
 		this.cape = parPacketBuffer.readableBytes() > 0 ? parPacketBuffer.readByteArray() : null;
+		this.protocols = parPacketBuffer.readableBytes() > 0 ? parPacketBuffer.readByteArray() : null;
+		this.brandUUID = parPacketBuffer.readableBytes() > 0 ? parPacketBuffer.readUuid() : null;
 	}
 
 	/**+
@@ -57,6 +64,8 @@ public class C00PacketLoginStart implements Packet<INetHandlerLoginServer> {
 		parPacketBuffer.writeString(this.profile.getName());
 		parPacketBuffer.writeByteArray(this.skin);
 		parPacketBuffer.writeByteArray(this.cape);
+		parPacketBuffer.writeByteArray(this.protocols);
+		parPacketBuffer.writeUuid(brandUUID);
 	}
 
 	/**+
@@ -77,4 +86,12 @@ public class C00PacketLoginStart implements Packet<INetHandlerLoginServer> {
 	public byte[] getCape() {
 		return this.cape;
 	}
+
+	public byte[] getProtocols() {
+		return this.protocols;
+	}
+
+	public EaglercraftUUID getBrandUUID() {
+		return this.brandUUID;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/network/login/client/C01PacketEncryptionResponse.java b/src/game/java/net/minecraft/network/login/client/C01PacketEncryptionResponse.java
similarity index 100%
rename from src/main/java/net/minecraft/network/login/client/C01PacketEncryptionResponse.java
rename to src/game/java/net/minecraft/network/login/client/C01PacketEncryptionResponse.java
diff --git a/src/main/java/net/minecraft/network/login/server/S00PacketDisconnect.java b/src/game/java/net/minecraft/network/login/server/S00PacketDisconnect.java
similarity index 100%
rename from src/main/java/net/minecraft/network/login/server/S00PacketDisconnect.java
rename to src/game/java/net/minecraft/network/login/server/S00PacketDisconnect.java
diff --git a/src/main/java/net/minecraft/network/login/server/S01PacketEncryptionRequest.java b/src/game/java/net/minecraft/network/login/server/S01PacketEncryptionRequest.java
similarity index 100%
rename from src/main/java/net/minecraft/network/login/server/S01PacketEncryptionRequest.java
rename to src/game/java/net/minecraft/network/login/server/S01PacketEncryptionRequest.java
diff --git a/src/main/java/net/minecraft/network/login/server/S02PacketLoginSuccess.java b/src/game/java/net/minecraft/network/login/server/S02PacketLoginSuccess.java
similarity index 84%
rename from src/main/java/net/minecraft/network/login/server/S02PacketLoginSuccess.java
rename to src/game/java/net/minecraft/network/login/server/S02PacketLoginSuccess.java
index 58e3531..da52126 100755
--- a/src/main/java/net/minecraft/network/login/server/S02PacketLoginSuccess.java
+++ b/src/game/java/net/minecraft/network/login/server/S02PacketLoginSuccess.java
@@ -30,12 +30,14 @@ import net.minecraft.network.login.INetHandlerLoginClient;
  */
 public class S02PacketLoginSuccess implements Packet<INetHandlerLoginClient> {
 	private GameProfile profile;
+	private int selectedProtocol = 3;
 
 	public S02PacketLoginSuccess() {
 	}
 
-	public S02PacketLoginSuccess(GameProfile profileIn) {
+	public S02PacketLoginSuccess(GameProfile profileIn, int selectedProtocol) {
 		this.profile = profileIn;
+		this.selectedProtocol = selectedProtocol;
 	}
 
 	/**+
@@ -44,6 +46,7 @@ public class S02PacketLoginSuccess implements Packet<INetHandlerLoginClient> {
 	public void readPacketData(PacketBuffer parPacketBuffer) throws IOException {
 		String s = parPacketBuffer.readStringFromBuffer(36);
 		String s1 = parPacketBuffer.readStringFromBuffer(16);
+		selectedProtocol = parPacketBuffer.readableBytes() > 0 ? parPacketBuffer.readShort() : 3;
 		EaglercraftUUID uuid = EaglercraftUUID.fromString(s);
 		this.profile = new GameProfile(uuid, s1);
 	}
@@ -55,6 +58,9 @@ public class S02PacketLoginSuccess implements Packet<INetHandlerLoginClient> {
 		EaglercraftUUID uuid = this.profile.getId();
 		parPacketBuffer.writeString(uuid == null ? "" : uuid.toString());
 		parPacketBuffer.writeString(this.profile.getName());
+		if (selectedProtocol != 3) {
+			parPacketBuffer.writeShort(selectedProtocol);
+		}
 	}
 
 	/**+
@@ -67,4 +73,8 @@ public class S02PacketLoginSuccess implements Packet<INetHandlerLoginClient> {
 	public GameProfile getProfile() {
 		return this.profile;
 	}
+
+	public int getSelectedProtocol() {
+		return selectedProtocol;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/network/login/server/S03PacketEnableCompression.java b/src/game/java/net/minecraft/network/login/server/S03PacketEnableCompression.java
similarity index 100%
rename from src/main/java/net/minecraft/network/login/server/S03PacketEnableCompression.java
rename to src/game/java/net/minecraft/network/login/server/S03PacketEnableCompression.java
diff --git a/src/main/java/net/minecraft/network/play/INetHandlerPlayClient.java b/src/game/java/net/minecraft/network/play/INetHandlerPlayClient.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/INetHandlerPlayClient.java
rename to src/game/java/net/minecraft/network/play/INetHandlerPlayClient.java
diff --git a/src/main/java/net/minecraft/network/play/INetHandlerPlayServer.java b/src/game/java/net/minecraft/network/play/INetHandlerPlayServer.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/INetHandlerPlayServer.java
rename to src/game/java/net/minecraft/network/play/INetHandlerPlayServer.java
diff --git a/src/main/java/net/minecraft/network/play/client/C00PacketKeepAlive.java b/src/game/java/net/minecraft/network/play/client/C00PacketKeepAlive.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C00PacketKeepAlive.java
rename to src/game/java/net/minecraft/network/play/client/C00PacketKeepAlive.java
diff --git a/src/main/java/net/minecraft/network/play/client/C01PacketChatMessage.java b/src/game/java/net/minecraft/network/play/client/C01PacketChatMessage.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C01PacketChatMessage.java
rename to src/game/java/net/minecraft/network/play/client/C01PacketChatMessage.java
diff --git a/src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java b/src/game/java/net/minecraft/network/play/client/C02PacketUseEntity.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java
rename to src/game/java/net/minecraft/network/play/client/C02PacketUseEntity.java
diff --git a/src/main/java/net/minecraft/network/play/client/C03PacketPlayer.java b/src/game/java/net/minecraft/network/play/client/C03PacketPlayer.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C03PacketPlayer.java
rename to src/game/java/net/minecraft/network/play/client/C03PacketPlayer.java
diff --git a/src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java b/src/game/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java
rename to src/game/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java
diff --git a/src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java b/src/game/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java
rename to src/game/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java
diff --git a/src/main/java/net/minecraft/network/play/client/C09PacketHeldItemChange.java b/src/game/java/net/minecraft/network/play/client/C09PacketHeldItemChange.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C09PacketHeldItemChange.java
rename to src/game/java/net/minecraft/network/play/client/C09PacketHeldItemChange.java
diff --git a/src/main/java/net/minecraft/network/play/client/C0APacketAnimation.java b/src/game/java/net/minecraft/network/play/client/C0APacketAnimation.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C0APacketAnimation.java
rename to src/game/java/net/minecraft/network/play/client/C0APacketAnimation.java
diff --git a/src/main/java/net/minecraft/network/play/client/C0BPacketEntityAction.java b/src/game/java/net/minecraft/network/play/client/C0BPacketEntityAction.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C0BPacketEntityAction.java
rename to src/game/java/net/minecraft/network/play/client/C0BPacketEntityAction.java
diff --git a/src/main/java/net/minecraft/network/play/client/C0CPacketInput.java b/src/game/java/net/minecraft/network/play/client/C0CPacketInput.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C0CPacketInput.java
rename to src/game/java/net/minecraft/network/play/client/C0CPacketInput.java
diff --git a/src/main/java/net/minecraft/network/play/client/C0DPacketCloseWindow.java b/src/game/java/net/minecraft/network/play/client/C0DPacketCloseWindow.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C0DPacketCloseWindow.java
rename to src/game/java/net/minecraft/network/play/client/C0DPacketCloseWindow.java
diff --git a/src/main/java/net/minecraft/network/play/client/C0EPacketClickWindow.java b/src/game/java/net/minecraft/network/play/client/C0EPacketClickWindow.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C0EPacketClickWindow.java
rename to src/game/java/net/minecraft/network/play/client/C0EPacketClickWindow.java
diff --git a/src/main/java/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java b/src/game/java/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java
rename to src/game/java/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java
diff --git a/src/main/java/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.java b/src/game/java/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.java
rename to src/game/java/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.java
diff --git a/src/main/java/net/minecraft/network/play/client/C11PacketEnchantItem.java b/src/game/java/net/minecraft/network/play/client/C11PacketEnchantItem.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C11PacketEnchantItem.java
rename to src/game/java/net/minecraft/network/play/client/C11PacketEnchantItem.java
diff --git a/src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java b/src/game/java/net/minecraft/network/play/client/C12PacketUpdateSign.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java
rename to src/game/java/net/minecraft/network/play/client/C12PacketUpdateSign.java
diff --git a/src/main/java/net/minecraft/network/play/client/C13PacketPlayerAbilities.java b/src/game/java/net/minecraft/network/play/client/C13PacketPlayerAbilities.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C13PacketPlayerAbilities.java
rename to src/game/java/net/minecraft/network/play/client/C13PacketPlayerAbilities.java
diff --git a/src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java b/src/game/java/net/minecraft/network/play/client/C14PacketTabComplete.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java
rename to src/game/java/net/minecraft/network/play/client/C14PacketTabComplete.java
diff --git a/src/main/java/net/minecraft/network/play/client/C15PacketClientSettings.java b/src/game/java/net/minecraft/network/play/client/C15PacketClientSettings.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C15PacketClientSettings.java
rename to src/game/java/net/minecraft/network/play/client/C15PacketClientSettings.java
diff --git a/src/main/java/net/minecraft/network/play/client/C16PacketClientStatus.java b/src/game/java/net/minecraft/network/play/client/C16PacketClientStatus.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C16PacketClientStatus.java
rename to src/game/java/net/minecraft/network/play/client/C16PacketClientStatus.java
diff --git a/src/main/java/net/minecraft/network/play/client/C17PacketCustomPayload.java b/src/game/java/net/minecraft/network/play/client/C17PacketCustomPayload.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C17PacketCustomPayload.java
rename to src/game/java/net/minecraft/network/play/client/C17PacketCustomPayload.java
diff --git a/src/main/java/net/minecraft/network/play/client/C18PacketSpectate.java b/src/game/java/net/minecraft/network/play/client/C18PacketSpectate.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C18PacketSpectate.java
rename to src/game/java/net/minecraft/network/play/client/C18PacketSpectate.java
diff --git a/src/main/java/net/minecraft/network/play/client/C19PacketResourcePackStatus.java b/src/game/java/net/minecraft/network/play/client/C19PacketResourcePackStatus.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/client/C19PacketResourcePackStatus.java
rename to src/game/java/net/minecraft/network/play/client/C19PacketResourcePackStatus.java
diff --git a/src/main/java/net/minecraft/network/play/server/S00PacketKeepAlive.java b/src/game/java/net/minecraft/network/play/server/S00PacketKeepAlive.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S00PacketKeepAlive.java
rename to src/game/java/net/minecraft/network/play/server/S00PacketKeepAlive.java
diff --git a/src/main/java/net/minecraft/network/play/server/S01PacketJoinGame.java b/src/game/java/net/minecraft/network/play/server/S01PacketJoinGame.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S01PacketJoinGame.java
rename to src/game/java/net/minecraft/network/play/server/S01PacketJoinGame.java
diff --git a/src/main/java/net/minecraft/network/play/server/S02PacketChat.java b/src/game/java/net/minecraft/network/play/server/S02PacketChat.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S02PacketChat.java
rename to src/game/java/net/minecraft/network/play/server/S02PacketChat.java
diff --git a/src/main/java/net/minecraft/network/play/server/S03PacketTimeUpdate.java b/src/game/java/net/minecraft/network/play/server/S03PacketTimeUpdate.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S03PacketTimeUpdate.java
rename to src/game/java/net/minecraft/network/play/server/S03PacketTimeUpdate.java
diff --git a/src/main/java/net/minecraft/network/play/server/S04PacketEntityEquipment.java b/src/game/java/net/minecraft/network/play/server/S04PacketEntityEquipment.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S04PacketEntityEquipment.java
rename to src/game/java/net/minecraft/network/play/server/S04PacketEntityEquipment.java
diff --git a/src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java b/src/game/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java
rename to src/game/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java
diff --git a/src/main/java/net/minecraft/network/play/server/S06PacketUpdateHealth.java b/src/game/java/net/minecraft/network/play/server/S06PacketUpdateHealth.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S06PacketUpdateHealth.java
rename to src/game/java/net/minecraft/network/play/server/S06PacketUpdateHealth.java
diff --git a/src/main/java/net/minecraft/network/play/server/S07PacketRespawn.java b/src/game/java/net/minecraft/network/play/server/S07PacketRespawn.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S07PacketRespawn.java
rename to src/game/java/net/minecraft/network/play/server/S07PacketRespawn.java
diff --git a/src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java b/src/game/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java
rename to src/game/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java
diff --git a/src/main/java/net/minecraft/network/play/server/S09PacketHeldItemChange.java b/src/game/java/net/minecraft/network/play/server/S09PacketHeldItemChange.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S09PacketHeldItemChange.java
rename to src/game/java/net/minecraft/network/play/server/S09PacketHeldItemChange.java
diff --git a/src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java b/src/game/java/net/minecraft/network/play/server/S0APacketUseBed.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java
rename to src/game/java/net/minecraft/network/play/server/S0APacketUseBed.java
diff --git a/src/main/java/net/minecraft/network/play/server/S0BPacketAnimation.java b/src/game/java/net/minecraft/network/play/server/S0BPacketAnimation.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S0BPacketAnimation.java
rename to src/game/java/net/minecraft/network/play/server/S0BPacketAnimation.java
diff --git a/src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java b/src/game/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java
rename to src/game/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java
diff --git a/src/main/java/net/minecraft/network/play/server/S0DPacketCollectItem.java b/src/game/java/net/minecraft/network/play/server/S0DPacketCollectItem.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S0DPacketCollectItem.java
rename to src/game/java/net/minecraft/network/play/server/S0DPacketCollectItem.java
diff --git a/src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java b/src/game/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java
rename to src/game/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java
diff --git a/src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java b/src/game/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java
rename to src/game/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java
diff --git a/src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java b/src/game/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java
rename to src/game/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java
diff --git a/src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java b/src/game/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java
rename to src/game/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java
diff --git a/src/main/java/net/minecraft/network/play/server/S12PacketEntityVelocity.java b/src/game/java/net/minecraft/network/play/server/S12PacketEntityVelocity.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S12PacketEntityVelocity.java
rename to src/game/java/net/minecraft/network/play/server/S12PacketEntityVelocity.java
diff --git a/src/main/java/net/minecraft/network/play/server/S13PacketDestroyEntities.java b/src/game/java/net/minecraft/network/play/server/S13PacketDestroyEntities.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S13PacketDestroyEntities.java
rename to src/game/java/net/minecraft/network/play/server/S13PacketDestroyEntities.java
diff --git a/src/main/java/net/minecraft/network/play/server/S14PacketEntity.java b/src/game/java/net/minecraft/network/play/server/S14PacketEntity.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S14PacketEntity.java
rename to src/game/java/net/minecraft/network/play/server/S14PacketEntity.java
diff --git a/src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java b/src/game/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java
rename to src/game/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java
diff --git a/src/main/java/net/minecraft/network/play/server/S19PacketEntityHeadLook.java b/src/game/java/net/minecraft/network/play/server/S19PacketEntityHeadLook.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S19PacketEntityHeadLook.java
rename to src/game/java/net/minecraft/network/play/server/S19PacketEntityHeadLook.java
diff --git a/src/main/java/net/minecraft/network/play/server/S19PacketEntityStatus.java b/src/game/java/net/minecraft/network/play/server/S19PacketEntityStatus.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S19PacketEntityStatus.java
rename to src/game/java/net/minecraft/network/play/server/S19PacketEntityStatus.java
diff --git a/src/main/java/net/minecraft/network/play/server/S1BPacketEntityAttach.java b/src/game/java/net/minecraft/network/play/server/S1BPacketEntityAttach.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S1BPacketEntityAttach.java
rename to src/game/java/net/minecraft/network/play/server/S1BPacketEntityAttach.java
diff --git a/src/main/java/net/minecraft/network/play/server/S1CPacketEntityMetadata.java b/src/game/java/net/minecraft/network/play/server/S1CPacketEntityMetadata.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S1CPacketEntityMetadata.java
rename to src/game/java/net/minecraft/network/play/server/S1CPacketEntityMetadata.java
diff --git a/src/main/java/net/minecraft/network/play/server/S1DPacketEntityEffect.java b/src/game/java/net/minecraft/network/play/server/S1DPacketEntityEffect.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S1DPacketEntityEffect.java
rename to src/game/java/net/minecraft/network/play/server/S1DPacketEntityEffect.java
diff --git a/src/main/java/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java b/src/game/java/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java
rename to src/game/java/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java
diff --git a/src/main/java/net/minecraft/network/play/server/S1FPacketSetExperience.java b/src/game/java/net/minecraft/network/play/server/S1FPacketSetExperience.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S1FPacketSetExperience.java
rename to src/game/java/net/minecraft/network/play/server/S1FPacketSetExperience.java
diff --git a/src/main/java/net/minecraft/network/play/server/S20PacketEntityProperties.java b/src/game/java/net/minecraft/network/play/server/S20PacketEntityProperties.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S20PacketEntityProperties.java
rename to src/game/java/net/minecraft/network/play/server/S20PacketEntityProperties.java
diff --git a/src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java b/src/game/java/net/minecraft/network/play/server/S21PacketChunkData.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java
rename to src/game/java/net/minecraft/network/play/server/S21PacketChunkData.java
diff --git a/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java b/src/game/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java
rename to src/game/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java
diff --git a/src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java b/src/game/java/net/minecraft/network/play/server/S23PacketBlockChange.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java
rename to src/game/java/net/minecraft/network/play/server/S23PacketBlockChange.java
diff --git a/src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java b/src/game/java/net/minecraft/network/play/server/S24PacketBlockAction.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java
rename to src/game/java/net/minecraft/network/play/server/S24PacketBlockAction.java
diff --git a/src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java b/src/game/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java
rename to src/game/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java
diff --git a/src/main/java/net/minecraft/network/play/server/S26PacketMapChunkBulk.java b/src/game/java/net/minecraft/network/play/server/S26PacketMapChunkBulk.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S26PacketMapChunkBulk.java
rename to src/game/java/net/minecraft/network/play/server/S26PacketMapChunkBulk.java
diff --git a/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java b/src/game/java/net/minecraft/network/play/server/S27PacketExplosion.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java
rename to src/game/java/net/minecraft/network/play/server/S27PacketExplosion.java
diff --git a/src/main/java/net/minecraft/network/play/server/S28PacketEffect.java b/src/game/java/net/minecraft/network/play/server/S28PacketEffect.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S28PacketEffect.java
rename to src/game/java/net/minecraft/network/play/server/S28PacketEffect.java
diff --git a/src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java b/src/game/java/net/minecraft/network/play/server/S29PacketSoundEffect.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java
rename to src/game/java/net/minecraft/network/play/server/S29PacketSoundEffect.java
diff --git a/src/main/java/net/minecraft/network/play/server/S2APacketParticles.java b/src/game/java/net/minecraft/network/play/server/S2APacketParticles.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S2APacketParticles.java
rename to src/game/java/net/minecraft/network/play/server/S2APacketParticles.java
diff --git a/src/main/java/net/minecraft/network/play/server/S2BPacketChangeGameState.java b/src/game/java/net/minecraft/network/play/server/S2BPacketChangeGameState.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S2BPacketChangeGameState.java
rename to src/game/java/net/minecraft/network/play/server/S2BPacketChangeGameState.java
diff --git a/src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java b/src/game/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java
rename to src/game/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java
diff --git a/src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java b/src/game/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java
rename to src/game/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java
diff --git a/src/main/java/net/minecraft/network/play/server/S2EPacketCloseWindow.java b/src/game/java/net/minecraft/network/play/server/S2EPacketCloseWindow.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S2EPacketCloseWindow.java
rename to src/game/java/net/minecraft/network/play/server/S2EPacketCloseWindow.java
diff --git a/src/main/java/net/minecraft/network/play/server/S2FPacketSetSlot.java b/src/game/java/net/minecraft/network/play/server/S2FPacketSetSlot.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S2FPacketSetSlot.java
rename to src/game/java/net/minecraft/network/play/server/S2FPacketSetSlot.java
diff --git a/src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java b/src/game/java/net/minecraft/network/play/server/S30PacketWindowItems.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java
rename to src/game/java/net/minecraft/network/play/server/S30PacketWindowItems.java
diff --git a/src/main/java/net/minecraft/network/play/server/S31PacketWindowProperty.java b/src/game/java/net/minecraft/network/play/server/S31PacketWindowProperty.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S31PacketWindowProperty.java
rename to src/game/java/net/minecraft/network/play/server/S31PacketWindowProperty.java
diff --git a/src/main/java/net/minecraft/network/play/server/S32PacketConfirmTransaction.java b/src/game/java/net/minecraft/network/play/server/S32PacketConfirmTransaction.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S32PacketConfirmTransaction.java
rename to src/game/java/net/minecraft/network/play/server/S32PacketConfirmTransaction.java
diff --git a/src/main/java/net/minecraft/network/play/server/S33PacketUpdateSign.java b/src/game/java/net/minecraft/network/play/server/S33PacketUpdateSign.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S33PacketUpdateSign.java
rename to src/game/java/net/minecraft/network/play/server/S33PacketUpdateSign.java
diff --git a/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java b/src/game/java/net/minecraft/network/play/server/S34PacketMaps.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S34PacketMaps.java
rename to src/game/java/net/minecraft/network/play/server/S34PacketMaps.java
diff --git a/src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java b/src/game/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java
rename to src/game/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java
diff --git a/src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java b/src/game/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java
rename to src/game/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java
diff --git a/src/main/java/net/minecraft/network/play/server/S37PacketStatistics.java b/src/game/java/net/minecraft/network/play/server/S37PacketStatistics.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S37PacketStatistics.java
rename to src/game/java/net/minecraft/network/play/server/S37PacketStatistics.java
diff --git a/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java b/src/game/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java
rename to src/game/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java
diff --git a/src/main/java/net/minecraft/network/play/server/S39PacketPlayerAbilities.java b/src/game/java/net/minecraft/network/play/server/S39PacketPlayerAbilities.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S39PacketPlayerAbilities.java
rename to src/game/java/net/minecraft/network/play/server/S39PacketPlayerAbilities.java
diff --git a/src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java b/src/game/java/net/minecraft/network/play/server/S3APacketTabComplete.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java
rename to src/game/java/net/minecraft/network/play/server/S3APacketTabComplete.java
diff --git a/src/main/java/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java b/src/game/java/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java
rename to src/game/java/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java
diff --git a/src/main/java/net/minecraft/network/play/server/S3CPacketUpdateScore.java b/src/game/java/net/minecraft/network/play/server/S3CPacketUpdateScore.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S3CPacketUpdateScore.java
rename to src/game/java/net/minecraft/network/play/server/S3CPacketUpdateScore.java
diff --git a/src/main/java/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java b/src/game/java/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java
rename to src/game/java/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java
diff --git a/src/main/java/net/minecraft/network/play/server/S3EPacketTeams.java b/src/game/java/net/minecraft/network/play/server/S3EPacketTeams.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S3EPacketTeams.java
rename to src/game/java/net/minecraft/network/play/server/S3EPacketTeams.java
diff --git a/src/main/java/net/minecraft/network/play/server/S3FPacketCustomPayload.java b/src/game/java/net/minecraft/network/play/server/S3FPacketCustomPayload.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S3FPacketCustomPayload.java
rename to src/game/java/net/minecraft/network/play/server/S3FPacketCustomPayload.java
diff --git a/src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java b/src/game/java/net/minecraft/network/play/server/S40PacketDisconnect.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java
rename to src/game/java/net/minecraft/network/play/server/S40PacketDisconnect.java
diff --git a/src/main/java/net/minecraft/network/play/server/S41PacketServerDifficulty.java b/src/game/java/net/minecraft/network/play/server/S41PacketServerDifficulty.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S41PacketServerDifficulty.java
rename to src/game/java/net/minecraft/network/play/server/S41PacketServerDifficulty.java
diff --git a/src/main/java/net/minecraft/network/play/server/S42PacketCombatEvent.java b/src/game/java/net/minecraft/network/play/server/S42PacketCombatEvent.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S42PacketCombatEvent.java
rename to src/game/java/net/minecraft/network/play/server/S42PacketCombatEvent.java
diff --git a/src/main/java/net/minecraft/network/play/server/S43PacketCamera.java b/src/game/java/net/minecraft/network/play/server/S43PacketCamera.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S43PacketCamera.java
rename to src/game/java/net/minecraft/network/play/server/S43PacketCamera.java
diff --git a/src/main/java/net/minecraft/network/play/server/S44PacketWorldBorder.java b/src/game/java/net/minecraft/network/play/server/S44PacketWorldBorder.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S44PacketWorldBorder.java
rename to src/game/java/net/minecraft/network/play/server/S44PacketWorldBorder.java
diff --git a/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java b/src/game/java/net/minecraft/network/play/server/S45PacketTitle.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S45PacketTitle.java
rename to src/game/java/net/minecraft/network/play/server/S45PacketTitle.java
diff --git a/src/main/java/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java b/src/game/java/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java
rename to src/game/java/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java
diff --git a/src/main/java/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java b/src/game/java/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java
rename to src/game/java/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java
diff --git a/src/main/java/net/minecraft/network/play/server/S48PacketResourcePackSend.java b/src/game/java/net/minecraft/network/play/server/S48PacketResourcePackSend.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S48PacketResourcePackSend.java
rename to src/game/java/net/minecraft/network/play/server/S48PacketResourcePackSend.java
diff --git a/src/main/java/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java b/src/game/java/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java
similarity index 100%
rename from src/main/java/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java
rename to src/game/java/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java
diff --git a/src/main/java/net/minecraft/pathfinding/Path.java b/src/game/java/net/minecraft/pathfinding/Path.java
similarity index 100%
rename from src/main/java/net/minecraft/pathfinding/Path.java
rename to src/game/java/net/minecraft/pathfinding/Path.java
diff --git a/src/main/java/net/minecraft/pathfinding/PathEntity.java b/src/game/java/net/minecraft/pathfinding/PathEntity.java
similarity index 100%
rename from src/main/java/net/minecraft/pathfinding/PathEntity.java
rename to src/game/java/net/minecraft/pathfinding/PathEntity.java
diff --git a/src/main/java/net/minecraft/pathfinding/PathFinder.java b/src/game/java/net/minecraft/pathfinding/PathFinder.java
similarity index 100%
rename from src/main/java/net/minecraft/pathfinding/PathFinder.java
rename to src/game/java/net/minecraft/pathfinding/PathFinder.java
diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigate.java b/src/game/java/net/minecraft/pathfinding/PathNavigate.java
similarity index 95%
rename from src/main/java/net/minecraft/pathfinding/PathNavigate.java
rename to src/game/java/net/minecraft/pathfinding/PathNavigate.java
index 1a63665..de3f7ee 100755
--- a/src/main/java/net/minecraft/pathfinding/PathNavigate.java
+++ b/src/game/java/net/minecraft/pathfinding/PathNavigate.java
@@ -87,12 +87,10 @@ public abstract class PathNavigate {
 			return null;
 		} else {
 			float f = this.getPathSearchRange();
-			this.worldObj.theProfiler.startSection("pathfind");
 			BlockPos blockpos = new BlockPos(this.theEntity);
 			int i = (int) (f + 8.0F);
 			ChunkCache chunkcache = new ChunkCache(this.worldObj, blockpos.add(-i, -i, -i), blockpos.add(i, i, i), 0);
 			PathEntity pathentity = this.pathFinder.createEntityPathTo(chunkcache, this.theEntity, (BlockPos) pos, f);
-			this.worldObj.theProfiler.endSection();
 			return pathentity;
 		}
 	}
@@ -122,13 +120,11 @@ public abstract class PathNavigate {
 			return null;
 		} else {
 			float f = this.getPathSearchRange();
-			this.worldObj.theProfiler.startSection("pathfind");
 			BlockPos blockpos = (new BlockPos(this.theEntity)).up();
 			int i = (int) (f + 16.0F);
 			ChunkCache chunkcache = new ChunkCache(this.worldObj, blockpos.add(-i, -i, -i), blockpos.add(i, i, i), 0);
 			PathEntity pathentity = this.pathFinder.createEntityPathTo(chunkcache, this.theEntity, (Entity) entityIn,
 					f);
-			this.worldObj.theProfiler.endSection();
 			return pathentity;
 		}
 	}
diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigateClimber.java b/src/game/java/net/minecraft/pathfinding/PathNavigateClimber.java
similarity index 100%
rename from src/main/java/net/minecraft/pathfinding/PathNavigateClimber.java
rename to src/game/java/net/minecraft/pathfinding/PathNavigateClimber.java
diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigateGround.java b/src/game/java/net/minecraft/pathfinding/PathNavigateGround.java
similarity index 100%
rename from src/main/java/net/minecraft/pathfinding/PathNavigateGround.java
rename to src/game/java/net/minecraft/pathfinding/PathNavigateGround.java
diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigateSwimmer.java b/src/game/java/net/minecraft/pathfinding/PathNavigateSwimmer.java
similarity index 100%
rename from src/main/java/net/minecraft/pathfinding/PathNavigateSwimmer.java
rename to src/game/java/net/minecraft/pathfinding/PathNavigateSwimmer.java
diff --git a/src/main/java/net/minecraft/pathfinding/PathPoint.java b/src/game/java/net/minecraft/pathfinding/PathPoint.java
similarity index 100%
rename from src/main/java/net/minecraft/pathfinding/PathPoint.java
rename to src/game/java/net/minecraft/pathfinding/PathPoint.java
diff --git a/src/main/java/net/minecraft/potion/Potion.java b/src/game/java/net/minecraft/potion/Potion.java
similarity index 100%
rename from src/main/java/net/minecraft/potion/Potion.java
rename to src/game/java/net/minecraft/potion/Potion.java
diff --git a/src/main/java/net/minecraft/potion/PotionAbsorption.java b/src/game/java/net/minecraft/potion/PotionAbsorption.java
similarity index 100%
rename from src/main/java/net/minecraft/potion/PotionAbsorption.java
rename to src/game/java/net/minecraft/potion/PotionAbsorption.java
diff --git a/src/main/java/net/minecraft/potion/PotionAttackDamage.java b/src/game/java/net/minecraft/potion/PotionAttackDamage.java
similarity index 100%
rename from src/main/java/net/minecraft/potion/PotionAttackDamage.java
rename to src/game/java/net/minecraft/potion/PotionAttackDamage.java
diff --git a/src/main/java/net/minecraft/potion/PotionEffect.java b/src/game/java/net/minecraft/potion/PotionEffect.java
similarity index 100%
rename from src/main/java/net/minecraft/potion/PotionEffect.java
rename to src/game/java/net/minecraft/potion/PotionEffect.java
diff --git a/src/main/java/net/minecraft/potion/PotionHealth.java b/src/game/java/net/minecraft/potion/PotionHealth.java
similarity index 100%
rename from src/main/java/net/minecraft/potion/PotionHealth.java
rename to src/game/java/net/minecraft/potion/PotionHealth.java
diff --git a/src/main/java/net/minecraft/potion/PotionHealthBoost.java b/src/game/java/net/minecraft/potion/PotionHealthBoost.java
similarity index 100%
rename from src/main/java/net/minecraft/potion/PotionHealthBoost.java
rename to src/game/java/net/minecraft/potion/PotionHealthBoost.java
diff --git a/src/main/java/net/minecraft/potion/PotionHelper.java b/src/game/java/net/minecraft/potion/PotionHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/potion/PotionHelper.java
rename to src/game/java/net/minecraft/potion/PotionHelper.java
diff --git a/src/main/java/net/minecraft/scoreboard/GoalColor.java b/src/game/java/net/minecraft/scoreboard/GoalColor.java
similarity index 100%
rename from src/main/java/net/minecraft/scoreboard/GoalColor.java
rename to src/game/java/net/minecraft/scoreboard/GoalColor.java
diff --git a/src/main/java/net/minecraft/scoreboard/IScoreObjectiveCriteria.java b/src/game/java/net/minecraft/scoreboard/IScoreObjectiveCriteria.java
similarity index 100%
rename from src/main/java/net/minecraft/scoreboard/IScoreObjectiveCriteria.java
rename to src/game/java/net/minecraft/scoreboard/IScoreObjectiveCriteria.java
diff --git a/src/main/java/net/minecraft/scoreboard/Score.java b/src/game/java/net/minecraft/scoreboard/Score.java
similarity index 100%
rename from src/main/java/net/minecraft/scoreboard/Score.java
rename to src/game/java/net/minecraft/scoreboard/Score.java
diff --git a/src/main/java/net/minecraft/scoreboard/ScoreDummyCriteria.java b/src/game/java/net/minecraft/scoreboard/ScoreDummyCriteria.java
similarity index 100%
rename from src/main/java/net/minecraft/scoreboard/ScoreDummyCriteria.java
rename to src/game/java/net/minecraft/scoreboard/ScoreDummyCriteria.java
diff --git a/src/main/java/net/minecraft/scoreboard/ScoreHealthCriteria.java b/src/game/java/net/minecraft/scoreboard/ScoreHealthCriteria.java
similarity index 100%
rename from src/main/java/net/minecraft/scoreboard/ScoreHealthCriteria.java
rename to src/game/java/net/minecraft/scoreboard/ScoreHealthCriteria.java
diff --git a/src/main/java/net/minecraft/scoreboard/ScoreObjective.java b/src/game/java/net/minecraft/scoreboard/ScoreObjective.java
similarity index 80%
rename from src/main/java/net/minecraft/scoreboard/ScoreObjective.java
rename to src/game/java/net/minecraft/scoreboard/ScoreObjective.java
index eed76f5..da13e85 100755
--- a/src/main/java/net/minecraft/scoreboard/ScoreObjective.java
+++ b/src/game/java/net/minecraft/scoreboard/ScoreObjective.java
@@ -1,5 +1,8 @@
 package net.minecraft.scoreboard;
 
+import net.lax1dude.eaglercraft.v1_8.profanity_filter.ProfanityFilter;
+import net.minecraft.client.Minecraft;
+
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -26,6 +29,7 @@ public class ScoreObjective {
 	private final IScoreObjectiveCriteria objectiveCriteria;
 	private IScoreObjectiveCriteria.EnumRenderType renderType;
 	private String displayName;
+	private String displayNameProfanityFilter;
 
 	public ScoreObjective(Scoreboard theScoreboardIn, String nameIn, IScoreObjectiveCriteria objectiveCriteriaIn) {
 		this.theScoreboard = theScoreboardIn;
@@ -51,6 +55,17 @@ public class ScoreObjective {
 		return this.displayName;
 	}
 
+	public String getDisplayNameProfanityFilter() {
+		if (Minecraft.getMinecraft().isEnableProfanityFilter()) {
+			if (displayNameProfanityFilter == null) {
+				displayNameProfanityFilter = ProfanityFilter.getInstance().profanityFilterString(displayName);
+			}
+			return displayNameProfanityFilter;
+		} else {
+			return this.displayName;
+		}
+	}
+
 	public void setDisplayName(String nameIn) {
 		this.displayName = nameIn;
 		this.theScoreboard.func_96532_b(this);
diff --git a/src/main/java/net/minecraft/scoreboard/ScorePlayerTeam.java b/src/game/java/net/minecraft/scoreboard/ScorePlayerTeam.java
similarity index 100%
rename from src/main/java/net/minecraft/scoreboard/ScorePlayerTeam.java
rename to src/game/java/net/minecraft/scoreboard/ScorePlayerTeam.java
diff --git a/src/main/java/net/minecraft/scoreboard/Scoreboard.java b/src/game/java/net/minecraft/scoreboard/Scoreboard.java
similarity index 100%
rename from src/main/java/net/minecraft/scoreboard/Scoreboard.java
rename to src/game/java/net/minecraft/scoreboard/Scoreboard.java
diff --git a/src/main/java/net/minecraft/scoreboard/ScoreboardSaveData.java b/src/game/java/net/minecraft/scoreboard/ScoreboardSaveData.java
similarity index 100%
rename from src/main/java/net/minecraft/scoreboard/ScoreboardSaveData.java
rename to src/game/java/net/minecraft/scoreboard/ScoreboardSaveData.java
diff --git a/src/main/java/net/minecraft/scoreboard/ServerScoreboard.java b/src/game/java/net/minecraft/scoreboard/ServerScoreboard.java
similarity index 100%
rename from src/main/java/net/minecraft/scoreboard/ServerScoreboard.java
rename to src/game/java/net/minecraft/scoreboard/ServerScoreboard.java
diff --git a/src/main/java/net/minecraft/scoreboard/Team.java b/src/game/java/net/minecraft/scoreboard/Team.java
similarity index 100%
rename from src/main/java/net/minecraft/scoreboard/Team.java
rename to src/game/java/net/minecraft/scoreboard/Team.java
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/game/java/net/minecraft/server/MinecraftServer.java
similarity index 90%
rename from src/main/java/net/minecraft/server/MinecraftServer.java
rename to src/game/java/net/minecraft/server/MinecraftServer.java
index 37bec77..d34d8cd 100755
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/game/java/net/minecraft/server/MinecraftServer.java
@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.Callable;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.futures.FutureTask;
@@ -24,7 +25,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.play.server.S03PacketTimeUpdate;
 import net.minecraft.network.play.server.S41PacketServerDifficulty;
-import net.minecraft.profiler.Profiler;
 import net.minecraft.server.management.ServerConfigurationManager;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
@@ -77,7 +77,6 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 	 */
 	protected final List<ITickable> playersOnline = Lists.newArrayList();
 	protected final ICommandManager commandManager;
-	public final Profiler theProfiler = new Profiler();
 	private final EaglercraftRandom random = new EaglercraftRandom();
 	/**+
 	 * The server's port.
@@ -120,7 +119,7 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 	private boolean startProfiling;
 	private boolean isGamemodeForced;
 	private long nanoTimeSinceStatusRefresh = 0L;
-	protected final Queue<FutureTask<?>> futureTaskQueue = new LinkedList();
+	protected final Queue<FutureTask<?>> futureTaskQueue = new LinkedList<>();
 	private Thread serverThread;
 	protected long currentTime = getCurrentTimeMillis();
 	private boolean paused = false;
@@ -186,17 +185,16 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 
 			if (j == 0) {
 				if (this.isDemo()) {
-					this.worldServers[j] = (WorldServer) (new DemoWorldServer(this, isavehandler, worldinfo, b0,
-							this.theProfiler)).init();
+					this.worldServers[j] = (WorldServer) (new DemoWorldServer(this, isavehandler, worldinfo, b0))
+							.init();
 				} else {
-					this.worldServers[j] = (WorldServer) (new WorldServer(this, isavehandler, worldinfo, b0,
-							this.theProfiler)).init();
+					this.worldServers[j] = (WorldServer) (new WorldServer(this, isavehandler, worldinfo, b0)).init();
 				}
 
 				this.worldServers[j].initialize(worldsettings);
 			} else {
-				this.worldServers[j] = (WorldServer) (new WorldServerMulti(this, isavehandler, b0, this.worldServers[0],
-						this.theProfiler)).init();
+				this.worldServers[j] = (WorldServer) (new WorldServerMulti(this, isavehandler, b0,
+						this.worldServers[0])).init();
 			}
 
 			this.worldServers[j].addWorldAccess(new WorldManager(this, this.worldServers[j]));
@@ -457,15 +455,12 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 	 * Main function called by run() every loop.
 	 */
 	public void tick() {
-		long i = System.nanoTime();
+		long i = EagRuntime.nanoTime();
 		++this.tickCounter;
 		if (this.startProfiling) {
 			this.startProfiling = false;
-			this.theProfiler.profilingEnabled = true;
-			this.theProfiler.clearProfiling();
 		}
 
-		this.theProfiler.startSection("root");
 		this.updateTimeLightAndEntities();
 
 		boolean loadSpawnChunks = this.worldServers[0].getWorldInfo().getGameRulesInstance()
@@ -480,47 +475,31 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 		}
 
 		if (this.tickCounter % 900 == 0) {
-			this.theProfiler.startSection("save");
 			this.serverConfigManager.saveAllPlayerData();
 			this.saveAllWorlds(true);
-			this.theProfiler.endSection();
 		}
 
-		this.theProfiler.startSection("tallying");
-		this.tickTimeArray[this.tickCounter % 100] = System.nanoTime() - i;
-		this.theProfiler.endSection();
-		this.theProfiler.startSection("snooper");
-
-		this.theProfiler.endSection();
-		this.theProfiler.endSection();
+		this.tickTimeArray[this.tickCounter % 100] = EagRuntime.nanoTime() - i;
 	}
 
 	public void updateTimeLightAndEntities() {
-		this.theProfiler.startSection("jobs");
 		synchronized (this.futureTaskQueue) {
 			while (!this.futureTaskQueue.isEmpty()) {
 				Util.func_181617_a((FutureTask) this.futureTaskQueue.poll(), logger);
 			}
 		}
 
-		this.theProfiler.endStartSection("levels");
-
 		for (int j = 0; j < this.worldServers.length; ++j) {
-			long i = System.nanoTime();
+			long i = EagRuntime.nanoTime();
 			if (j == 0 || this.getAllowNether()) {
 				WorldServer worldserver = this.worldServers[j];
-				this.theProfiler.startSection(worldserver.getWorldInfo().getWorldName());
 				if (this.tickCounter % 20 == 0) {
-					this.theProfiler.startSection("timeSync");
 					this.serverConfigManager.sendPacketToAllPlayersInDimension(
 							new S03PacketTimeUpdate(worldserver.getTotalWorldTime(), worldserver.getWorldTime(),
 									worldserver.getGameRules().getBoolean("doDaylightCycle")),
 							worldserver.provider.getDimensionId());
-					this.theProfiler.endSection();
 				}
 
-				this.theProfiler.startSection("tick");
-
 				try {
 					worldserver.tick();
 				} catch (Throwable throwable1) {
@@ -538,27 +517,18 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 					throw new ReportedException(crashreport1);
 				}
 
-				this.theProfiler.endSection();
-				this.theProfiler.startSection("tracker");
 				worldserver.getEntityTracker().updateTrackedEntities();
-				this.theProfiler.endSection();
-				this.theProfiler.endSection();
 			}
 
-			this.timeOfLastDimensionTick[j][this.tickCounter % 100] = System.nanoTime() - i;
+			this.timeOfLastDimensionTick[j][this.tickCounter % 100] = EagRuntime.nanoTime() - i;
 		}
 
-		this.theProfiler.endStartSection("connection");
 		EaglerIntegratedServerWorker.tick();
-		this.theProfiler.endStartSection("players");
 		this.serverConfigManager.onTick();
-		this.theProfiler.endStartSection("tickables");
 
 		for (int k = 0; k < this.playersOnline.size(); ++k) {
 			((ITickable) this.playersOnline.get(k)).update();
 		}
-
-		this.theProfiler.endSection();
 	}
 
 	public boolean getAllowNether() {
@@ -632,9 +602,7 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 	public CrashReport addServerInfoToCrashReport(CrashReport crashreport) {
 		crashreport.getCategory().addCrashSectionCallable("Profiler Position", new Callable<String>() {
 			public String call() throws Exception {
-				return MinecraftServer.this.theProfiler.profilingEnabled
-						? MinecraftServer.this.theProfiler.getNameOfLastSection()
-						: "N/A (disabled)";
+				return "N/A (disabled)";
 			}
 		});
 		if (this.serverConfigManager != null) {
@@ -970,7 +938,7 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 	}
 
 	public static long getCurrentTimeMillis() {
-		return System.currentTimeMillis();
+		return EagRuntime.steadyTimeMillis();
 	}
 
 	public int getMaxPlayerIdleMinutes() {
diff --git a/src/main/java/net/minecraft/server/management/ItemInWorldManager.java b/src/game/java/net/minecraft/server/management/ItemInWorldManager.java
similarity index 100%
rename from src/main/java/net/minecraft/server/management/ItemInWorldManager.java
rename to src/game/java/net/minecraft/server/management/ItemInWorldManager.java
diff --git a/src/main/java/net/minecraft/server/management/LowerStringMap.java b/src/game/java/net/minecraft/server/management/LowerStringMap.java
similarity index 100%
rename from src/main/java/net/minecraft/server/management/LowerStringMap.java
rename to src/game/java/net/minecraft/server/management/LowerStringMap.java
diff --git a/src/main/java/net/minecraft/server/management/PlayerManager.java b/src/game/java/net/minecraft/server/management/PlayerManager.java
similarity index 100%
rename from src/main/java/net/minecraft/server/management/PlayerManager.java
rename to src/game/java/net/minecraft/server/management/PlayerManager.java
diff --git a/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java b/src/game/java/net/minecraft/server/management/ServerConfigurationManager.java
similarity index 93%
rename from src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
rename to src/game/java/net/minecraft/server/management/ServerConfigurationManager.java
index 415f164..adabb03 100755
--- a/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
+++ b/src/game/java/net/minecraft/server/management/ServerConfigurationManager.java
@@ -60,7 +60,12 @@ import net.minecraft.world.border.WorldBorder;
 import net.minecraft.world.demo.DemoWorldManager;
 import net.minecraft.world.storage.IPlayerFileData;
 import net.minecraft.world.storage.WorldInfo;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageConstants;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageProtocol;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.client.GameProtocolMessageController;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketUpdateCertEAG;
 import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer;
+import net.lax1dude.eaglercraft.v1_8.sp.server.WorldsDB;
 import net.lax1dude.eaglercraft.v1_8.sp.server.socket.IntegratedServerPlayerNetworkManager;
 import net.lax1dude.eaglercraft.v1_8.sp.server.voice.IntegratedVoiceService;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
@@ -113,7 +118,9 @@ public abstract class ServerConfigurationManager {
 		this.maxPlayers = 100;
 	}
 
-	public void initializeConnectionToPlayer(IntegratedServerPlayerNetworkManager netManager, EntityPlayerMP playerIn) {
+	public void initializeConnectionToPlayer(IntegratedServerPlayerNetworkManager netManager, EntityPlayerMP playerIn,
+			int protocolVersion, EaglercraftUUID clientBrandUUID) {
+		playerIn.clientBrandUUID = clientBrandUUID;
 		GameProfile gameprofile1 = playerIn.getGameProfile();
 		NBTTagCompound nbttagcompound = this.readPlayerDataFromFile(playerIn);
 		playerIn.setWorld(this.mcServer.worldServerForDimension(playerIn.dimension));
@@ -127,6 +134,10 @@ public abstract class ServerConfigurationManager {
 		BlockPos blockpos = worldserver.getSpawnPoint();
 		this.setPlayerGameTypeBasedOnOther(playerIn, (EntityPlayerMP) null, worldserver);
 		NetHandlerPlayServer nethandlerplayserver = new NetHandlerPlayServer(this.mcServer, netManager, playerIn);
+		nethandlerplayserver.setEaglerMessageController(new GameProtocolMessageController(
+				GamePluginMessageProtocol.getByVersion(protocolVersion), GamePluginMessageConstants.SERVER_TO_CLIENT,
+				GameProtocolMessageController.createServerHandler(protocolVersion, nethandlerplayserver),
+				(ch, msg) -> nethandlerplayserver.sendPacket(new S3FPacketCustomPayload(ch, msg))));
 		nethandlerplayserver.sendPacket(new S01PacketJoinGame(playerIn.getEntityId(),
 				playerIn.theItemInWorldManager.getGameType(), worldinfo.isHardcoreModeEnabled(),
 				worldserver.provider.getDimensionId(), worldserver.getDifficulty(), this.getMaxPlayers(),
@@ -183,11 +194,7 @@ public abstract class ServerConfigurationManager {
 			for (int i = 0, l = playerEntityList.size(); i < l; ++i) {
 				EntityPlayerMP playerItr = playerEntityList.get(i);
 				if (playerItr != playerIn && playerItr.updateCertificate != null) {
-					nethandlerplayserver
-							.sendPacket(new S3FPacketCustomPayload("EAG|UpdateCert-1.8",
-									new PacketBuffer(Unpooled
-											.buffer(playerItr.updateCertificate, playerItr.updateCertificate.length)
-											.writerIndex(playerItr.updateCertificate.length))));
+					nethandlerplayserver.sendEaglerMessage(new SPacketUpdateCertEAG(playerItr.updateCertificate));
 				}
 			}
 		}
@@ -438,6 +445,8 @@ public abstract class ServerConfigurationManager {
 		EntityPlayerMP entityplayermp = new EntityPlayerMP(this.mcServer,
 				this.mcServer.worldServerForDimension(playerIn.dimension), playerIn.getGameProfile(),
 				(ItemInWorldManager) object);
+		entityplayermp.updateCertificate = playerIn.updateCertificate;
+		entityplayermp.clientBrandUUID = playerIn.clientBrandUUID;
 		entityplayermp.playerNetServerHandler = playerIn.playerNetServerHandler;
 		entityplayermp.clonePlayer(playerIn, conqueredEnd);
 		entityplayermp.setEntityId(playerIn.getEntityId());
@@ -519,7 +528,6 @@ public abstract class ServerConfigurationManager {
 		double d1 = entityIn.posZ;
 		double d2 = 8.0D;
 		float f = entityIn.rotationYaw;
-		parWorldServer.theProfiler.startSection("moving");
 		if (entityIn.dimension == -1) {
 			d0 = MathHelper.clamp_double(d0 / d2, parWorldServer2.getWorldBorder().minX() + 16.0D,
 					parWorldServer2.getWorldBorder().maxX() - 16.0D);
@@ -555,9 +563,7 @@ public abstract class ServerConfigurationManager {
 			}
 		}
 
-		parWorldServer.theProfiler.endSection();
 		if (parInt1 != 1) {
-			parWorldServer.theProfiler.startSection("placing");
 			d0 = (double) MathHelper.clamp_int((int) d0, -29999872, 29999872);
 			d1 = (double) MathHelper.clamp_int((int) d1, -29999872, 29999872);
 			if (entityIn.isEntityAlive()) {
@@ -566,8 +572,6 @@ public abstract class ServerConfigurationManager {
 				parWorldServer2.spawnEntityInWorld(entityIn);
 				parWorldServer2.updateEntityWithOptionalForce(entityIn, false);
 			}
-
-			parWorldServer.theProfiler.endSection();
 		}
 
 		entityIn.setWorld(parWorldServer2);
@@ -873,9 +877,9 @@ public abstract class ServerConfigurationManager {
 		String name = playerIn.getName();
 		StatisticsFile statisticsfile = (StatisticsFile) this.playerStatFiles.get(name);
 		if (statisticsfile == null) {
-			VFile2 file1 = new VFile2(this.mcServer.worldServerForDimension(0).getSaveHandler().getWorldDirectory(),
-					"stats");
-			VFile2 file2 = new VFile2(file1, name + ".json");
+			VFile2 file1 = WorldsDB
+					.newVFile(this.mcServer.worldServerForDimension(0).getSaveHandler().getWorldDirectory(), "stats");
+			VFile2 file2 = WorldsDB.newVFile(file1, name + ".json");
 			statisticsfile = new StatisticsFile(this.mcServer, file2);
 			statisticsfile.readStatFile();
 			this.playerStatFiles.put(name, statisticsfile);
diff --git a/src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java b/src/game/java/net/minecraft/server/network/NetHandlerLoginServer.java
similarity index 79%
rename from src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java
rename to src/game/java/net/minecraft/server/network/NetHandlerLoginServer.java
index d16c653..774ff12 100755
--- a/src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java
+++ b/src/game/java/net/minecraft/server/network/NetHandlerLoginServer.java
@@ -2,8 +2,10 @@ package net.minecraft.server.network;
 
 import com.google.common.base.Charsets;
 import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
-import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+import net.lax1dude.eaglercraft.v1_8.ClientUUIDLoadingCache;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
 import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.EnumConnectionState;
@@ -19,6 +21,9 @@ import net.minecraft.util.ITickable;
 import net.lax1dude.eaglercraft.v1_8.sp.server.socket.IntegratedServerPlayerNetworkManager;
 import net.lax1dude.eaglercraft.v1_8.sp.server.voice.IntegratedVoiceService;
 
+import java.io.DataInputStream;
+import java.io.IOException;
+
 import org.apache.commons.lang3.Validate;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -45,8 +50,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  */
 public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable {
 	private static final Logger logger = LogManager.getLogger();
-	private static final EaglercraftRandom RANDOM = new EaglercraftRandom();
-	private final byte[] verifyToken = new byte[4];
 	private final MinecraftServer server;
 	public final IntegratedServerPlayerNetworkManager networkManager;
 	private NetHandlerLoginServer.LoginState currentLoginState = NetHandlerLoginServer.LoginState.HELLO;
@@ -54,6 +57,8 @@ public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable
 	private GameProfile loginGameProfile;
 	private byte[] loginSkinPacket;
 	private byte[] loginCapePacket;
+	private int selectedProtocol = 3;
+	private EaglercraftUUID clientBrandUUID;
 	private String serverId = "";
 	private EntityPlayerMP field_181025_l;
 
@@ -61,7 +66,6 @@ public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable
 			IntegratedServerPlayerNetworkManager parNetworkManager) {
 		this.server = parMinecraftServer;
 		this.networkManager = parNetworkManager;
-		RANDOM.nextBytes(this.verifyToken);
 	}
 
 	/**+
@@ -76,9 +80,10 @@ public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable
 			if (entityplayermp == null) {
 				this.currentLoginState = NetHandlerLoginServer.LoginState.READY_TO_ACCEPT;
 				this.server.getConfigurationManager().initializeConnectionToPlayer(this.networkManager,
-						this.field_181025_l);
+						this.field_181025_l, this.selectedProtocol, this.clientBrandUUID);
 				((EaglerMinecraftServer) field_181025_l.mcServer).getSkinService()
-						.processLoginPacket(this.loginSkinPacket, field_181025_l);
+						.processLoginPacket(this.loginSkinPacket, field_181025_l, 3); // singleplayer always sends V3
+																						// skin in handshake
 				if (this.loginCapePacket != null) {
 					((EaglerMinecraftServer) field_181025_l.mcServer).getCapeService()
 							.processLoginPacket(this.loginCapePacket, field_181025_l);
@@ -115,7 +120,7 @@ public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable
 			this.closeConnection(s);
 		} else {
 			this.currentLoginState = NetHandlerLoginServer.LoginState.ACCEPTED;
-			this.networkManager.sendPacket(new S02PacketLoginSuccess(this.loginGameProfile));
+			this.networkManager.sendPacket(new S02PacketLoginSuccess(this.loginGameProfile, this.selectedProtocol));
 			this.networkManager.setConnectionState(EnumConnectionState.PLAY);
 			EntityPlayerMP entityplayermp = this.server.getConfigurationManager()
 					.getPlayerByUUID(this.loginGameProfile.getId());
@@ -124,9 +129,11 @@ public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable
 				this.field_181025_l = this.server.getConfigurationManager().createPlayerForUser(this.loginGameProfile);
 			} else {
 				entityplayermp = this.server.getConfigurationManager().createPlayerForUser(this.loginGameProfile);
-				this.server.getConfigurationManager().initializeConnectionToPlayer(this.networkManager, entityplayermp);
+				this.server.getConfigurationManager().initializeConnectionToPlayer(this.networkManager, entityplayermp,
+						this.selectedProtocol, this.clientBrandUUID);
 				((EaglerMinecraftServer) entityplayermp.mcServer).getSkinService()
-						.processLoginPacket(this.loginSkinPacket, entityplayermp);
+						.processLoginPacket(this.loginSkinPacket, entityplayermp, 3); // singleplayer always sends V3
+																						// skin in handshake
 				if (this.loginCapePacket != null) {
 					((EaglerMinecraftServer) entityplayermp.mcServer).getCapeService()
 							.processLoginPacket(this.loginCapePacket, entityplayermp);
@@ -157,9 +164,38 @@ public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable
 	public void processLoginStart(C00PacketLoginStart c00packetloginstart) {
 		Validate.validState(this.currentLoginState == NetHandlerLoginServer.LoginState.HELLO, "Unexpected hello packet",
 				new Object[0]);
+		if (c00packetloginstart.getProtocols() != null) {
+			try {
+				DataInputStream dis = new DataInputStream(new EaglerInputStream(c00packetloginstart.getProtocols()));
+				int maxSupported = -1;
+				int protocolCount = dis.readUnsignedShort();
+				for (int i = 0; i < protocolCount; ++i) {
+					int p = dis.readUnsignedShort();
+					if ((p == 3 || p == 4) && p > maxSupported) {
+						maxSupported = p;
+					}
+				}
+				if (maxSupported != -1) {
+					selectedProtocol = maxSupported;
+				} else {
+					this.closeConnection("Unknown protocol!");
+					return;
+				}
+			} catch (IOException ex) {
+				selectedProtocol = 3;
+			}
+		} else {
+			selectedProtocol = 3;
+		}
 		this.loginGameProfile = this.getOfflineProfile(c00packetloginstart.getProfile());
 		this.loginSkinPacket = c00packetloginstart.getSkin();
 		this.loginCapePacket = c00packetloginstart.getCape();
+		this.clientBrandUUID = selectedProtocol <= 3 ? EaglercraftVersion.legacyClientUUIDInSharedWorld
+				: c00packetloginstart.getBrandUUID();
+		if (ClientUUIDLoadingCache.PENDING_UUID.equals(clientBrandUUID)
+				|| ClientUUIDLoadingCache.VANILLA_UUID.equals(clientBrandUUID)) {
+			this.clientBrandUUID = null;
+		}
 		this.currentLoginState = NetHandlerLoginServer.LoginState.READY_TO_ACCEPT;
 	}
 
diff --git a/src/main/java/net/minecraft/stats/Achievement.java b/src/game/java/net/minecraft/stats/Achievement.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/Achievement.java
rename to src/game/java/net/minecraft/stats/Achievement.java
diff --git a/src/main/java/net/minecraft/stats/AchievementList.java b/src/game/java/net/minecraft/stats/AchievementList.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/AchievementList.java
rename to src/game/java/net/minecraft/stats/AchievementList.java
diff --git a/src/main/java/net/minecraft/stats/IStatStringFormat.java b/src/game/java/net/minecraft/stats/IStatStringFormat.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/IStatStringFormat.java
rename to src/game/java/net/minecraft/stats/IStatStringFormat.java
diff --git a/src/main/java/net/minecraft/stats/IStatType.java b/src/game/java/net/minecraft/stats/IStatType.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/IStatType.java
rename to src/game/java/net/minecraft/stats/IStatType.java
diff --git a/src/main/java/net/minecraft/stats/ObjectiveStat.java b/src/game/java/net/minecraft/stats/ObjectiveStat.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/ObjectiveStat.java
rename to src/game/java/net/minecraft/stats/ObjectiveStat.java
diff --git a/src/main/java/net/minecraft/stats/StatBase.java b/src/game/java/net/minecraft/stats/StatBase.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/StatBase.java
rename to src/game/java/net/minecraft/stats/StatBase.java
diff --git a/src/main/java/net/minecraft/stats/StatBasic.java b/src/game/java/net/minecraft/stats/StatBasic.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/StatBasic.java
rename to src/game/java/net/minecraft/stats/StatBasic.java
diff --git a/src/main/java/net/minecraft/stats/StatCrafting.java b/src/game/java/net/minecraft/stats/StatCrafting.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/StatCrafting.java
rename to src/game/java/net/minecraft/stats/StatCrafting.java
diff --git a/src/main/java/net/minecraft/stats/StatFileWriter.java b/src/game/java/net/minecraft/stats/StatFileWriter.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/StatFileWriter.java
rename to src/game/java/net/minecraft/stats/StatFileWriter.java
diff --git a/src/main/java/net/minecraft/stats/StatList.java b/src/game/java/net/minecraft/stats/StatList.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/StatList.java
rename to src/game/java/net/minecraft/stats/StatList.java
diff --git a/src/main/java/net/minecraft/stats/StatisticsFile.java b/src/game/java/net/minecraft/stats/StatisticsFile.java
similarity index 100%
rename from src/main/java/net/minecraft/stats/StatisticsFile.java
rename to src/game/java/net/minecraft/stats/StatisticsFile.java
diff --git a/src/main/java/net/minecraft/tileentity/IHopper.java b/src/game/java/net/minecraft/tileentity/IHopper.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/IHopper.java
rename to src/game/java/net/minecraft/tileentity/IHopper.java
diff --git a/src/main/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java b/src/game/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java
rename to src/game/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntity.java b/src/game/java/net/minecraft/tileentity/TileEntity.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntity.java
rename to src/game/java/net/minecraft/tileentity/TileEntity.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityBanner.java b/src/game/java/net/minecraft/tileentity/TileEntityBanner.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityBanner.java
rename to src/game/java/net/minecraft/tileentity/TileEntityBanner.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityBeacon.java b/src/game/java/net/minecraft/tileentity/TileEntityBeacon.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityBeacon.java
rename to src/game/java/net/minecraft/tileentity/TileEntityBeacon.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityBrewingStand.java b/src/game/java/net/minecraft/tileentity/TileEntityBrewingStand.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityBrewingStand.java
rename to src/game/java/net/minecraft/tileentity/TileEntityBrewingStand.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityChest.java b/src/game/java/net/minecraft/tileentity/TileEntityChest.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityChest.java
rename to src/game/java/net/minecraft/tileentity/TileEntityChest.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityCommandBlock.java b/src/game/java/net/minecraft/tileentity/TileEntityCommandBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityCommandBlock.java
rename to src/game/java/net/minecraft/tileentity/TileEntityCommandBlock.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityComparator.java b/src/game/java/net/minecraft/tileentity/TileEntityComparator.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityComparator.java
rename to src/game/java/net/minecraft/tileentity/TileEntityComparator.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityDaylightDetector.java b/src/game/java/net/minecraft/tileentity/TileEntityDaylightDetector.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityDaylightDetector.java
rename to src/game/java/net/minecraft/tileentity/TileEntityDaylightDetector.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityDispenser.java b/src/game/java/net/minecraft/tileentity/TileEntityDispenser.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityDispenser.java
rename to src/game/java/net/minecraft/tileentity/TileEntityDispenser.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityDropper.java b/src/game/java/net/minecraft/tileentity/TileEntityDropper.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityDropper.java
rename to src/game/java/net/minecraft/tileentity/TileEntityDropper.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java b/src/game/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java
rename to src/game/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityEndPortal.java b/src/game/java/net/minecraft/tileentity/TileEntityEndPortal.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityEndPortal.java
rename to src/game/java/net/minecraft/tileentity/TileEntityEndPortal.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityEnderChest.java b/src/game/java/net/minecraft/tileentity/TileEntityEnderChest.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityEnderChest.java
rename to src/game/java/net/minecraft/tileentity/TileEntityEnderChest.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityFlowerPot.java b/src/game/java/net/minecraft/tileentity/TileEntityFlowerPot.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityFlowerPot.java
rename to src/game/java/net/minecraft/tileentity/TileEntityFlowerPot.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityFurnace.java b/src/game/java/net/minecraft/tileentity/TileEntityFurnace.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityFurnace.java
rename to src/game/java/net/minecraft/tileentity/TileEntityFurnace.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityHopper.java b/src/game/java/net/minecraft/tileentity/TileEntityHopper.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityHopper.java
rename to src/game/java/net/minecraft/tileentity/TileEntityHopper.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityLockable.java b/src/game/java/net/minecraft/tileentity/TileEntityLockable.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityLockable.java
rename to src/game/java/net/minecraft/tileentity/TileEntityLockable.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityMobSpawner.java b/src/game/java/net/minecraft/tileentity/TileEntityMobSpawner.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityMobSpawner.java
rename to src/game/java/net/minecraft/tileentity/TileEntityMobSpawner.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityNote.java b/src/game/java/net/minecraft/tileentity/TileEntityNote.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityNote.java
rename to src/game/java/net/minecraft/tileentity/TileEntityNote.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityPiston.java b/src/game/java/net/minecraft/tileentity/TileEntityPiston.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntityPiston.java
rename to src/game/java/net/minecraft/tileentity/TileEntityPiston.java
diff --git a/src/main/java/net/minecraft/tileentity/TileEntitySign.java b/src/game/java/net/minecraft/tileentity/TileEntitySign.java
similarity index 87%
rename from src/main/java/net/minecraft/tileentity/TileEntitySign.java
rename to src/game/java/net/minecraft/tileentity/TileEntitySign.java
index ff65265..cc54715 100755
--- a/src/main/java/net/minecraft/tileentity/TileEntitySign.java
+++ b/src/game/java/net/minecraft/tileentity/TileEntitySign.java
@@ -1,5 +1,7 @@
 package net.minecraft.tileentity;
 
+import net.lax1dude.eaglercraft.v1_8.profanity_filter.ProfanityFilter;
+import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.CommandResultStats;
 import net.minecraft.command.ICommandSender;
@@ -43,6 +45,7 @@ import org.json.JSONException;
 public class TileEntitySign extends TileEntity {
 	public final IChatComponent[] signText = new IChatComponent[] { new ChatComponentText(""),
 			new ChatComponentText(""), new ChatComponentText(""), new ChatComponentText("") };
+	protected IChatComponent[] signTextProfanityFilter = null;
 	/**+
 	 * The index of the line currently being edited. Only used on
 	 * client side, but defined on both. Note this is only really
@@ -64,6 +67,25 @@ public class TileEntitySign extends TileEntity {
 		this.stats.writeStatsToNBT(nbttagcompound);
 	}
 
+	public IChatComponent[] getSignTextProfanityFilter() {
+		if (Minecraft.getMinecraft().isEnableProfanityFilter()) {
+			if (signTextProfanityFilter == null) {
+				signTextProfanityFilter = new IChatComponent[4];
+				ProfanityFilter filter = ProfanityFilter.getInstance();
+				for (int i = 0; i < 4; ++i) {
+					signTextProfanityFilter[i] = filter.profanityFilterChatComponent(signText[i]);
+				}
+			}
+			return signTextProfanityFilter;
+		} else {
+			return signText;
+		}
+	}
+
+	public void clearProfanityFilterCache() {
+		signTextProfanityFilter = null;
+	}
+
 	public void readFromNBT(NBTTagCompound nbttagcompound) {
 		this.isEditable = false;
 		super.readFromNBT(nbttagcompound);
diff --git a/src/main/java/net/minecraft/tileentity/TileEntitySkull.java b/src/game/java/net/minecraft/tileentity/TileEntitySkull.java
similarity index 100%
rename from src/main/java/net/minecraft/tileentity/TileEntitySkull.java
rename to src/game/java/net/minecraft/tileentity/TileEntitySkull.java
diff --git a/src/main/java/net/minecraft/util/AxisAlignedBB.java b/src/game/java/net/minecraft/util/AxisAlignedBB.java
similarity index 100%
rename from src/main/java/net/minecraft/util/AxisAlignedBB.java
rename to src/game/java/net/minecraft/util/AxisAlignedBB.java
diff --git a/src/main/java/net/minecraft/util/BlockPos.java b/src/game/java/net/minecraft/util/BlockPos.java
similarity index 100%
rename from src/main/java/net/minecraft/util/BlockPos.java
rename to src/game/java/net/minecraft/util/BlockPos.java
diff --git a/src/main/java/net/minecraft/util/Cartesian.java b/src/game/java/net/minecraft/util/Cartesian.java
similarity index 100%
rename from src/main/java/net/minecraft/util/Cartesian.java
rename to src/game/java/net/minecraft/util/Cartesian.java
diff --git a/src/main/java/net/minecraft/util/ChatAllowedCharacters.java b/src/game/java/net/minecraft/util/ChatAllowedCharacters.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ChatAllowedCharacters.java
rename to src/game/java/net/minecraft/util/ChatAllowedCharacters.java
diff --git a/src/main/java/net/minecraft/util/ChatComponentProcessor.java b/src/game/java/net/minecraft/util/ChatComponentProcessor.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ChatComponentProcessor.java
rename to src/game/java/net/minecraft/util/ChatComponentProcessor.java
diff --git a/src/main/java/net/minecraft/util/ChatComponentScore.java b/src/game/java/net/minecraft/util/ChatComponentScore.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ChatComponentScore.java
rename to src/game/java/net/minecraft/util/ChatComponentScore.java
diff --git a/src/main/java/net/minecraft/util/ChatComponentSelector.java b/src/game/java/net/minecraft/util/ChatComponentSelector.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ChatComponentSelector.java
rename to src/game/java/net/minecraft/util/ChatComponentSelector.java
diff --git a/src/main/java/net/minecraft/util/ChatComponentStyle.java b/src/game/java/net/minecraft/util/ChatComponentStyle.java
similarity index 95%
rename from src/main/java/net/minecraft/util/ChatComponentStyle.java
rename to src/game/java/net/minecraft/util/ChatComponentStyle.java
index 43d13e6..b7a53db 100755
--- a/src/main/java/net/minecraft/util/ChatComponentStyle.java
+++ b/src/game/java/net/minecraft/util/ChatComponentStyle.java
@@ -81,6 +81,10 @@ public abstract class ChatComponentStyle implements IChatComponent {
 		return this.style;
 	}
 
+	public ChatStyle getChatStyleIfPresent() {
+		return this.style;
+	}
+
 	public Iterator<IChatComponent> iterator() {
 		return Iterators.concat(Iterators.forArray(new ChatComponentStyle[] { this }),
 				createDeepCopyIterator(this.siblings));
diff --git a/src/main/java/net/minecraft/util/ChatComponentText.java b/src/game/java/net/minecraft/util/ChatComponentText.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ChatComponentText.java
rename to src/game/java/net/minecraft/util/ChatComponentText.java
diff --git a/src/main/java/net/minecraft/util/ChatComponentTranslation.java b/src/game/java/net/minecraft/util/ChatComponentTranslation.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ChatComponentTranslation.java
rename to src/game/java/net/minecraft/util/ChatComponentTranslation.java
diff --git a/src/main/java/net/minecraft/util/ChatComponentTranslationFormatException.java b/src/game/java/net/minecraft/util/ChatComponentTranslationFormatException.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ChatComponentTranslationFormatException.java
rename to src/game/java/net/minecraft/util/ChatComponentTranslationFormatException.java
diff --git a/src/main/java/net/minecraft/util/ChatStyle.java b/src/game/java/net/minecraft/util/ChatStyle.java
similarity index 95%
rename from src/main/java/net/minecraft/util/ChatStyle.java
rename to src/game/java/net/minecraft/util/ChatStyle.java
index 8135c68..386fbe1 100755
--- a/src/main/java/net/minecraft/util/ChatStyle.java
+++ b/src/game/java/net/minecraft/util/ChatStyle.java
@@ -600,8 +600,15 @@ public class ChatStyle {
 						String jsonprimitive2 = jsonobject2.getString("action");
 						HoverEvent.Action hoverevent$action = jsonprimitive2 == null ? null
 								: HoverEvent.Action.getValueByCanonicalName(jsonprimitive2);
-						IChatComponent ichatcomponent = JSONTypeProvider.deserializeNoCast(jsonobject2.get("value"),
-								IChatComponent.class);
+						Object val = jsonobject2.opt("value");
+						if (val == null) {
+							val = jsonobject2.opt("contents");
+							if (val == null) {
+								throw new JSONException(
+										"JSONObject[\"value\"] or JSONObject[\"contents\"] could not be found");
+							}
+						}
+						IChatComponent ichatcomponent = JSONTypeProvider.deserializeNoCast(val, IChatComponent.class);
 						if (hoverevent$action != null && ichatcomponent != null
 								&& hoverevent$action.shouldAllowInChat()) {
 							chatstyle.chatHoverEvent = new HoverEvent(hoverevent$action, ichatcomponent);
diff --git a/src/main/java/net/minecraft/util/ClassInheritanceMultiMap.java b/src/game/java/net/minecraft/util/ClassInheritanceMultiMap.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ClassInheritanceMultiMap.java
rename to src/game/java/net/minecraft/util/ClassInheritanceMultiMap.java
diff --git a/src/main/java/net/minecraft/util/CombatEntry.java b/src/game/java/net/minecraft/util/CombatEntry.java
similarity index 100%
rename from src/main/java/net/minecraft/util/CombatEntry.java
rename to src/game/java/net/minecraft/util/CombatEntry.java
diff --git a/src/main/java/net/minecraft/util/CombatTracker.java b/src/game/java/net/minecraft/util/CombatTracker.java
similarity index 100%
rename from src/main/java/net/minecraft/util/CombatTracker.java
rename to src/game/java/net/minecraft/util/CombatTracker.java
diff --git a/src/main/java/net/minecraft/util/DamageSource.java b/src/game/java/net/minecraft/util/DamageSource.java
similarity index 100%
rename from src/main/java/net/minecraft/util/DamageSource.java
rename to src/game/java/net/minecraft/util/DamageSource.java
diff --git a/src/main/java/net/minecraft/util/EnchantmentNameParts.java b/src/game/java/net/minecraft/util/EnchantmentNameParts.java
similarity index 100%
rename from src/main/java/net/minecraft/util/EnchantmentNameParts.java
rename to src/game/java/net/minecraft/util/EnchantmentNameParts.java
diff --git a/src/main/java/net/minecraft/util/EntityDamageSource.java b/src/game/java/net/minecraft/util/EntityDamageSource.java
similarity index 100%
rename from src/main/java/net/minecraft/util/EntityDamageSource.java
rename to src/game/java/net/minecraft/util/EntityDamageSource.java
diff --git a/src/main/java/net/minecraft/util/EntityDamageSourceIndirect.java b/src/game/java/net/minecraft/util/EntityDamageSourceIndirect.java
similarity index 100%
rename from src/main/java/net/minecraft/util/EntityDamageSourceIndirect.java
rename to src/game/java/net/minecraft/util/EntityDamageSourceIndirect.java
diff --git a/src/main/java/net/minecraft/util/EntitySelectors.java b/src/game/java/net/minecraft/util/EntitySelectors.java
similarity index 100%
rename from src/main/java/net/minecraft/util/EntitySelectors.java
rename to src/game/java/net/minecraft/util/EntitySelectors.java
diff --git a/src/main/java/net/minecraft/util/EnumChatFormatting.java b/src/game/java/net/minecraft/util/EnumChatFormatting.java
similarity index 100%
rename from src/main/java/net/minecraft/util/EnumChatFormatting.java
rename to src/game/java/net/minecraft/util/EnumChatFormatting.java
diff --git a/src/main/java/net/minecraft/util/EnumFacing.java b/src/game/java/net/minecraft/util/EnumFacing.java
similarity index 100%
rename from src/main/java/net/minecraft/util/EnumFacing.java
rename to src/game/java/net/minecraft/util/EnumFacing.java
diff --git a/src/main/java/net/minecraft/util/EnumParticleTypes.java b/src/game/java/net/minecraft/util/EnumParticleTypes.java
similarity index 100%
rename from src/main/java/net/minecraft/util/EnumParticleTypes.java
rename to src/game/java/net/minecraft/util/EnumParticleTypes.java
diff --git a/src/main/java/net/minecraft/util/EnumWorldBlockLayer.java b/src/game/java/net/minecraft/util/EnumWorldBlockLayer.java
similarity index 100%
rename from src/main/java/net/minecraft/util/EnumWorldBlockLayer.java
rename to src/game/java/net/minecraft/util/EnumWorldBlockLayer.java
diff --git a/src/main/java/net/minecraft/util/FoodStats.java b/src/game/java/net/minecraft/util/FoodStats.java
similarity index 100%
rename from src/main/java/net/minecraft/util/FoodStats.java
rename to src/game/java/net/minecraft/util/FoodStats.java
diff --git a/src/main/java/net/minecraft/util/FrameTimer.java b/src/game/java/net/minecraft/util/FrameTimer.java
similarity index 100%
rename from src/main/java/net/minecraft/util/FrameTimer.java
rename to src/game/java/net/minecraft/util/FrameTimer.java
diff --git a/src/main/java/net/minecraft/util/IChatComponent.java b/src/game/java/net/minecraft/util/IChatComponent.java
similarity index 100%
rename from src/main/java/net/minecraft/util/IChatComponent.java
rename to src/game/java/net/minecraft/util/IChatComponent.java
diff --git a/src/main/java/net/minecraft/util/IJsonSerializable.java b/src/game/java/net/minecraft/util/IJsonSerializable.java
similarity index 100%
rename from src/main/java/net/minecraft/util/IJsonSerializable.java
rename to src/game/java/net/minecraft/util/IJsonSerializable.java
diff --git a/src/main/java/net/minecraft/util/IObjectIntIterable.java b/src/game/java/net/minecraft/util/IObjectIntIterable.java
similarity index 100%
rename from src/main/java/net/minecraft/util/IObjectIntIterable.java
rename to src/game/java/net/minecraft/util/IObjectIntIterable.java
diff --git a/src/main/java/net/minecraft/util/IProgressUpdate.java b/src/game/java/net/minecraft/util/IProgressUpdate.java
similarity index 100%
rename from src/main/java/net/minecraft/util/IProgressUpdate.java
rename to src/game/java/net/minecraft/util/IProgressUpdate.java
diff --git a/src/main/java/net/minecraft/util/IRegistry.java b/src/game/java/net/minecraft/util/IRegistry.java
similarity index 100%
rename from src/main/java/net/minecraft/util/IRegistry.java
rename to src/game/java/net/minecraft/util/IRegistry.java
diff --git a/src/main/java/net/minecraft/util/IStringSerializable.java b/src/game/java/net/minecraft/util/IStringSerializable.java
similarity index 100%
rename from src/main/java/net/minecraft/util/IStringSerializable.java
rename to src/game/java/net/minecraft/util/IStringSerializable.java
diff --git a/src/main/java/net/minecraft/util/IThreadListener.java b/src/game/java/net/minecraft/util/IThreadListener.java
similarity index 100%
rename from src/main/java/net/minecraft/util/IThreadListener.java
rename to src/game/java/net/minecraft/util/IThreadListener.java
diff --git a/src/main/java/net/minecraft/util/ITickable.java b/src/game/java/net/minecraft/util/ITickable.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ITickable.java
rename to src/game/java/net/minecraft/util/ITickable.java
diff --git a/src/main/java/net/minecraft/util/IntHashMap.java b/src/game/java/net/minecraft/util/IntHashMap.java
similarity index 100%
rename from src/main/java/net/minecraft/util/IntHashMap.java
rename to src/game/java/net/minecraft/util/IntHashMap.java
diff --git a/src/main/java/net/minecraft/util/IntegerCache.java b/src/game/java/net/minecraft/util/IntegerCache.java
similarity index 100%
rename from src/main/java/net/minecraft/util/IntegerCache.java
rename to src/game/java/net/minecraft/util/IntegerCache.java
diff --git a/src/main/java/net/minecraft/util/JsonSerializableSet.java b/src/game/java/net/minecraft/util/JsonSerializableSet.java
similarity index 100%
rename from src/main/java/net/minecraft/util/JsonSerializableSet.java
rename to src/game/java/net/minecraft/util/JsonSerializableSet.java
diff --git a/src/main/java/net/minecraft/util/LazyLoadBase.java b/src/game/java/net/minecraft/util/LazyLoadBase.java
similarity index 100%
rename from src/main/java/net/minecraft/util/LazyLoadBase.java
rename to src/game/java/net/minecraft/util/LazyLoadBase.java
diff --git a/src/main/java/net/minecraft/util/LoggingPrintStream.java b/src/game/java/net/minecraft/util/LoggingPrintStream.java
similarity index 100%
rename from src/main/java/net/minecraft/util/LoggingPrintStream.java
rename to src/game/java/net/minecraft/util/LoggingPrintStream.java
diff --git a/src/main/java/net/minecraft/util/LongHashMap.java b/src/game/java/net/minecraft/util/LongHashMap.java
similarity index 100%
rename from src/main/java/net/minecraft/util/LongHashMap.java
rename to src/game/java/net/minecraft/util/LongHashMap.java
diff --git a/src/main/java/net/minecraft/util/MapPopulator.java b/src/game/java/net/minecraft/util/MapPopulator.java
similarity index 100%
rename from src/main/java/net/minecraft/util/MapPopulator.java
rename to src/game/java/net/minecraft/util/MapPopulator.java
diff --git a/src/main/java/net/minecraft/util/MathHelper.java b/src/game/java/net/minecraft/util/MathHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/util/MathHelper.java
rename to src/game/java/net/minecraft/util/MathHelper.java
diff --git a/src/main/java/net/minecraft/util/Matrix4f.java b/src/game/java/net/minecraft/util/Matrix4f.java
similarity index 100%
rename from src/main/java/net/minecraft/util/Matrix4f.java
rename to src/game/java/net/minecraft/util/Matrix4f.java
diff --git a/src/main/java/net/minecraft/util/MinecraftError.java b/src/game/java/net/minecraft/util/MinecraftError.java
similarity index 100%
rename from src/main/java/net/minecraft/util/MinecraftError.java
rename to src/game/java/net/minecraft/util/MinecraftError.java
diff --git a/src/main/java/net/minecraft/util/MouseFilter.java b/src/game/java/net/minecraft/util/MouseFilter.java
similarity index 100%
rename from src/main/java/net/minecraft/util/MouseFilter.java
rename to src/game/java/net/minecraft/util/MouseFilter.java
diff --git a/src/main/java/net/minecraft/util/MouseHelper.java b/src/game/java/net/minecraft/util/MouseHelper.java
similarity index 88%
rename from src/main/java/net/minecraft/util/MouseHelper.java
rename to src/game/java/net/minecraft/util/MouseHelper.java
index 7e25d51..100efb1 100755
--- a/src/main/java/net/minecraft/util/MouseHelper.java
+++ b/src/game/java/net/minecraft/util/MouseHelper.java
@@ -2,6 +2,7 @@ package net.minecraft.util;
 
 import net.lax1dude.eaglercraft.v1_8.Display;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -46,7 +47,7 @@ public class MouseHelper {
 	}
 
 	public void mouseXYChange() {
-		this.deltaX = Mouse.getDX();
-		this.deltaY = Mouse.getDY();
+		this.deltaX = PointerInputAbstraction.getVCursorDX();
+		this.deltaY = PointerInputAbstraction.getVCursorDY();
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/util/MovementInput.java b/src/game/java/net/minecraft/util/MovementInput.java
similarity index 100%
rename from src/main/java/net/minecraft/util/MovementInput.java
rename to src/game/java/net/minecraft/util/MovementInput.java
diff --git a/src/main/java/net/minecraft/util/MovementInputFromOptions.java b/src/game/java/net/minecraft/util/MovementInputFromOptions.java
similarity index 60%
rename from src/main/java/net/minecraft/util/MovementInputFromOptions.java
rename to src/game/java/net/minecraft/util/MovementInputFromOptions.java
index b08ad85..2b04406 100755
--- a/src/main/java/net/minecraft/util/MovementInputFromOptions.java
+++ b/src/game/java/net/minecraft/util/MovementInputFromOptions.java
@@ -1,5 +1,7 @@
 package net.minecraft.util;
 
+import net.lax1dude.eaglercraft.v1_8.touch_gui.EnumTouchControl;
+import net.lax1dude.eaglercraft.v1_8.touch_gui.TouchControls;
 import net.minecraft.client.settings.GameSettings;
 
 /**+
@@ -32,24 +34,30 @@ public class MovementInputFromOptions extends MovementInput {
 	public void updatePlayerMoveState() {
 		this.moveStrafe = 0.0F;
 		this.moveForward = 0.0F;
-		if (this.gameSettings.keyBindForward.isKeyDown()) {
+		if (this.gameSettings.keyBindForward.isKeyDown() || TouchControls.isPressed(EnumTouchControl.DPAD_UP)
+				|| TouchControls.isPressed(EnumTouchControl.DPAD_UP_LEFT)
+				|| TouchControls.isPressed(EnumTouchControl.DPAD_UP_RIGHT)) {
 			++this.moveForward;
 		}
 
-		if (this.gameSettings.keyBindBack.isKeyDown()) {
+		if (this.gameSettings.keyBindBack.isKeyDown() || TouchControls.isPressed(EnumTouchControl.DPAD_DOWN)) {
 			--this.moveForward;
 		}
 
-		if (this.gameSettings.keyBindLeft.isKeyDown()) {
+		if (this.gameSettings.keyBindLeft.isKeyDown() || TouchControls.isPressed(EnumTouchControl.DPAD_LEFT)
+				|| TouchControls.isPressed(EnumTouchControl.DPAD_UP_LEFT)) {
 			++this.moveStrafe;
 		}
 
-		if (this.gameSettings.keyBindRight.isKeyDown()) {
+		if (this.gameSettings.keyBindRight.isKeyDown() || TouchControls.isPressed(EnumTouchControl.DPAD_RIGHT)
+				|| TouchControls.isPressed(EnumTouchControl.DPAD_UP_RIGHT)) {
 			--this.moveStrafe;
 		}
 
-		this.jump = this.gameSettings.keyBindJump.isKeyDown();
-		this.sneak = this.gameSettings.keyBindSneak.isKeyDown();
+		this.jump = this.gameSettings.keyBindJump.isKeyDown() || TouchControls.isPressed(EnumTouchControl.JUMP)
+				|| TouchControls.isPressed(EnumTouchControl.FLY_UP);
+		this.sneak = this.gameSettings.keyBindSneak.isKeyDown() || TouchControls.getSneakToggled()
+				|| TouchControls.isPressed(EnumTouchControl.FLY_DOWN);
 		if (this.sneak) {
 			this.moveStrafe = (float) ((double) this.moveStrafe * 0.3D);
 			this.moveForward = (float) ((double) this.moveForward * 0.3D);
diff --git a/src/main/java/net/minecraft/util/MovingObjectPosition.java b/src/game/java/net/minecraft/util/MovingObjectPosition.java
similarity index 100%
rename from src/main/java/net/minecraft/util/MovingObjectPosition.java
rename to src/game/java/net/minecraft/util/MovingObjectPosition.java
diff --git a/src/main/java/net/minecraft/util/ObjectIntIdentityMap.java b/src/game/java/net/minecraft/util/ObjectIntIdentityMap.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ObjectIntIdentityMap.java
rename to src/game/java/net/minecraft/util/ObjectIntIdentityMap.java
diff --git a/src/main/java/net/minecraft/util/RegistryDefaulted.java b/src/game/java/net/minecraft/util/RegistryDefaulted.java
similarity index 100%
rename from src/main/java/net/minecraft/util/RegistryDefaulted.java
rename to src/game/java/net/minecraft/util/RegistryDefaulted.java
diff --git a/src/main/java/net/minecraft/util/RegistryNamespaced.java b/src/game/java/net/minecraft/util/RegistryNamespaced.java
similarity index 100%
rename from src/main/java/net/minecraft/util/RegistryNamespaced.java
rename to src/game/java/net/minecraft/util/RegistryNamespaced.java
diff --git a/src/main/java/net/minecraft/util/RegistryNamespacedDefaultedByKey.java b/src/game/java/net/minecraft/util/RegistryNamespacedDefaultedByKey.java
similarity index 100%
rename from src/main/java/net/minecraft/util/RegistryNamespacedDefaultedByKey.java
rename to src/game/java/net/minecraft/util/RegistryNamespacedDefaultedByKey.java
diff --git a/src/main/java/net/minecraft/util/RegistrySimple.java b/src/game/java/net/minecraft/util/RegistrySimple.java
similarity index 100%
rename from src/main/java/net/minecraft/util/RegistrySimple.java
rename to src/game/java/net/minecraft/util/RegistrySimple.java
diff --git a/src/main/java/net/minecraft/util/ReportedException.java b/src/game/java/net/minecraft/util/ReportedException.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ReportedException.java
rename to src/game/java/net/minecraft/util/ReportedException.java
diff --git a/src/main/java/net/minecraft/util/ResourceLocation.java b/src/game/java/net/minecraft/util/ResourceLocation.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ResourceLocation.java
rename to src/game/java/net/minecraft/util/ResourceLocation.java
diff --git a/src/main/java/net/minecraft/util/Rotations.java b/src/game/java/net/minecraft/util/Rotations.java
similarity index 100%
rename from src/main/java/net/minecraft/util/Rotations.java
rename to src/game/java/net/minecraft/util/Rotations.java
diff --git a/src/main/java/net/minecraft/util/ScreenShotHelper.java b/src/game/java/net/minecraft/util/ScreenShotHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/util/ScreenShotHelper.java
rename to src/game/java/net/minecraft/util/ScreenShotHelper.java
diff --git a/src/main/java/net/minecraft/util/Session.java b/src/game/java/net/minecraft/util/Session.java
similarity index 90%
rename from src/main/java/net/minecraft/util/Session.java
rename to src/game/java/net/minecraft/util/Session.java
index 0c57aa7..9743737 100755
--- a/src/main/java/net/minecraft/util/Session.java
+++ b/src/game/java/net/minecraft/util/Session.java
@@ -29,7 +29,7 @@ import net.minecraft.entity.player.EntityPlayer;
 public class Session {
 	private GameProfile profile;
 
-	private static final EaglercraftUUID offlineUUID;
+	private static final EaglercraftUUID outOfGameUUID;
 
 	public Session() {
 		reset();
@@ -44,7 +44,7 @@ public class Session {
 	}
 
 	public void reset() {
-		update(EaglerProfile.getName(), offlineUUID);
+		update(EaglerProfile.getName(), outOfGameUUID);
 	}
 
 	public void setLAN() {
@@ -54,7 +54,7 @@ public class Session {
 	static {
 		byte[] bytes = new byte[16];
 		(new EaglercraftRandom()).nextBytes(bytes);
-		offlineUUID = new EaglercraftUUID(bytes);
+		outOfGameUUID = new EaglercraftUUID(bytes);
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/util/StatCollector.java b/src/game/java/net/minecraft/util/StatCollector.java
similarity index 100%
rename from src/main/java/net/minecraft/util/StatCollector.java
rename to src/game/java/net/minecraft/util/StatCollector.java
diff --git a/src/main/java/net/minecraft/util/StringTranslate.java b/src/game/java/net/minecraft/util/StringTranslate.java
similarity index 92%
rename from src/main/java/net/minecraft/util/StringTranslate.java
rename to src/game/java/net/minecraft/util/StringTranslate.java
index ab9ad9e..ae34f3d 100755
--- a/src/main/java/net/minecraft/util/StringTranslate.java
+++ b/src/game/java/net/minecraft/util/StringTranslate.java
@@ -62,7 +62,7 @@ public class StringTranslate {
 	}
 
 	public static void initClient() {
-		try (InputStream inputstream = EagRuntime.getResourceStream("/assets/minecraft/lang/en_US.lang")) {
+		try (InputStream inputstream = EagRuntime.getRequiredResourceStream("/assets/minecraft/lang/en_US.lang")) {
 			initServer(IOUtils.readLines(inputstream, StandardCharsets.UTF_8));
 			fallbackInstance = new StringTranslate();
 			fallbackInstance.replaceWith(instance.languageList);
@@ -89,7 +89,7 @@ public class StringTranslate {
 			}
 		}
 
-		instance.lastUpdateTimeInMilliseconds = System.currentTimeMillis();
+		instance.lastUpdateTimeInMilliseconds = EagRuntime.steadyTimeMillis();
 	}
 
 	/**+
@@ -106,7 +106,7 @@ public class StringTranslate {
 	public static void replaceWith(Map<String, String> parMap) {
 		instance.languageList.clear();
 		instance.languageList.putAll(parMap);
-		instance.lastUpdateTimeInMilliseconds = System.currentTimeMillis();
+		instance.lastUpdateTimeInMilliseconds = EagRuntime.steadyTimeMillis();
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/util/StringUtils.java b/src/game/java/net/minecraft/util/StringUtils.java
similarity index 95%
rename from src/main/java/net/minecraft/util/StringUtils.java
rename to src/game/java/net/minecraft/util/StringUtils.java
index 95632eb..cb02416 100755
--- a/src/main/java/net/minecraft/util/StringUtils.java
+++ b/src/game/java/net/minecraft/util/StringUtils.java
@@ -51,6 +51,6 @@ public class StringUtils {
 	private static final Pattern patternControlCodeAlternate = Pattern.compile("(?i)&([0-9A-FK-OR])");
 
 	public static String translateControlCodesAlternate(String parString1) {
-		return patternControlCodeAlternate.matcher(parString1).replaceAll("\u00A7$1");
+		return patternControlCodeAlternate.matcher(parString1).replaceAll(new String(new char[] { 0xA7, '$', '1' }));
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/util/Timer.java b/src/game/java/net/minecraft/util/Timer.java
similarity index 92%
rename from src/main/java/net/minecraft/util/Timer.java
rename to src/game/java/net/minecraft/util/Timer.java
index 56dd004..721001e 100755
--- a/src/main/java/net/minecraft/util/Timer.java
+++ b/src/game/java/net/minecraft/util/Timer.java
@@ -1,5 +1,6 @@
 package net.minecraft.util;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.minecraft.client.Minecraft;
 
 /**+
@@ -45,7 +46,7 @@ public class Timer {
 	public Timer(float parFloat1) {
 		this.ticksPerSecond = parFloat1;
 		this.lastSyncSysClock = Minecraft.getSystemTime();
-		this.lastSyncHRClock = System.nanoTime() / 1000000L;
+		this.lastSyncHRClock = EagRuntime.nanoTime() / 1000000L;
 	}
 
 	/**+
@@ -54,7 +55,7 @@ public class Timer {
 	public void updateTimer() {
 		long i = Minecraft.getSystemTime();
 		long j = i - this.lastSyncSysClock;
-		long k = System.nanoTime() / 1000000L;
+		long k = EagRuntime.nanoTime() / 1000000L;
 		double d0 = (double) k / 1000.0D;
 		if (j <= 1000L && j >= 0L) {
 			this.field_74285_i += j;
diff --git a/src/main/java/net/minecraft/util/Tuple.java b/src/game/java/net/minecraft/util/Tuple.java
similarity index 100%
rename from src/main/java/net/minecraft/util/Tuple.java
rename to src/game/java/net/minecraft/util/Tuple.java
diff --git a/src/main/java/net/minecraft/util/TupleIntJsonSerializable.java b/src/game/java/net/minecraft/util/TupleIntJsonSerializable.java
similarity index 100%
rename from src/main/java/net/minecraft/util/TupleIntJsonSerializable.java
rename to src/game/java/net/minecraft/util/TupleIntJsonSerializable.java
diff --git a/src/main/java/net/minecraft/util/Util.java b/src/game/java/net/minecraft/util/Util.java
similarity index 100%
rename from src/main/java/net/minecraft/util/Util.java
rename to src/game/java/net/minecraft/util/Util.java
diff --git a/src/main/java/net/minecraft/util/Vec3.java b/src/game/java/net/minecraft/util/Vec3.java
similarity index 100%
rename from src/main/java/net/minecraft/util/Vec3.java
rename to src/game/java/net/minecraft/util/Vec3.java
diff --git a/src/main/java/net/minecraft/util/Vec3i.java b/src/game/java/net/minecraft/util/Vec3i.java
similarity index 100%
rename from src/main/java/net/minecraft/util/Vec3i.java
rename to src/game/java/net/minecraft/util/Vec3i.java
diff --git a/src/main/java/net/minecraft/util/Vec4b.java b/src/game/java/net/minecraft/util/Vec4b.java
similarity index 100%
rename from src/main/java/net/minecraft/util/Vec4b.java
rename to src/game/java/net/minecraft/util/Vec4b.java
diff --git a/src/main/java/net/minecraft/util/Vector3d.java b/src/game/java/net/minecraft/util/Vector3d.java
similarity index 100%
rename from src/main/java/net/minecraft/util/Vector3d.java
rename to src/game/java/net/minecraft/util/Vector3d.java
diff --git a/src/main/java/net/minecraft/util/WeightedRandom.java b/src/game/java/net/minecraft/util/WeightedRandom.java
similarity index 100%
rename from src/main/java/net/minecraft/util/WeightedRandom.java
rename to src/game/java/net/minecraft/util/WeightedRandom.java
diff --git a/src/main/java/net/minecraft/util/WeightedRandomChestContent.java b/src/game/java/net/minecraft/util/WeightedRandomChestContent.java
similarity index 100%
rename from src/main/java/net/minecraft/util/WeightedRandomChestContent.java
rename to src/game/java/net/minecraft/util/WeightedRandomChestContent.java
diff --git a/src/main/java/net/minecraft/util/WeightedRandomFishable.java b/src/game/java/net/minecraft/util/WeightedRandomFishable.java
similarity index 100%
rename from src/main/java/net/minecraft/util/WeightedRandomFishable.java
rename to src/game/java/net/minecraft/util/WeightedRandomFishable.java
diff --git a/src/main/java/net/minecraft/village/MerchantRecipe.java b/src/game/java/net/minecraft/village/MerchantRecipe.java
similarity index 100%
rename from src/main/java/net/minecraft/village/MerchantRecipe.java
rename to src/game/java/net/minecraft/village/MerchantRecipe.java
diff --git a/src/main/java/net/minecraft/village/MerchantRecipeList.java b/src/game/java/net/minecraft/village/MerchantRecipeList.java
similarity index 100%
rename from src/main/java/net/minecraft/village/MerchantRecipeList.java
rename to src/game/java/net/minecraft/village/MerchantRecipeList.java
diff --git a/src/main/java/net/minecraft/village/Village.java b/src/game/java/net/minecraft/village/Village.java
similarity index 100%
rename from src/main/java/net/minecraft/village/Village.java
rename to src/game/java/net/minecraft/village/Village.java
diff --git a/src/main/java/net/minecraft/village/VillageCollection.java b/src/game/java/net/minecraft/village/VillageCollection.java
similarity index 100%
rename from src/main/java/net/minecraft/village/VillageCollection.java
rename to src/game/java/net/minecraft/village/VillageCollection.java
diff --git a/src/main/java/net/minecraft/village/VillageDoorInfo.java b/src/game/java/net/minecraft/village/VillageDoorInfo.java
similarity index 100%
rename from src/main/java/net/minecraft/village/VillageDoorInfo.java
rename to src/game/java/net/minecraft/village/VillageDoorInfo.java
diff --git a/src/main/java/net/minecraft/village/VillageSiege.java b/src/game/java/net/minecraft/village/VillageSiege.java
similarity index 100%
rename from src/main/java/net/minecraft/village/VillageSiege.java
rename to src/game/java/net/minecraft/village/VillageSiege.java
diff --git a/src/main/java/net/minecraft/world/ChunkCache.java b/src/game/java/net/minecraft/world/ChunkCache.java
similarity index 100%
rename from src/main/java/net/minecraft/world/ChunkCache.java
rename to src/game/java/net/minecraft/world/ChunkCache.java
diff --git a/src/main/java/net/minecraft/world/ChunkCoordIntPair.java b/src/game/java/net/minecraft/world/ChunkCoordIntPair.java
similarity index 100%
rename from src/main/java/net/minecraft/world/ChunkCoordIntPair.java
rename to src/game/java/net/minecraft/world/ChunkCoordIntPair.java
diff --git a/src/main/java/net/minecraft/world/ColorizerFoliage.java b/src/game/java/net/minecraft/world/ColorizerFoliage.java
similarity index 100%
rename from src/main/java/net/minecraft/world/ColorizerFoliage.java
rename to src/game/java/net/minecraft/world/ColorizerFoliage.java
diff --git a/src/main/java/net/minecraft/world/ColorizerGrass.java b/src/game/java/net/minecraft/world/ColorizerGrass.java
similarity index 100%
rename from src/main/java/net/minecraft/world/ColorizerGrass.java
rename to src/game/java/net/minecraft/world/ColorizerGrass.java
diff --git a/src/main/java/net/minecraft/world/DifficultyInstance.java b/src/game/java/net/minecraft/world/DifficultyInstance.java
similarity index 100%
rename from src/main/java/net/minecraft/world/DifficultyInstance.java
rename to src/game/java/net/minecraft/world/DifficultyInstance.java
diff --git a/src/main/java/net/minecraft/world/EnumDifficulty.java b/src/game/java/net/minecraft/world/EnumDifficulty.java
similarity index 100%
rename from src/main/java/net/minecraft/world/EnumDifficulty.java
rename to src/game/java/net/minecraft/world/EnumDifficulty.java
diff --git a/src/main/java/net/minecraft/world/EnumSkyBlock.java b/src/game/java/net/minecraft/world/EnumSkyBlock.java
similarity index 100%
rename from src/main/java/net/minecraft/world/EnumSkyBlock.java
rename to src/game/java/net/minecraft/world/EnumSkyBlock.java
diff --git a/src/main/java/net/minecraft/world/Explosion.java b/src/game/java/net/minecraft/world/Explosion.java
similarity index 100%
rename from src/main/java/net/minecraft/world/Explosion.java
rename to src/game/java/net/minecraft/world/Explosion.java
diff --git a/src/main/java/net/minecraft/world/GameRules.java b/src/game/java/net/minecraft/world/GameRules.java
similarity index 95%
rename from src/main/java/net/minecraft/world/GameRules.java
rename to src/game/java/net/minecraft/world/GameRules.java
index 8374ab5..cf5f9da 100755
--- a/src/main/java/net/minecraft/world/GameRules.java
+++ b/src/game/java/net/minecraft/world/GameRules.java
@@ -50,6 +50,7 @@ public class GameRules {
 		this.addGameRule("clickToSit", "true", GameRules.ValueType.BOOLEAN_VALUE);
 		this.addGameRule("colorCodes", "true", GameRules.ValueType.BOOLEAN_VALUE);
 		this.addGameRule("doSignEditing", "true", GameRules.ValueType.BOOLEAN_VALUE);
+		this.addGameRule("doWeatherCycle", "true", GameRules.ValueType.BOOLEAN_VALUE);
 	}
 
 	public void addGameRule(String key, String value, GameRules.ValueType type) {
diff --git a/src/main/java/net/minecraft/world/IBlockAccess.java b/src/game/java/net/minecraft/world/IBlockAccess.java
similarity index 100%
rename from src/main/java/net/minecraft/world/IBlockAccess.java
rename to src/game/java/net/minecraft/world/IBlockAccess.java
diff --git a/src/main/java/net/minecraft/world/IInteractionObject.java b/src/game/java/net/minecraft/world/IInteractionObject.java
similarity index 100%
rename from src/main/java/net/minecraft/world/IInteractionObject.java
rename to src/game/java/net/minecraft/world/IInteractionObject.java
diff --git a/src/main/java/net/minecraft/world/ILockableContainer.java b/src/game/java/net/minecraft/world/ILockableContainer.java
similarity index 100%
rename from src/main/java/net/minecraft/world/ILockableContainer.java
rename to src/game/java/net/minecraft/world/ILockableContainer.java
diff --git a/src/main/java/net/minecraft/world/IWorldAccess.java b/src/game/java/net/minecraft/world/IWorldAccess.java
similarity index 100%
rename from src/main/java/net/minecraft/world/IWorldAccess.java
rename to src/game/java/net/minecraft/world/IWorldAccess.java
diff --git a/src/main/java/net/minecraft/world/IWorldNameable.java b/src/game/java/net/minecraft/world/IWorldNameable.java
similarity index 100%
rename from src/main/java/net/minecraft/world/IWorldNameable.java
rename to src/game/java/net/minecraft/world/IWorldNameable.java
diff --git a/src/main/java/net/minecraft/world/LockCode.java b/src/game/java/net/minecraft/world/LockCode.java
similarity index 100%
rename from src/main/java/net/minecraft/world/LockCode.java
rename to src/game/java/net/minecraft/world/LockCode.java
diff --git a/src/main/java/net/minecraft/world/MinecraftException.java b/src/game/java/net/minecraft/world/MinecraftException.java
similarity index 100%
rename from src/main/java/net/minecraft/world/MinecraftException.java
rename to src/game/java/net/minecraft/world/MinecraftException.java
diff --git a/src/main/java/net/minecraft/world/NextTickListEntry.java b/src/game/java/net/minecraft/world/NextTickListEntry.java
similarity index 100%
rename from src/main/java/net/minecraft/world/NextTickListEntry.java
rename to src/game/java/net/minecraft/world/NextTickListEntry.java
diff --git a/src/main/java/net/minecraft/world/SpawnerAnimals.java b/src/game/java/net/minecraft/world/SpawnerAnimals.java
similarity index 100%
rename from src/main/java/net/minecraft/world/SpawnerAnimals.java
rename to src/game/java/net/minecraft/world/SpawnerAnimals.java
diff --git a/src/main/java/net/minecraft/world/Teleporter.java b/src/game/java/net/minecraft/world/Teleporter.java
similarity index 100%
rename from src/main/java/net/minecraft/world/Teleporter.java
rename to src/game/java/net/minecraft/world/Teleporter.java
diff --git a/src/main/java/net/minecraft/world/World.java b/src/game/java/net/minecraft/world/World.java
similarity index 95%
rename from src/main/java/net/minecraft/world/World.java
rename to src/game/java/net/minecraft/world/World.java
index 050bf93..4f30318 100755
--- a/src/main/java/net/minecraft/world/World.java
+++ b/src/game/java/net/minecraft/world/World.java
@@ -10,7 +10,6 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import java.util.Set;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
@@ -34,7 +33,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.profiler.Profiler;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
@@ -135,8 +133,7 @@ public abstract class World implements IBlockAccess {
 	protected boolean findingSpawnPoint;
 	protected MapStorage mapStorage;
 	protected VillageCollection villageCollectionObj;
-	public final Profiler theProfiler;
-	private final Calendar theCalendar = EagRuntime.getLocaleCalendar();
+	private final Calendar theCalendar = Calendar.getInstance();
 	protected Scoreboard worldScoreboard = new Scoreboard();
 	/**+
 	 * populated by chunks that are within 9 chunks of any player
@@ -150,14 +147,12 @@ public abstract class World implements IBlockAccess {
 	int[] lightUpdateBlockList;
 	public final boolean isRemote;
 
-	protected World(ISaveHandler saveHandlerIn, WorldInfo info, WorldProvider providerIn, Profiler profilerIn,
-			boolean client) {
+	protected World(ISaveHandler saveHandlerIn, WorldInfo info, WorldProvider providerIn, boolean client) {
 		this.ambientTickCountdown = this.rand.nextInt(12000);
 		this.spawnHostileMobs = true;
 		this.spawnPeacefulMobs = true;
 		this.lightUpdateBlockList = new int['\u8000'];
 		this.saveHandler = saveHandlerIn;
-		this.theProfiler = profilerIn;
 		this.worldInfo = info;
 		this.provider = providerIn;
 		this.worldBorder = providerIn.getWorldBorder();
@@ -325,9 +320,7 @@ public abstract class World implements IBlockAccess {
 				Block block1 = iblockstate.getBlock();
 				if (block.getLightOpacity() != block1.getLightOpacity()
 						|| block.getLightValue() != block1.getLightValue()) {
-					this.theProfiler.startSection("checkLight");
 					this.checkLight(pos);
-					this.theProfiler.endSection();
 				}
 
 				if ((flags & 2) != 0 && (!this.isRemote || (flags & 4) == 0) && chunk.isPopulated()) {
@@ -1360,9 +1353,6 @@ public abstract class World implements IBlockAccess {
 	 * Updates (and cleans up) entities and tile entities
 	 */
 	public void updateEntities() {
-		this.theProfiler.startSection("entities");
-		this.theProfiler.startSection("global");
-
 		for (int i = 0; i < this.weatherEffects.size(); ++i) {
 			Entity entity = (Entity) this.weatherEffects.get(i);
 
@@ -1386,7 +1376,6 @@ public abstract class World implements IBlockAccess {
 			}
 		}
 
-		this.theProfiler.endStartSection("remove");
 		this.loadedEntityList.removeAll(this.unloadedEntityList);
 
 		for (int k = 0; k < this.unloadedEntityList.size(); ++k) {
@@ -1403,7 +1392,6 @@ public abstract class World implements IBlockAccess {
 		}
 
 		this.unloadedEntityList.clear();
-		this.theProfiler.endStartSection("regular");
 
 		for (int i1 = 0; i1 < this.loadedEntityList.size(); ++i1) {
 			Entity entity2 = (Entity) this.loadedEntityList.get(i1);
@@ -1416,7 +1404,6 @@ public abstract class World implements IBlockAccess {
 				entity2.ridingEntity = null;
 			}
 
-			this.theProfiler.startSection("tick");
 			if (!entity2.isDead) {
 				try {
 					this.updateEntity(entity2);
@@ -1428,8 +1415,6 @@ public abstract class World implements IBlockAccess {
 				}
 			}
 
-			this.theProfiler.endSection();
-			this.theProfiler.startSection("remove");
 			if (entity2.isDead) {
 				int k1 = entity2.chunkCoordX;
 				int i2 = entity2.chunkCoordZ;
@@ -1441,10 +1426,8 @@ public abstract class World implements IBlockAccess {
 				this.onEntityRemoved(entity2);
 			}
 
-			this.theProfiler.endSection();
 		}
 
-		this.theProfiler.endStartSection("blockEntities");
 		this.processingLoadedTiles = true;
 		Iterator iterator = this.tickableTileEntities.iterator();
 
@@ -1481,7 +1464,6 @@ public abstract class World implements IBlockAccess {
 			this.tileEntitiesToBeRemoved.clear();
 		}
 
-		this.theProfiler.endStartSection("pendingBlockEntities");
 		if (!this.addedTileEntityList.isEmpty()) {
 			for (int j1 = 0; j1 < this.addedTileEntityList.size(); ++j1) {
 				TileEntity tileentity1 = (TileEntity) this.addedTileEntityList.get(j1);
@@ -1502,8 +1484,6 @@ public abstract class World implements IBlockAccess {
 			this.addedTileEntityList.clear();
 		}
 
-		this.theProfiler.endSection();
-		this.theProfiler.endSection();
 	}
 
 	public boolean addTileEntity(TileEntity tile) {
@@ -1561,7 +1541,6 @@ public abstract class World implements IBlockAccess {
 				}
 			}
 
-			this.theProfiler.startSection("chunkCheck");
 			if (Double.isNaN(entityIn.posX) || Double.isInfinite(entityIn.posX)) {
 				entityIn.posX = entityIn.lastTickPosX;
 			}
@@ -1600,7 +1579,6 @@ public abstract class World implements IBlockAccess {
 				}
 			}
 
-			this.theProfiler.endSection();
 			if (forceUpdate && entityIn.addedToChunk && entityIn.riddenByEntity != null) {
 				if (!entityIn.riddenByEntity.isDead && entityIn.riddenByEntity.ridingEntity == entityIn) {
 					this.updateEntity(entityIn.riddenByEntity);
@@ -2075,7 +2053,7 @@ public abstract class World implements IBlockAccess {
 	 * Updates all weather states.
 	 */
 	protected void updateWeather() {
-		if (!this.provider.getHasNoSky()) {
+		if (!this.provider.getHasNoSky() && this.getGameRules().getBoolean("doWeatherCycle")) {
 			if (!this.isRemote) {
 				int i = this.worldInfo.getCleanWeatherTime();
 				if (i > 0) {
@@ -2137,7 +2115,6 @@ public abstract class World implements IBlockAccess {
 
 	protected void setActivePlayerChunksAndCheckLight() {
 		this.activeChunkSet.clear();
-		this.theProfiler.startSection("buildList");
 
 		for (int i = 0; i < this.playerEntities.size(); ++i) {
 			EntityPlayer entityplayer = (EntityPlayer) this.playerEntities.get(i);
@@ -2152,12 +2129,10 @@ public abstract class World implements IBlockAccess {
 			}
 		}
 
-		this.theProfiler.endSection();
 		if (this.ambientTickCountdown > 0) {
 			--this.ambientTickCountdown;
 		}
 
-		this.theProfiler.startSection("playerCheckLight");
 		if (!this.playerEntities.isEmpty()) {
 			int k1 = this.rand.nextInt(this.playerEntities.size());
 			EntityPlayer entityplayer1 = (EntityPlayer) this.playerEntities.get(k1);
@@ -2167,13 +2142,11 @@ public abstract class World implements IBlockAccess {
 			this.checkLight(new BlockPos(l1, i2, j2));
 		}
 
-		this.theProfiler.endSection();
 	}
 
 	protected abstract int getRenderDistanceChunks();
 
 	protected void playMoodSoundAndCheckLight(int chunkIn, int parInt2, Chunk parChunk) {
-		this.theProfiler.endStartSection("moodSound");
 		if (this.ambientTickCountdown == 0 && !this.isRemote) {
 			this.updateLCG = this.updateLCG * 3 + 1013904223;
 			int i = this.updateLCG >> 2;
@@ -2197,7 +2170,6 @@ public abstract class World implements IBlockAccess {
 			}
 		}
 
-		this.theProfiler.endStartSection("checkLight");
 		parChunk.enqueueRelightChecks();
 	}
 
@@ -2335,7 +2307,6 @@ public abstract class World implements IBlockAccess {
 		} else {
 			int i = 0;
 			int j = 0;
-			this.theProfiler.startSection("getBrightness");
 			int k = this.getLightFor(lightType, pos);
 			int l = this.getRawLight(pos, lightType);
 			int i1 = pos.getX();
@@ -2386,9 +2357,6 @@ public abstract class World implements IBlockAccess {
 				i = 0;
 			}
 
-			this.theProfiler.endSection();
-			this.theProfiler.startSection("checkedPosition < toCheckCount");
-
 			while (i < j) {
 				int i5 = this.lightUpdateBlockList[i++];
 				int j5 = (i5 & 63) - 32 + i1;
@@ -2439,7 +2407,6 @@ public abstract class World implements IBlockAccess {
 				}
 			}
 
-			this.theProfiler.endSection();
 			return true;
 		}
 	}
diff --git a/src/main/java/net/minecraft/world/WorldManager.java b/src/game/java/net/minecraft/world/WorldManager.java
similarity index 100%
rename from src/main/java/net/minecraft/world/WorldManager.java
rename to src/game/java/net/minecraft/world/WorldManager.java
diff --git a/src/main/java/net/minecraft/world/WorldProvider.java b/src/game/java/net/minecraft/world/WorldProvider.java
similarity index 100%
rename from src/main/java/net/minecraft/world/WorldProvider.java
rename to src/game/java/net/minecraft/world/WorldProvider.java
diff --git a/src/main/java/net/minecraft/world/WorldProviderEnd.java b/src/game/java/net/minecraft/world/WorldProviderEnd.java
similarity index 100%
rename from src/main/java/net/minecraft/world/WorldProviderEnd.java
rename to src/game/java/net/minecraft/world/WorldProviderEnd.java
diff --git a/src/main/java/net/minecraft/world/WorldProviderHell.java b/src/game/java/net/minecraft/world/WorldProviderHell.java
similarity index 100%
rename from src/main/java/net/minecraft/world/WorldProviderHell.java
rename to src/game/java/net/minecraft/world/WorldProviderHell.java
diff --git a/src/main/java/net/minecraft/world/WorldProviderSurface.java b/src/game/java/net/minecraft/world/WorldProviderSurface.java
similarity index 100%
rename from src/main/java/net/minecraft/world/WorldProviderSurface.java
rename to src/game/java/net/minecraft/world/WorldProviderSurface.java
diff --git a/src/main/java/net/minecraft/world/WorldSavedData.java b/src/game/java/net/minecraft/world/WorldSavedData.java
similarity index 100%
rename from src/main/java/net/minecraft/world/WorldSavedData.java
rename to src/game/java/net/minecraft/world/WorldSavedData.java
diff --git a/src/main/java/net/minecraft/world/WorldServer.java b/src/game/java/net/minecraft/world/WorldServer.java
similarity index 94%
rename from src/main/java/net/minecraft/world/WorldServer.java
rename to src/game/java/net/minecraft/world/WorldServer.java
index fece50a..0867fbf 100755
--- a/src/main/java/net/minecraft/world/WorldServer.java
+++ b/src/game/java/net/minecraft/world/WorldServer.java
@@ -38,7 +38,6 @@ import net.minecraft.network.play.server.S27PacketExplosion;
 import net.minecraft.network.play.server.S2APacketParticles;
 import net.minecraft.network.play.server.S2BPacketChangeGameState;
 import net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity;
-import net.minecraft.profiler.Profiler;
 import net.minecraft.scoreboard.ScoreboardSaveData;
 import net.minecraft.scoreboard.ServerScoreboard;
 import net.minecraft.server.MinecraftServer;
@@ -124,9 +123,8 @@ public class WorldServer extends World implements IThreadListener {
 					new WeightedRandomChestContent(Item.getItemFromBlock(Blocks.log2), 0, 1, 3, 10) });
 	private List<NextTickListEntry> pendingTickListEntriesThisTick = Lists.newArrayList();
 
-	public WorldServer(MinecraftServer server, ISaveHandler saveHandlerIn, WorldInfo info, int dimensionId,
-			Profiler profilerIn) {
-		super(saveHandlerIn, info, WorldProvider.getProviderForDimension(dimensionId), profilerIn, false);
+	public WorldServer(MinecraftServer server, ISaveHandler saveHandlerIn, WorldInfo info, int dimensionId) {
+		super(saveHandlerIn, info, WorldProvider.getProviderForDimension(dimensionId), false);
 		this.mcServer = server;
 		this.theEntityTracker = new EntityTracker(this);
 		this.thePlayerManager = new PlayerManager(this);
@@ -194,14 +192,12 @@ public class WorldServer extends World implements IThreadListener {
 			this.wakeAllPlayers();
 		}
 
-		this.theProfiler.startSection("mobSpawner");
 		if (this.getGameRules().getBoolean("doMobSpawning")
 				&& this.worldInfo.getTerrainType() != WorldType.DEBUG_WORLD) {
 			this.mobSpawner.findChunksForSpawning(this, this.spawnHostileMobs, this.spawnPeacefulMobs,
 					this.worldInfo.getWorldTotalTime() % 400L == 0L);
 		}
 
-		this.theProfiler.endStartSection("chunkSource");
 		this.chunkProvider.unloadQueuedChunks();
 		int j = this.calculateSkylightSubtracted(1.0F);
 		if (j != this.getSkylightSubtracted()) {
@@ -213,18 +209,12 @@ public class WorldServer extends World implements IThreadListener {
 			this.worldInfo.setWorldTime(this.worldInfo.getWorldTime() + 1L);
 		}
 
-		this.theProfiler.endStartSection("tickPending");
 		this.tickUpdates(false);
-		this.theProfiler.endStartSection("tickBlocks");
 		this.updateBlocks();
-		this.theProfiler.endStartSection("chunkMap");
 		this.thePlayerManager.updatePlayerInstances();
-		this.theProfiler.endStartSection("village");
 		this.villageCollectionObj.tick();
 		this.villageSiege.tick();
-		this.theProfiler.endStartSection("portalForcer");
 		this.worldTeleporter.removeStalePortalLocations(this.getTotalWorldTime());
-		this.theProfiler.endSection();
 		this.sendQueuedBlockEvents();
 	}
 
@@ -341,12 +331,9 @@ public class WorldServer extends World implements IThreadListener {
 			for (ChunkCoordIntPair chunkcoordintpair : this.activeChunkSet) {
 				int k = chunkcoordintpair.chunkXPos * 16;
 				int l = chunkcoordintpair.chunkZPos * 16;
-				this.theProfiler.startSection("getChunk");
 				Chunk chunk = this.getChunkFromChunkCoords(chunkcoordintpair.chunkXPos, chunkcoordintpair.chunkZPos);
 				this.playMoodSoundAndCheckLight(k, l, chunk);
-				this.theProfiler.endStartSection("tickChunk");
 				chunk.func_150804_b(false);
-				this.theProfiler.endStartSection("thunder");
 				if (this.rand.nextInt(100000) == 0 && this.isRaining() && this.isThundering()) {
 					this.updateLCG = this.updateLCG * 3 + 1013904223;
 					int i1 = this.updateLCG >> 2;
@@ -358,7 +345,6 @@ public class WorldServer extends World implements IThreadListener {
 					}
 				}
 
-				this.theProfiler.endStartSection("iceandsnow");
 				if (this.rand.nextInt(16) == 0) {
 					this.updateLCG = this.updateLCG * 3 + 1013904223;
 					int k2 = this.updateLCG >> 2;
@@ -378,7 +364,6 @@ public class WorldServer extends World implements IThreadListener {
 					}
 				}
 
-				this.theProfiler.endStartSection("tickBlocks");
 				int l2 = this.getGameRules().getInt("randomTickSpeed");
 				if (l2 > 0) {
 					ExtendedBlockStorage[] vigg = chunk.getBlockStorageArray();
@@ -405,10 +390,7 @@ public class WorldServer extends World implements IThreadListener {
 						}
 					}
 				}
-
-				this.theProfiler.endSection();
 			}
-
 		}
 	}
 
@@ -522,8 +504,6 @@ public class WorldServer extends World implements IThreadListener {
 					i = 1000;
 				}
 
-				this.theProfiler.startSection("cleaning");
-
 				for (int j = 0; j < i; ++j) {
 					NextTickListEntry nextticklistentry = (NextTickListEntry) this.pendingTickListEntriesTreeSet
 							.first();
@@ -536,8 +516,6 @@ public class WorldServer extends World implements IThreadListener {
 					this.pendingTickListEntriesThisTick.add(nextticklistentry);
 				}
 
-				this.theProfiler.endSection();
-				this.theProfiler.startSection("ticking");
 				Iterator iterator = this.pendingTickListEntriesThisTick.iterator();
 
 				while (iterator.hasNext()) {
@@ -568,7 +546,6 @@ public class WorldServer extends World implements IThreadListener {
 					}
 				}
 
-				this.theProfiler.endSection();
 				this.pendingTickListEntriesThisTick.clear();
 				return !this.pendingTickListEntriesTreeSet.isEmpty();
 			}
diff --git a/src/main/java/net/minecraft/world/WorldServerMulti.java b/src/game/java/net/minecraft/world/WorldServerMulti.java
similarity index 93%
rename from src/main/java/net/minecraft/world/WorldServerMulti.java
rename to src/game/java/net/minecraft/world/WorldServerMulti.java
index 5c2f676..4f7f364 100755
--- a/src/main/java/net/minecraft/world/WorldServerMulti.java
+++ b/src/game/java/net/minecraft/world/WorldServerMulti.java
@@ -1,6 +1,5 @@
 package net.minecraft.world;
 
-import net.minecraft.profiler.Profiler;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.village.VillageCollection;
 import net.minecraft.world.border.IBorderListener;
@@ -31,9 +30,8 @@ import net.minecraft.world.storage.ISaveHandler;
 public class WorldServerMulti extends WorldServer {
 	private WorldServer delegate;
 
-	public WorldServerMulti(MinecraftServer server, ISaveHandler saveHandlerIn, int dimensionId, WorldServer delegate,
-			Profiler profilerIn) {
-		super(server, saveHandlerIn, new DerivedWorldInfo(delegate.getWorldInfo()), dimensionId, profilerIn);
+	public WorldServerMulti(MinecraftServer server, ISaveHandler saveHandlerIn, int dimensionId, WorldServer delegate) {
+		super(server, saveHandlerIn, new DerivedWorldInfo(delegate.getWorldInfo()), dimensionId);
 		this.delegate = delegate;
 		delegate.getWorldBorder().addListener(new IBorderListener() {
 			public void onSizeChanged(WorldBorder var1, double d0) {
diff --git a/src/main/java/net/minecraft/world/WorldSettings.java b/src/game/java/net/minecraft/world/WorldSettings.java
similarity index 100%
rename from src/main/java/net/minecraft/world/WorldSettings.java
rename to src/game/java/net/minecraft/world/WorldSettings.java
diff --git a/src/main/java/net/minecraft/world/WorldType.java b/src/game/java/net/minecraft/world/WorldType.java
similarity index 100%
rename from src/main/java/net/minecraft/world/WorldType.java
rename to src/game/java/net/minecraft/world/WorldType.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeCache.java b/src/game/java/net/minecraft/world/biome/BiomeCache.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeCache.java
rename to src/game/java/net/minecraft/world/biome/BiomeCache.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeColorHelper.java b/src/game/java/net/minecraft/world/biome/BiomeColorHelper.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeColorHelper.java
rename to src/game/java/net/minecraft/world/biome/BiomeColorHelper.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeDecorator.java b/src/game/java/net/minecraft/world/biome/BiomeDecorator.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeDecorator.java
rename to src/game/java/net/minecraft/world/biome/BiomeDecorator.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeEndDecorator.java b/src/game/java/net/minecraft/world/biome/BiomeEndDecorator.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeEndDecorator.java
rename to src/game/java/net/minecraft/world/biome/BiomeEndDecorator.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenBase.java b/src/game/java/net/minecraft/world/biome/BiomeGenBase.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenBase.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenBase.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenBeach.java b/src/game/java/net/minecraft/world/biome/BiomeGenBeach.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenBeach.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenBeach.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenDesert.java b/src/game/java/net/minecraft/world/biome/BiomeGenDesert.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenDesert.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenDesert.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenEnd.java b/src/game/java/net/minecraft/world/biome/BiomeGenEnd.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenEnd.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenEnd.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenForest.java b/src/game/java/net/minecraft/world/biome/BiomeGenForest.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenForest.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenForest.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenHell.java b/src/game/java/net/minecraft/world/biome/BiomeGenHell.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenHell.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenHell.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenHills.java b/src/game/java/net/minecraft/world/biome/BiomeGenHills.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenHills.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenHills.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenJungle.java b/src/game/java/net/minecraft/world/biome/BiomeGenJungle.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenJungle.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenJungle.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenMesa.java b/src/game/java/net/minecraft/world/biome/BiomeGenMesa.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenMesa.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenMesa.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenMushroomIsland.java b/src/game/java/net/minecraft/world/biome/BiomeGenMushroomIsland.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenMushroomIsland.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenMushroomIsland.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenMutated.java b/src/game/java/net/minecraft/world/biome/BiomeGenMutated.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenMutated.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenMutated.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenOcean.java b/src/game/java/net/minecraft/world/biome/BiomeGenOcean.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenOcean.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenOcean.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenPlains.java b/src/game/java/net/minecraft/world/biome/BiomeGenPlains.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenPlains.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenPlains.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenRiver.java b/src/game/java/net/minecraft/world/biome/BiomeGenRiver.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenRiver.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenRiver.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenSavanna.java b/src/game/java/net/minecraft/world/biome/BiomeGenSavanna.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenSavanna.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenSavanna.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenSnow.java b/src/game/java/net/minecraft/world/biome/BiomeGenSnow.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenSnow.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenSnow.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenStoneBeach.java b/src/game/java/net/minecraft/world/biome/BiomeGenStoneBeach.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenStoneBeach.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenStoneBeach.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenSwamp.java b/src/game/java/net/minecraft/world/biome/BiomeGenSwamp.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenSwamp.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenSwamp.java
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenTaiga.java b/src/game/java/net/minecraft/world/biome/BiomeGenTaiga.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/BiomeGenTaiga.java
rename to src/game/java/net/minecraft/world/biome/BiomeGenTaiga.java
diff --git a/src/main/java/net/minecraft/world/biome/WorldChunkManager.java b/src/game/java/net/minecraft/world/biome/WorldChunkManager.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/WorldChunkManager.java
rename to src/game/java/net/minecraft/world/biome/WorldChunkManager.java
diff --git a/src/main/java/net/minecraft/world/biome/WorldChunkManagerHell.java b/src/game/java/net/minecraft/world/biome/WorldChunkManagerHell.java
similarity index 100%
rename from src/main/java/net/minecraft/world/biome/WorldChunkManagerHell.java
rename to src/game/java/net/minecraft/world/biome/WorldChunkManagerHell.java
diff --git a/src/main/java/net/minecraft/world/border/EnumBorderStatus.java b/src/game/java/net/minecraft/world/border/EnumBorderStatus.java
similarity index 100%
rename from src/main/java/net/minecraft/world/border/EnumBorderStatus.java
rename to src/game/java/net/minecraft/world/border/EnumBorderStatus.java
diff --git a/src/main/java/net/minecraft/world/border/IBorderListener.java b/src/game/java/net/minecraft/world/border/IBorderListener.java
similarity index 100%
rename from src/main/java/net/minecraft/world/border/IBorderListener.java
rename to src/game/java/net/minecraft/world/border/IBorderListener.java
diff --git a/src/main/java/net/minecraft/world/border/WorldBorder.java b/src/game/java/net/minecraft/world/border/WorldBorder.java
similarity index 93%
rename from src/main/java/net/minecraft/world/border/WorldBorder.java
rename to src/game/java/net/minecraft/world/border/WorldBorder.java
index 2ccc249..d360851 100755
--- a/src/main/java/net/minecraft/world/border/WorldBorder.java
+++ b/src/game/java/net/minecraft/world/border/WorldBorder.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
@@ -142,7 +143,7 @@ public class WorldBorder {
 
 	public double getDiameter() {
 		if (this.getStatus() != EnumBorderStatus.STATIONARY) {
-			double d0 = (double) ((float) (System.currentTimeMillis() - this.startTime)
+			double d0 = (double) ((float) (EagRuntime.steadyTimeMillis() - this.startTime)
 					/ (float) (this.endTime - this.startTime));
 			if (d0 < 1.0D) {
 				return this.startDiameter + (this.endDiameter - this.startDiameter) * d0;
@@ -155,7 +156,7 @@ public class WorldBorder {
 	}
 
 	public long getTimeUntilTarget() {
-		return this.getStatus() != EnumBorderStatus.STATIONARY ? this.endTime - System.currentTimeMillis() : 0L;
+		return this.getStatus() != EnumBorderStatus.STATIONARY ? this.endTime - EagRuntime.steadyTimeMillis() : 0L;
 	}
 
 	public double getTargetSize() {
@@ -165,7 +166,7 @@ public class WorldBorder {
 	public void setTransition(double newSize) {
 		this.startDiameter = newSize;
 		this.endDiameter = newSize;
-		this.endTime = System.currentTimeMillis();
+		this.endTime = EagRuntime.steadyTimeMillis();
 		this.startTime = this.endTime;
 
 		List<IBorderListener> lst = this.getListeners();
@@ -178,7 +179,7 @@ public class WorldBorder {
 	public void setTransition(double oldSize, double newSize, long time) {
 		this.startDiameter = oldSize;
 		this.endDiameter = newSize;
-		this.startTime = System.currentTimeMillis();
+		this.startTime = EagRuntime.steadyTimeMillis();
 		this.endTime = this.startTime + time;
 
 		List<IBorderListener> lst = this.getListeners();
diff --git a/src/main/java/net/minecraft/world/chunk/Chunk.java b/src/game/java/net/minecraft/world/chunk/Chunk.java
similarity index 96%
rename from src/main/java/net/minecraft/world/chunk/Chunk.java
rename to src/game/java/net/minecraft/world/chunk/Chunk.java
index dd863c1..1368f13 100755
--- a/src/main/java/net/minecraft/world/chunk/Chunk.java
+++ b/src/game/java/net/minecraft/world/chunk/Chunk.java
@@ -261,7 +261,6 @@ public class Chunk {
 	}
 
 	private void recheckGaps(boolean parFlag) {
-		this.worldObj.theProfiler.startSection("recheckGaps");
 		if (this.worldObj.isAreaLoaded(new BlockPos(this.xPosition * 16 + 8, 0, this.zPosition * 16 + 8), 16)) {
 			for (int i = 0; i < 16; ++i) {
 				for (int j = 0; j < 16; ++j) {
@@ -288,7 +287,6 @@ public class Chunk {
 						}
 
 						if (parFlag) {
-							this.worldObj.theProfiler.endSection();
 							return;
 						}
 					}
@@ -297,8 +295,6 @@ public class Chunk {
 
 			this.isGapLightingUpdated = false;
 		}
-
-		this.worldObj.theProfiler.endSection();
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/world/chunk/ChunkPrimer.java b/src/game/java/net/minecraft/world/chunk/ChunkPrimer.java
similarity index 100%
rename from src/main/java/net/minecraft/world/chunk/ChunkPrimer.java
rename to src/game/java/net/minecraft/world/chunk/ChunkPrimer.java
diff --git a/src/main/java/net/minecraft/world/chunk/EmptyChunk.java b/src/game/java/net/minecraft/world/chunk/EmptyChunk.java
similarity index 100%
rename from src/main/java/net/minecraft/world/chunk/EmptyChunk.java
rename to src/game/java/net/minecraft/world/chunk/EmptyChunk.java
diff --git a/src/main/java/net/minecraft/world/chunk/IChunkProvider.java b/src/game/java/net/minecraft/world/chunk/IChunkProvider.java
similarity index 100%
rename from src/main/java/net/minecraft/world/chunk/IChunkProvider.java
rename to src/game/java/net/minecraft/world/chunk/IChunkProvider.java
diff --git a/src/main/java/net/minecraft/world/chunk/NibbleArray.java b/src/game/java/net/minecraft/world/chunk/NibbleArray.java
similarity index 100%
rename from src/main/java/net/minecraft/world/chunk/NibbleArray.java
rename to src/game/java/net/minecraft/world/chunk/NibbleArray.java
diff --git a/src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java b/src/game/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
similarity index 100%
rename from src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
rename to src/game/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
diff --git a/src/main/java/net/minecraft/world/chunk/storage/ChunkLoader.java b/src/game/java/net/minecraft/world/chunk/storage/ChunkLoader.java
similarity index 100%
rename from src/main/java/net/minecraft/world/chunk/storage/ChunkLoader.java
rename to src/game/java/net/minecraft/world/chunk/storage/ChunkLoader.java
diff --git a/src/main/java/net/minecraft/world/chunk/storage/ExtendedBlockStorage.java b/src/game/java/net/minecraft/world/chunk/storage/ExtendedBlockStorage.java
similarity index 100%
rename from src/main/java/net/minecraft/world/chunk/storage/ExtendedBlockStorage.java
rename to src/game/java/net/minecraft/world/chunk/storage/ExtendedBlockStorage.java
diff --git a/src/main/java/net/minecraft/world/chunk/storage/IChunkLoader.java b/src/game/java/net/minecraft/world/chunk/storage/IChunkLoader.java
similarity index 100%
rename from src/main/java/net/minecraft/world/chunk/storage/IChunkLoader.java
rename to src/game/java/net/minecraft/world/chunk/storage/IChunkLoader.java
diff --git a/src/main/java/net/minecraft/world/chunk/storage/NibbleArrayReader.java b/src/game/java/net/minecraft/world/chunk/storage/NibbleArrayReader.java
similarity index 100%
rename from src/main/java/net/minecraft/world/chunk/storage/NibbleArrayReader.java
rename to src/game/java/net/minecraft/world/chunk/storage/NibbleArrayReader.java
diff --git a/src/main/java/net/minecraft/world/chunk/storage/RegionFile.java b/src/game/java/net/minecraft/world/chunk/storage/RegionFile.java
similarity index 100%
rename from src/main/java/net/minecraft/world/chunk/storage/RegionFile.java
rename to src/game/java/net/minecraft/world/chunk/storage/RegionFile.java
diff --git a/src/main/java/net/minecraft/world/demo/DemoWorldManager.java b/src/game/java/net/minecraft/world/demo/DemoWorldManager.java
similarity index 100%
rename from src/main/java/net/minecraft/world/demo/DemoWorldManager.java
rename to src/game/java/net/minecraft/world/demo/DemoWorldManager.java
diff --git a/src/main/java/net/minecraft/world/demo/DemoWorldServer.java b/src/game/java/net/minecraft/world/demo/DemoWorldServer.java
similarity index 89%
rename from src/main/java/net/minecraft/world/demo/DemoWorldServer.java
rename to src/game/java/net/minecraft/world/demo/DemoWorldServer.java
index 1717765..8f0d7bc 100755
--- a/src/main/java/net/minecraft/world/demo/DemoWorldServer.java
+++ b/src/game/java/net/minecraft/world/demo/DemoWorldServer.java
@@ -1,6 +1,5 @@
 package net.minecraft.world.demo;
 
-import net.minecraft.profiler.Profiler;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.WorldSettings;
@@ -35,9 +34,8 @@ public class DemoWorldServer extends WorldServer {
 	public static final WorldSettings demoWorldSettings = (new WorldSettings(demoWorldSeed,
 			WorldSettings.GameType.SURVIVAL, true, false, WorldType.DEFAULT)).enableBonusChest();
 
-	public DemoWorldServer(MinecraftServer server, ISaveHandler saveHandlerIn, WorldInfo worldInfoIn, int dimensionId,
-			Profiler profilerIn) {
-		super(server, saveHandlerIn, worldInfoIn, dimensionId, profilerIn);
+	public DemoWorldServer(MinecraftServer server, ISaveHandler saveHandlerIn, WorldInfo worldInfoIn, int dimensionId) {
+		super(server, saveHandlerIn, worldInfoIn, dimensionId);
 		this.worldInfo.populateFromWorldSettings(demoWorldSettings);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderDebug.java b/src/game/java/net/minecraft/world/gen/ChunkProviderDebug.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/ChunkProviderDebug.java
rename to src/game/java/net/minecraft/world/gen/ChunkProviderDebug.java
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java b/src/game/java/net/minecraft/world/gen/ChunkProviderEnd.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java
rename to src/game/java/net/minecraft/world/gen/ChunkProviderEnd.java
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderFlat.java b/src/game/java/net/minecraft/world/gen/ChunkProviderFlat.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/ChunkProviderFlat.java
rename to src/game/java/net/minecraft/world/gen/ChunkProviderFlat.java
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java b/src/game/java/net/minecraft/world/gen/ChunkProviderGenerate.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java
rename to src/game/java/net/minecraft/world/gen/ChunkProviderGenerate.java
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderHell.java b/src/game/java/net/minecraft/world/gen/ChunkProviderHell.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/ChunkProviderHell.java
rename to src/game/java/net/minecraft/world/gen/ChunkProviderHell.java
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java b/src/game/java/net/minecraft/world/gen/ChunkProviderServer.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
rename to src/game/java/net/minecraft/world/gen/ChunkProviderServer.java
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderSettings.java b/src/game/java/net/minecraft/world/gen/ChunkProviderSettings.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/ChunkProviderSettings.java
rename to src/game/java/net/minecraft/world/gen/ChunkProviderSettings.java
diff --git a/src/main/java/net/minecraft/world/gen/FlatGeneratorInfo.java b/src/game/java/net/minecraft/world/gen/FlatGeneratorInfo.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/FlatGeneratorInfo.java
rename to src/game/java/net/minecraft/world/gen/FlatGeneratorInfo.java
diff --git a/src/main/java/net/minecraft/world/gen/FlatLayerInfo.java b/src/game/java/net/minecraft/world/gen/FlatLayerInfo.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/FlatLayerInfo.java
rename to src/game/java/net/minecraft/world/gen/FlatLayerInfo.java
diff --git a/src/main/java/net/minecraft/world/gen/GeneratorBushFeature.java b/src/game/java/net/minecraft/world/gen/GeneratorBushFeature.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/GeneratorBushFeature.java
rename to src/game/java/net/minecraft/world/gen/GeneratorBushFeature.java
diff --git a/src/main/java/net/minecraft/world/gen/MapGenBase.java b/src/game/java/net/minecraft/world/gen/MapGenBase.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/MapGenBase.java
rename to src/game/java/net/minecraft/world/gen/MapGenBase.java
diff --git a/src/main/java/net/minecraft/world/gen/MapGenCaves.java b/src/game/java/net/minecraft/world/gen/MapGenCaves.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/MapGenCaves.java
rename to src/game/java/net/minecraft/world/gen/MapGenCaves.java
diff --git a/src/main/java/net/minecraft/world/gen/MapGenCavesHell.java b/src/game/java/net/minecraft/world/gen/MapGenCavesHell.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/MapGenCavesHell.java
rename to src/game/java/net/minecraft/world/gen/MapGenCavesHell.java
diff --git a/src/main/java/net/minecraft/world/gen/MapGenRavine.java b/src/game/java/net/minecraft/world/gen/MapGenRavine.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/MapGenRavine.java
rename to src/game/java/net/minecraft/world/gen/MapGenRavine.java
diff --git a/src/main/java/net/minecraft/world/gen/NoiseGenerator.java b/src/game/java/net/minecraft/world/gen/NoiseGenerator.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/NoiseGenerator.java
rename to src/game/java/net/minecraft/world/gen/NoiseGenerator.java
diff --git a/src/main/java/net/minecraft/world/gen/NoiseGeneratorImproved.java b/src/game/java/net/minecraft/world/gen/NoiseGeneratorImproved.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/NoiseGeneratorImproved.java
rename to src/game/java/net/minecraft/world/gen/NoiseGeneratorImproved.java
diff --git a/src/main/java/net/minecraft/world/gen/NoiseGeneratorOctaves.java b/src/game/java/net/minecraft/world/gen/NoiseGeneratorOctaves.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/NoiseGeneratorOctaves.java
rename to src/game/java/net/minecraft/world/gen/NoiseGeneratorOctaves.java
diff --git a/src/main/java/net/minecraft/world/gen/NoiseGeneratorPerlin.java b/src/game/java/net/minecraft/world/gen/NoiseGeneratorPerlin.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/NoiseGeneratorPerlin.java
rename to src/game/java/net/minecraft/world/gen/NoiseGeneratorPerlin.java
diff --git a/src/main/java/net/minecraft/world/gen/NoiseGeneratorSimplex.java b/src/game/java/net/minecraft/world/gen/NoiseGeneratorSimplex.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/NoiseGeneratorSimplex.java
rename to src/game/java/net/minecraft/world/gen/NoiseGeneratorSimplex.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenBigTree.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenBigTree.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenBigTree.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenBigTree.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenCactus.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenCactus.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenCactus.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenCactus.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenClay.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenClay.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenClay.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenClay.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenDungeons.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenDungeons.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenFire.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenFire.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenFire.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenFire.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenFlowers.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenFlowers.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenFlowers.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenFlowers.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenForest.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenForest.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenForest.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenForest.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenHellLava.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenHellLava.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenHellLava.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenHellLava.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenIcePath.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenIcePath.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenIcePath.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenIcePath.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenLakes.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenLakes.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenLakes.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenLakes.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenLiquids.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenLiquids.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenLiquids.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenLiquids.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMelon.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenMelon.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenMelon.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenMelon.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMinable.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenMinable.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenMinable.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenMinable.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenReed.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenReed.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenReed.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenReed.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSand.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenSand.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenSand.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenSand.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenShrub.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenShrub.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSpikes.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenSpikes.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenSpikes.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenSpikes.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSwamp.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenSwamp.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenSwamp.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenSwamp.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenTrees.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenTrees.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenVines.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenVines.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenVines.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenVines.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenerator.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenerator.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGenerator.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGenerator.java
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java b/src/game/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java
rename to src/game/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayer.java b/src/game/java/net/minecraft/world/gen/layer/GenLayer.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayer.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayer.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerAddIsland.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerAddIsland.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerAddIsland.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerAddIsland.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerAddSnow.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerAddSnow.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerAddSnow.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerAddSnow.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerBiome.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerBiome.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerBiome.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerBiome.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerDeepOcean.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerDeepOcean.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerDeepOcean.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerDeepOcean.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerEdge.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerEdge.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerEdge.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerEdge.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerHills.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerHills.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerHills.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerHills.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerIsland.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerIsland.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerIsland.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerIsland.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerRareBiome.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerRareBiome.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerRareBiome.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerRareBiome.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerRiver.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerRiver.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerRiver.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerRiver.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerRiverInit.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerRiverInit.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerRiverInit.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerRiverInit.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerRiverMix.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerRiverMix.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerRiverMix.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerRiverMix.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerShore.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerShore.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerShore.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerShore.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerSmooth.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerSmooth.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerSmooth.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerSmooth.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerZoom.java b/src/game/java/net/minecraft/world/gen/layer/GenLayerZoom.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/GenLayerZoom.java
rename to src/game/java/net/minecraft/world/gen/layer/GenLayerZoom.java
diff --git a/src/main/java/net/minecraft/world/gen/layer/IntCache.java b/src/game/java/net/minecraft/world/gen/layer/IntCache.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/layer/IntCache.java
rename to src/game/java/net/minecraft/world/gen/layer/IntCache.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java b/src/game/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java
rename to src/game/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenMineshaft.java b/src/game/java/net/minecraft/world/gen/structure/MapGenMineshaft.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/MapGenMineshaft.java
rename to src/game/java/net/minecraft/world/gen/structure/MapGenMineshaft.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenNetherBridge.java b/src/game/java/net/minecraft/world/gen/structure/MapGenNetherBridge.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/MapGenNetherBridge.java
rename to src/game/java/net/minecraft/world/gen/structure/MapGenNetherBridge.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java b/src/game/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java
rename to src/game/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenStronghold.java b/src/game/java/net/minecraft/world/gen/structure/MapGenStronghold.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/MapGenStronghold.java
rename to src/game/java/net/minecraft/world/gen/structure/MapGenStronghold.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenStructure.java b/src/game/java/net/minecraft/world/gen/structure/MapGenStructure.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/MapGenStructure.java
rename to src/game/java/net/minecraft/world/gen/structure/MapGenStructure.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenStructureData.java b/src/game/java/net/minecraft/world/gen/structure/MapGenStructureData.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/MapGenStructureData.java
rename to src/game/java/net/minecraft/world/gen/structure/MapGenStructureData.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenStructureIO.java b/src/game/java/net/minecraft/world/gen/structure/MapGenStructureIO.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/MapGenStructureIO.java
rename to src/game/java/net/minecraft/world/gen/structure/MapGenStructureIO.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenVillage.java b/src/game/java/net/minecraft/world/gen/structure/MapGenVillage.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/MapGenVillage.java
rename to src/game/java/net/minecraft/world/gen/structure/MapGenVillage.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureBoundingBox.java b/src/game/java/net/minecraft/world/gen/structure/StructureBoundingBox.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/StructureBoundingBox.java
rename to src/game/java/net/minecraft/world/gen/structure/StructureBoundingBox.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureComponent.java b/src/game/java/net/minecraft/world/gen/structure/StructureComponent.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/StructureComponent.java
rename to src/game/java/net/minecraft/world/gen/structure/StructureComponent.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java b/src/game/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java
rename to src/game/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftStart.java b/src/game/java/net/minecraft/world/gen/structure/StructureMineshaftStart.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/StructureMineshaftStart.java
rename to src/game/java/net/minecraft/world/gen/structure/StructureMineshaftStart.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java b/src/game/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java
rename to src/game/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonument.java b/src/game/java/net/minecraft/world/gen/structure/StructureOceanMonument.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/StructureOceanMonument.java
rename to src/game/java/net/minecraft/world/gen/structure/StructureOceanMonument.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java b/src/game/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java
rename to src/game/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureStart.java b/src/game/java/net/minecraft/world/gen/structure/StructureStart.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/StructureStart.java
rename to src/game/java/net/minecraft/world/gen/structure/StructureStart.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java b/src/game/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java
rename to src/game/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureVillagePieces.java b/src/game/java/net/minecraft/world/gen/structure/StructureVillagePieces.java
similarity index 100%
rename from src/main/java/net/minecraft/world/gen/structure/StructureVillagePieces.java
rename to src/game/java/net/minecraft/world/gen/structure/StructureVillagePieces.java
diff --git a/src/main/java/net/minecraft/world/pathfinder/NodeProcessor.java b/src/game/java/net/minecraft/world/pathfinder/NodeProcessor.java
similarity index 100%
rename from src/main/java/net/minecraft/world/pathfinder/NodeProcessor.java
rename to src/game/java/net/minecraft/world/pathfinder/NodeProcessor.java
diff --git a/src/main/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java b/src/game/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java
similarity index 100%
rename from src/main/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java
rename to src/game/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java
diff --git a/src/main/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java b/src/game/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java
similarity index 100%
rename from src/main/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java
rename to src/game/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java
diff --git a/src/main/java/net/minecraft/world/storage/DerivedWorldInfo.java b/src/game/java/net/minecraft/world/storage/DerivedWorldInfo.java
similarity index 100%
rename from src/main/java/net/minecraft/world/storage/DerivedWorldInfo.java
rename to src/game/java/net/minecraft/world/storage/DerivedWorldInfo.java
diff --git a/src/main/java/net/minecraft/world/storage/IPlayerFileData.java b/src/game/java/net/minecraft/world/storage/IPlayerFileData.java
similarity index 100%
rename from src/main/java/net/minecraft/world/storage/IPlayerFileData.java
rename to src/game/java/net/minecraft/world/storage/IPlayerFileData.java
diff --git a/src/main/java/net/minecraft/world/storage/ISaveFormat.java b/src/game/java/net/minecraft/world/storage/ISaveFormat.java
similarity index 100%
rename from src/main/java/net/minecraft/world/storage/ISaveFormat.java
rename to src/game/java/net/minecraft/world/storage/ISaveFormat.java
diff --git a/src/main/java/net/minecraft/world/storage/ISaveHandler.java b/src/game/java/net/minecraft/world/storage/ISaveHandler.java
similarity index 100%
rename from src/main/java/net/minecraft/world/storage/ISaveHandler.java
rename to src/game/java/net/minecraft/world/storage/ISaveHandler.java
diff --git a/src/main/java/net/minecraft/world/storage/MapData.java b/src/game/java/net/minecraft/world/storage/MapData.java
similarity index 100%
rename from src/main/java/net/minecraft/world/storage/MapData.java
rename to src/game/java/net/minecraft/world/storage/MapData.java
diff --git a/src/main/java/net/minecraft/world/storage/MapStorage.java b/src/game/java/net/minecraft/world/storage/MapStorage.java
similarity index 96%
rename from src/main/java/net/minecraft/world/storage/MapStorage.java
rename to src/game/java/net/minecraft/world/storage/MapStorage.java
index 3f3a1d2..0e9cf01 100755
--- a/src/main/java/net/minecraft/world/storage/MapStorage.java
+++ b/src/game/java/net/minecraft/world/storage/MapStorage.java
@@ -54,7 +54,7 @@ public class MapStorage {
 		WorldSavedData createInstance(String mapFileName);
 	}
 
-	public static final Map<Class<? extends WorldSavedData>, MapStorageProvider> storageProviders = new HashMap();
+	public static final Map<Class<? extends WorldSavedData>, MapStorageProvider> storageProviders = new HashMap<>();
 
 	static {
 		storageProviders.put(MapData.class, MapData::new);
diff --git a/src/main/java/net/minecraft/world/storage/SaveDataMemoryStorage.java b/src/game/java/net/minecraft/world/storage/SaveDataMemoryStorage.java
similarity index 100%
rename from src/main/java/net/minecraft/world/storage/SaveDataMemoryStorage.java
rename to src/game/java/net/minecraft/world/storage/SaveDataMemoryStorage.java
diff --git a/src/main/java/net/minecraft/world/storage/SaveFormatComparator.java b/src/game/java/net/minecraft/world/storage/SaveFormatComparator.java
similarity index 100%
rename from src/main/java/net/minecraft/world/storage/SaveFormatComparator.java
rename to src/game/java/net/minecraft/world/storage/SaveFormatComparator.java
diff --git a/src/main/java/net/minecraft/world/storage/SaveFormatOld.java b/src/game/java/net/minecraft/world/storage/SaveFormatOld.java
similarity index 88%
rename from src/main/java/net/minecraft/world/storage/SaveFormatOld.java
rename to src/game/java/net/minecraft/world/storage/SaveFormatOld.java
index d9623fb..4735c5d 100755
--- a/src/main/java/net/minecraft/world/storage/SaveFormatOld.java
+++ b/src/game/java/net/minecraft/world/storage/SaveFormatOld.java
@@ -9,6 +9,7 @@ import java.util.List;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerIntegratedServerWorker;
+import net.lax1dude.eaglercraft.v1_8.sp.server.WorldsDB;
 import net.minecraft.util.IProgressUpdate;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
@@ -72,11 +73,11 @@ public class SaveFormatOld implements ISaveFormat {
 	 * Returns the world's WorldInfo object
 	 */
 	public WorldInfo getWorldInfo(String saveName) {
-		VFile2 file1 = new VFile2(this.savesDirectory, saveName);
+		VFile2 file1 = WorldsDB.newVFile(this.savesDirectory, saveName);
 		if (!file1.exists()) {
 			return null;
 		} else {
-			VFile2 file2 = new VFile2(file1, "level.dat");
+			VFile2 file2 = WorldsDB.newVFile(file1, "level.dat");
 			if (file2.exists()) {
 				try {
 					NBTTagCompound nbttagcompound2;
@@ -90,7 +91,7 @@ public class SaveFormatOld implements ISaveFormat {
 				}
 			}
 
-			file2 = new VFile2(file1, "level.dat_old");
+			file2 = WorldsDB.newVFile(file1, "level.dat_old");
 			if (file2.exists()) {
 				try {
 					NBTTagCompound nbttagcompound;
@@ -113,8 +114,8 @@ public class SaveFormatOld implements ISaveFormat {
 	 * does *not* rename the directory containing the world data.
 	 */
 	public boolean renameWorld(String dirName, String newName) {
-		VFile2 file1 = new VFile2(this.savesDirectory, dirName);
-		VFile2 file2 = new VFile2(file1, "level.dat");
+		VFile2 file1 = WorldsDB.newVFile(this.savesDirectory, dirName);
+		VFile2 file2 = WorldsDB.newVFile(file1, "level.dat");
 		{
 			if (file2.exists()) {
 				try {
@@ -148,7 +149,7 @@ public class SaveFormatOld implements ISaveFormat {
 	 * associated directory recursively.
 	 */
 	public boolean deleteWorldDirectory(String parString1) {
-		VFile2 file1 = new VFile2(this.savesDirectory, parString1);
+		VFile2 file1 = WorldsDB.newVFile(this.savesDirectory, parString1);
 		logger.info("Deleting level " + parString1);
 
 		for (int i = 1; i <= 5; ++i) {
@@ -226,7 +227,7 @@ public class SaveFormatOld implements ISaveFormat {
 	 * Return whether the given world can be loaded.
 	 */
 	public boolean canLoadWorld(String parString1) {
-		return (new VFile2(this.savesDirectory, parString1, "level.dat")).exists()
-				|| (new VFile2(this.savesDirectory, parString1, "level.dat_old")).exists();
+		return (WorldsDB.newVFile(this.savesDirectory, parString1, "level.dat")).exists()
+				|| (WorldsDB.newVFile(this.savesDirectory, parString1, "level.dat_old")).exists();
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/world/storage/SaveHandler.java b/src/game/java/net/minecraft/world/storage/SaveHandler.java
similarity index 83%
rename from src/main/java/net/minecraft/world/storage/SaveHandler.java
rename to src/game/java/net/minecraft/world/storage/SaveHandler.java
index c0d1a5d..e49f870 100755
--- a/src/main/java/net/minecraft/world/storage/SaveHandler.java
+++ b/src/game/java/net/minecraft/world/storage/SaveHandler.java
@@ -14,6 +14,7 @@ import net.minecraft.world.chunk.storage.IChunkLoader;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.sp.server.WorldsDB;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -48,9 +49,9 @@ public class SaveHandler implements ISaveHandler, IPlayerFileData {
 	private final String saveDirectoryName;
 
 	public SaveHandler(VFile2 savesDirectory, String directoryName) {
-		this.worldDirectory = new VFile2(savesDirectory, directoryName);
-		this.playersDirectory = new VFile2(this.worldDirectory, "player");
-		this.mapDataDir = new VFile2(this.worldDirectory, "data");
+		this.worldDirectory = WorldsDB.newVFile(savesDirectory, directoryName);
+		this.playersDirectory = WorldsDB.newVFile(this.worldDirectory, "player");
+		this.mapDataDir = WorldsDB.newVFile(this.worldDirectory, "data");
 		this.saveDirectoryName = directoryName;
 
 	}
@@ -81,7 +82,7 @@ public class SaveHandler implements ISaveHandler, IPlayerFileData {
 	 * Loads and returns the world info
 	 */
 	public WorldInfo loadWorldInfo() {
-		VFile2 file1 = new VFile2(this.worldDirectory, "level.dat");
+		VFile2 file1 = WorldsDB.newVFile(this.worldDirectory, "level.dat");
 		if (file1.exists()) {
 			try (InputStream is = file1.getInputStream()) {
 				NBTTagCompound nbttagcompound2 = CompressedStreamTools.readCompressed(is);
@@ -93,7 +94,7 @@ public class SaveHandler implements ISaveHandler, IPlayerFileData {
 			}
 		}
 
-		file1 = new VFile2(this.worldDirectory, "level.dat_old");
+		file1 = WorldsDB.newVFile(this.worldDirectory, "level.dat_old");
 		if (file1.exists()) {
 			try (InputStream is = file1.getInputStream()) {
 				NBTTagCompound nbttagcompound = CompressedStreamTools.readCompressed(is);
@@ -118,9 +119,9 @@ public class SaveHandler implements ISaveHandler, IPlayerFileData {
 		nbttagcompound2.setTag("Data", nbttagcompound1);
 
 		try {
-			VFile2 file1 = new VFile2(this.worldDirectory, "level.dat_new");
-			VFile2 file2 = new VFile2(this.worldDirectory, "level.dat_old");
-			VFile2 file3 = new VFile2(this.worldDirectory, "level.dat");
+			VFile2 file1 = WorldsDB.newVFile(this.worldDirectory, "level.dat_new");
+			VFile2 file2 = WorldsDB.newVFile(this.worldDirectory, "level.dat_old");
+			VFile2 file3 = WorldsDB.newVFile(this.worldDirectory, "level.dat");
 			try (OutputStream os = file1.getOutputStream()) {
 				CompressedStreamTools.writeCompressed(nbttagcompound2, os);
 			}
@@ -153,9 +154,9 @@ public class SaveHandler implements ISaveHandler, IPlayerFileData {
 		nbttagcompound1.setTag("Data", nbttagcompound);
 
 		try {
-			VFile2 file1 = new VFile2(this.worldDirectory, "level.dat_new");
-			VFile2 file2 = new VFile2(this.worldDirectory, "level.dat_old");
-			VFile2 file3 = new VFile2(this.worldDirectory, "level.dat");
+			VFile2 file1 = WorldsDB.newVFile(this.worldDirectory, "level.dat_new");
+			VFile2 file2 = WorldsDB.newVFile(this.worldDirectory, "level.dat_old");
+			VFile2 file3 = WorldsDB.newVFile(this.worldDirectory, "level.dat");
 			try (OutputStream os = file1.getOutputStream()) {
 				CompressedStreamTools.writeCompressed(nbttagcompound1, os);
 			}
@@ -188,8 +189,8 @@ public class SaveHandler implements ISaveHandler, IPlayerFileData {
 			NBTTagCompound nbttagcompound = new NBTTagCompound();
 			player.writeToNBT(nbttagcompound);
 			String s = player.getName().toLowerCase();
-			VFile2 file1 = new VFile2(this.playersDirectory, s + ".dat.tmp");
-			VFile2 file2 = new VFile2(this.playersDirectory, s + ".dat");
+			VFile2 file1 = WorldsDB.newVFile(this.playersDirectory, s + ".dat.tmp");
+			VFile2 file2 = WorldsDB.newVFile(this.playersDirectory, s + ".dat");
 			try (OutputStream os = file1.getOutputStream()) {
 				CompressedStreamTools.writeCompressed(nbttagcompound, os);
 			}
@@ -213,7 +214,7 @@ public class SaveHandler implements ISaveHandler, IPlayerFileData {
 		NBTTagCompound nbttagcompound = null;
 
 		try {
-			VFile2 file1 = new VFile2(this.playersDirectory, player.getName().toLowerCase() + ".dat");
+			VFile2 file1 = WorldsDB.newVFile(this.playersDirectory, player.getName().toLowerCase() + ".dat");
 			if (file1.exists()) {
 				try (InputStream is = file1.getInputStream()) {
 					nbttagcompound = CompressedStreamTools.readCompressed(is);
@@ -263,7 +264,7 @@ public class SaveHandler implements ISaveHandler, IPlayerFileData {
 	 * Gets the file location of the given map
 	 */
 	public VFile2 getMapFileFromName(String mapName) {
-		return new VFile2(this.mapDataDir, mapName + ".dat");
+		return WorldsDB.newVFile(this.mapDataDir, mapName + ".dat");
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/world/storage/SaveHandlerMP.java b/src/game/java/net/minecraft/world/storage/SaveHandlerMP.java
similarity index 100%
rename from src/main/java/net/minecraft/world/storage/SaveHandlerMP.java
rename to src/game/java/net/minecraft/world/storage/SaveHandlerMP.java
diff --git a/src/main/java/net/minecraft/world/storage/WorldInfo.java b/src/game/java/net/minecraft/world/storage/WorldInfo.java
similarity index 96%
rename from src/main/java/net/minecraft/world/storage/WorldInfo.java
rename to src/game/java/net/minecraft/world/storage/WorldInfo.java
index fbc65f0..69e5ad6 100755
--- a/src/main/java/net/minecraft/world/storage/WorldInfo.java
+++ b/src/game/java/net/minecraft/world/storage/WorldInfo.java
@@ -3,7 +3,6 @@ package net.minecraft.world.storage;
 import java.util.concurrent.Callable;
 import net.minecraft.crash.CrashReportCategory;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.EnumDifficulty;
 import net.minecraft.world.GameRules;
@@ -280,7 +279,7 @@ public class WorldInfo {
 		nbt.setLong("Time", this.totalTime);
 		nbt.setLong("DayTime", this.worldTime);
 		nbt.setLong("SizeOnDisk", this.sizeOnDisk);
-		nbt.setLong("LastPlayed", MinecraftServer.getCurrentTimeMillis());
+		nbt.setLong("LastPlayed", System.currentTimeMillis());
 		nbt.setString("LevelName", this.levelName);
 		nbt.setInteger("version", this.saveVersion);
 		nbt.setInteger("clearWeatherTime", this.cleanWeatherTime);
diff --git a/src/lwjgl/java/fi/iki/elonen/NanoHTTPD.java b/src/lwjgl/java/fi/iki/elonen/NanoHTTPD.java
new file mode 100755
index 0000000..d0d6727
--- /dev/null
+++ b/src/lwjgl/java/fi/iki/elonen/NanoHTTPD.java
@@ -0,0 +1,2333 @@
+package fi.iki.elonen;
+
+/*
+ * #%L
+ * NanoHttpd-Core
+ * %%
+ * Copyright (C) 2012 - 2015 nanohttpd
+ * %%
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * 3. Neither the name of the nanohttpd nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.security.KeyStore;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.TimeZone;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.GZIPOutputStream;
+
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.TrustManagerFactory;
+
+import fi.iki.elonen.NanoHTTPD.Response.IStatus;
+import fi.iki.elonen.NanoHTTPD.Response.Status;
+
+/**
+ * A simple, tiny, nicely embeddable HTTP server in Java
+ * <p/>
+ * <p/>
+ * NanoHTTPD
+ * <p>
+ * Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen,
+ * 2010 by Konstantinos Togias
+ * </p>
+ * <p/>
+ * <p/>
+ * <b>Features + limitations: </b>
+ * <ul>
+ * <p/>
+ * <li>Only one Java file</li>
+ * <li>Java 5 compatible</li>
+ * <li>Released as open source, Modified BSD licence</li>
+ * <li>No fixed config files, logging, authorization etc. (Implement yourself if
+ * you need them.)</li>
+ * <li>Supports parameter parsing of GET and POST methods (+ rudimentary PUT
+ * support in 1.25)</li>
+ * <li>Supports both dynamic content and file serving</li>
+ * <li>Supports file upload (since version 1.2, 2010)</li>
+ * <li>Supports partial content (streaming)</li>
+ * <li>Supports ETags</li>
+ * <li>Never caches anything</li>
+ * <li>Doesn't limit bandwidth, request time or simultaneous connections</li>
+ * <li>Default code serves files and shows all HTTP parameters and headers</li>
+ * <li>File server supports directory listing, index.html and index.htm</li>
+ * <li>File server supports partial content (streaming)</li>
+ * <li>File server supports ETags</li>
+ * <li>File server does the 301 redirection trick for directories without
+ * '/'</li>
+ * <li>File server supports simple skipping for files (continue download)</li>
+ * <li>File server serves also very long files without memory overhead</li>
+ * <li>Contains a built-in list of most common MIME types</li>
+ * <li>All header names are converted to lower case so they don't vary between
+ * browsers/clients</li>
+ * <p/>
+ * </ul>
+ * <p/>
+ * <p/>
+ * <b>How to use: </b>
+ * <ul>
+ * <p/>
+ * <li>Subclass and implement serve() and embed to your own program</li>
+ * <p/>
+ * </ul>
+ * <p/>
+ * See the separate "LICENSE.md" file for the distribution license (Modified BSD
+ * licence)
+ */
+public abstract class NanoHTTPD {
+
+	/**
+	 * Pluggable strategy for asynchronously executing requests.
+	 */
+	public interface AsyncRunner {
+
+		void closeAll();
+
+		void closed(ClientHandler clientHandler);
+
+		void exec(ClientHandler code);
+	}
+
+	/**
+	 * The runnable that will be used for every new client connection.
+	 */
+	public class ClientHandler implements Runnable {
+
+		private final InputStream inputStream;
+
+		private final Socket acceptSocket;
+
+		public ClientHandler(InputStream inputStream, Socket acceptSocket) {
+			this.inputStream = inputStream;
+			this.acceptSocket = acceptSocket;
+		}
+
+		public void close() {
+			safeClose(this.inputStream);
+			safeClose(this.acceptSocket);
+		}
+
+		@Override
+		public void run() {
+			OutputStream outputStream = null;
+			try {
+				outputStream = this.acceptSocket.getOutputStream();
+				TempFileManager tempFileManager = NanoHTTPD.this.tempFileManagerFactory.create();
+				HTTPSession session = new HTTPSession(tempFileManager, this.inputStream, outputStream,
+						this.acceptSocket.getInetAddress());
+				while (!this.acceptSocket.isClosed()) {
+					session.execute();
+				}
+			} catch (Exception e) {
+				// When the socket is closed by the client,
+				// we throw our own SocketException
+				// to break the "keep alive" loop above. If
+				// the exception was anything other
+				// than the expected SocketException OR a
+				// SocketTimeoutException, print the
+				// stacktrace
+				if (!(e instanceof SocketException && "NanoHttpd Shutdown".equals(e.getMessage()))
+						&& !(e instanceof SocketTimeoutException)) {
+					NanoHTTPD.LOG.log(Level.SEVERE,
+							"Communication with the client broken, or an bug in the handler code", e);
+				}
+			} finally {
+				safeClose(outputStream);
+				safeClose(this.inputStream);
+				safeClose(this.acceptSocket);
+				NanoHTTPD.this.asyncRunner.closed(this);
+			}
+		}
+	}
+
+	public static class Cookie {
+
+		public static String getHTTPTime(int days) {
+			Calendar calendar = Calendar.getInstance();
+			SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
+			dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+			calendar.add(Calendar.DAY_OF_MONTH, days);
+			return dateFormat.format(calendar.getTime());
+		}
+
+		private final String n, v, e;
+
+		public Cookie(String name, String value) {
+			this(name, value, 30);
+		}
+
+		public Cookie(String name, String value, int numDays) {
+			this.n = name;
+			this.v = value;
+			this.e = getHTTPTime(numDays);
+		}
+
+		public Cookie(String name, String value, String expires) {
+			this.n = name;
+			this.v = value;
+			this.e = expires;
+		}
+
+		public String getHTTPHeader() {
+			String fmt = "%s=%s; expires=%s";
+			return String.format(fmt, this.n, this.v, this.e);
+		}
+	}
+
+	/**
+	 * Provides rudimentary support for cookies. Doesn't support 'path', 'secure'
+	 * nor 'httpOnly'. Feel free to improve it and/or add unsupported features.
+	 * 
+	 * @author LordFokas
+	 */
+	public class CookieHandler implements Iterable<String> {
+
+		private final HashMap<String, String> cookies = new HashMap<String, String>();
+
+		private final ArrayList<Cookie> queue = new ArrayList<Cookie>();
+
+		public CookieHandler(Map<String, String> httpHeaders) {
+			String raw = httpHeaders.get("cookie");
+			if (raw != null) {
+				String[] tokens = raw.split(";");
+				for (String token : tokens) {
+					String[] data = token.trim().split("=");
+					if (data.length == 2) {
+						this.cookies.put(data[0], data[1]);
+					}
+				}
+			}
+		}
+
+		/**
+		 * Set a cookie with an expiration date from a month ago, effectively deleting
+		 * it on the client side.
+		 * 
+		 * @param name The cookie name.
+		 */
+		public void delete(String name) {
+			set(name, "-delete-", -30);
+		}
+
+		@Override
+		public Iterator<String> iterator() {
+			return this.cookies.keySet().iterator();
+		}
+
+		/**
+		 * Read a cookie from the HTTP Headers.
+		 * 
+		 * @param name The cookie's name.
+		 * @return The cookie's value if it exists, null otherwise.
+		 */
+		public String read(String name) {
+			return this.cookies.get(name);
+		}
+
+		public void set(Cookie cookie) {
+			this.queue.add(cookie);
+		}
+
+		/**
+		 * Sets a cookie.
+		 * 
+		 * @param name    The cookie's name.
+		 * @param value   The cookie's value.
+		 * @param expires How many days until the cookie expires.
+		 */
+		public void set(String name, String value, int expires) {
+			this.queue.add(new Cookie(name, value, Cookie.getHTTPTime(expires)));
+		}
+
+		/**
+		 * Internally used by the webserver to add all queued cookies into the
+		 * Response's HTTP Headers.
+		 * 
+		 * @param response The Response object to which headers the queued cookies will
+		 *                 be added.
+		 */
+		public void unloadQueue(Response response) {
+			for (Cookie cookie : this.queue) {
+				response.addHeader("Set-Cookie", cookie.getHTTPHeader());
+			}
+		}
+	}
+
+	/**
+	 * Default threading strategy for NanoHTTPD.
+	 * <p/>
+	 * <p>
+	 * By default, the server spawns a new Thread for every incoming request. These
+	 * are set to <i>daemon</i> status, and named according to the request number.
+	 * The name is useful when profiling the application.
+	 * </p>
+	 */
+	public static class DefaultAsyncRunner implements AsyncRunner {
+
+		private long requestCount;
+
+		private final List<ClientHandler> running = Collections
+				.synchronizedList(new ArrayList<NanoHTTPD.ClientHandler>());
+
+		/**
+		 * @return a list with currently running clients.
+		 */
+		public List<ClientHandler> getRunning() {
+			return running;
+		}
+
+		@Override
+		public void closeAll() {
+			// copy of the list for concurrency
+			for (ClientHandler clientHandler : new ArrayList<ClientHandler>(this.running)) {
+				clientHandler.close();
+			}
+		}
+
+		@Override
+		public void closed(ClientHandler clientHandler) {
+			this.running.remove(clientHandler);
+		}
+
+		@Override
+		public void exec(ClientHandler clientHandler) {
+			++this.requestCount;
+			Thread t = new Thread(clientHandler);
+			t.setDaemon(true);
+			t.setName("NanoHttpd Request Processor (#" + this.requestCount + ")");
+			this.running.add(clientHandler);
+			t.start();
+		}
+	}
+
+	/**
+	 * Default strategy for creating and cleaning up temporary files.
+	 * <p/>
+	 * <p>
+	 * By default, files are created by <code>File.createTempFile()</code> in the
+	 * directory specified.
+	 * </p>
+	 */
+	public static class DefaultTempFile implements TempFile {
+
+		private final File file;
+
+		private final OutputStream fstream;
+
+		public DefaultTempFile(File tempdir) throws IOException {
+			this.file = File.createTempFile("NanoHTTPD-", "", tempdir);
+			this.fstream = new FileOutputStream(this.file);
+		}
+
+		@Override
+		public void delete() throws Exception {
+			safeClose(this.fstream);
+			if (!this.file.delete()) {
+				throw new Exception("could not delete temporary file: " + this.file.getAbsolutePath());
+			}
+		}
+
+		@Override
+		public String getName() {
+			return this.file.getAbsolutePath();
+		}
+
+		@Override
+		public OutputStream open() throws Exception {
+			return this.fstream;
+		}
+	}
+
+	/**
+	 * Default strategy for creating and cleaning up temporary files.
+	 * <p/>
+	 * <p>
+	 * This class stores its files in the standard location (that is, wherever
+	 * <code>java.io.tmpdir</code> points to). Files are added to an internal list,
+	 * and deleted when no longer needed (that is, when <code>clear()</code> is
+	 * invoked at the end of processing a request).
+	 * </p>
+	 */
+	public static class DefaultTempFileManager implements TempFileManager {
+
+		private final File tmpdir;
+
+		private final List<TempFile> tempFiles;
+
+		public DefaultTempFileManager() {
+			this.tmpdir = new File(System.getProperty("java.io.tmpdir"));
+			if (!tmpdir.exists()) {
+				tmpdir.mkdirs();
+			}
+			this.tempFiles = new ArrayList<TempFile>();
+		}
+
+		@Override
+		public void clear() {
+			for (TempFile file : this.tempFiles) {
+				try {
+					file.delete();
+				} catch (Exception ignored) {
+					NanoHTTPD.LOG.log(Level.WARNING, "could not delete file ", ignored);
+				}
+			}
+			this.tempFiles.clear();
+		}
+
+		@Override
+		public TempFile createTempFile(String filename_hint) throws Exception {
+			DefaultTempFile tempFile = new DefaultTempFile(this.tmpdir);
+			this.tempFiles.add(tempFile);
+			return tempFile;
+		}
+	}
+
+	/**
+	 * Default strategy for creating and cleaning up temporary files.
+	 */
+	private class DefaultTempFileManagerFactory implements TempFileManagerFactory {
+
+		@Override
+		public TempFileManager create() {
+			return new DefaultTempFileManager();
+		}
+	}
+
+	/**
+	 * Creates a normal ServerSocket for TCP connections
+	 */
+	public static class DefaultServerSocketFactory implements ServerSocketFactory {
+
+		@Override
+		public ServerSocket create() throws IOException {
+			return new ServerSocket();
+		}
+
+	}
+
+	/**
+	 * Creates a new SSLServerSocket
+	 */
+	public static class SecureServerSocketFactory implements ServerSocketFactory {
+
+		private SSLServerSocketFactory sslServerSocketFactory;
+
+		private String[] sslProtocols;
+
+		public SecureServerSocketFactory(SSLServerSocketFactory sslServerSocketFactory, String[] sslProtocols) {
+			this.sslServerSocketFactory = sslServerSocketFactory;
+			this.sslProtocols = sslProtocols;
+		}
+
+		@Override
+		public ServerSocket create() throws IOException {
+			SSLServerSocket ss = null;
+			ss = (SSLServerSocket) this.sslServerSocketFactory.createServerSocket();
+			if (this.sslProtocols != null) {
+				ss.setEnabledProtocols(this.sslProtocols);
+			} else {
+				ss.setEnabledProtocols(ss.getSupportedProtocols());
+			}
+			ss.setUseClientMode(false);
+			ss.setWantClientAuth(false);
+			ss.setNeedClientAuth(false);
+			return ss;
+		}
+
+	}
+
+	private static final String CONTENT_DISPOSITION_REGEX = "([ |\t]*Content-Disposition[ |\t]*:)(.*)";
+
+	private static final Pattern CONTENT_DISPOSITION_PATTERN = Pattern.compile(CONTENT_DISPOSITION_REGEX,
+			Pattern.CASE_INSENSITIVE);
+
+	private static final String CONTENT_TYPE_REGEX = "([ |\t]*content-type[ |\t]*:)(.*)";
+
+	private static final Pattern CONTENT_TYPE_PATTERN = Pattern.compile(CONTENT_TYPE_REGEX, Pattern.CASE_INSENSITIVE);
+
+	private static final String CONTENT_DISPOSITION_ATTRIBUTE_REGEX = "[ |\t]*([a-zA-Z]*)[ |\t]*=[ |\t]*['|\"]([^\"^']*)['|\"]";
+
+	private static final Pattern CONTENT_DISPOSITION_ATTRIBUTE_PATTERN = Pattern
+			.compile(CONTENT_DISPOSITION_ATTRIBUTE_REGEX);
+
+	protected static class ContentType {
+
+		private static final String ASCII_ENCODING = "US-ASCII";
+
+		private static final String MULTIPART_FORM_DATA_HEADER = "multipart/form-data";
+
+		private static final String CONTENT_REGEX = "[ |\t]*([^/^ ^;^,]+/[^ ^;^,]+)";
+
+		private static final Pattern MIME_PATTERN = Pattern.compile(CONTENT_REGEX, Pattern.CASE_INSENSITIVE);
+
+		private static final String CHARSET_REGEX = "[ |\t]*(charset)[ |\t]*=[ |\t]*['|\"]?([^\"^'^;^,]*)['|\"]?";
+
+		private static final Pattern CHARSET_PATTERN = Pattern.compile(CHARSET_REGEX, Pattern.CASE_INSENSITIVE);
+
+		private static final String BOUNDARY_REGEX = "[ |\t]*(boundary)[ |\t]*=[ |\t]*['|\"]?([^\"^'^;^,]*)['|\"]?";
+
+		private static final Pattern BOUNDARY_PATTERN = Pattern.compile(BOUNDARY_REGEX, Pattern.CASE_INSENSITIVE);
+
+		private final String contentTypeHeader;
+
+		private final String contentType;
+
+		private final String encoding;
+
+		private final String boundary;
+
+		public ContentType(String contentTypeHeader) {
+			this.contentTypeHeader = contentTypeHeader;
+			if (contentTypeHeader != null) {
+				contentType = getDetailFromContentHeader(contentTypeHeader, MIME_PATTERN, "", 1);
+				encoding = getDetailFromContentHeader(contentTypeHeader, CHARSET_PATTERN, null, 2);
+			} else {
+				contentType = "";
+				encoding = "UTF-8";
+			}
+			if (MULTIPART_FORM_DATA_HEADER.equalsIgnoreCase(contentType)) {
+				boundary = getDetailFromContentHeader(contentTypeHeader, BOUNDARY_PATTERN, null, 2);
+			} else {
+				boundary = null;
+			}
+		}
+
+		private String getDetailFromContentHeader(String contentTypeHeader, Pattern pattern, String defaultValue,
+				int group) {
+			Matcher matcher = pattern.matcher(contentTypeHeader);
+			return matcher.find() ? matcher.group(group) : defaultValue;
+		}
+
+		public String getContentTypeHeader() {
+			return contentTypeHeader;
+		}
+
+		public String getContentType() {
+			return contentType;
+		}
+
+		public String getEncoding() {
+			return encoding == null ? ASCII_ENCODING : encoding;
+		}
+
+		public String getBoundary() {
+			return boundary;
+		}
+
+		public boolean isMultipart() {
+			return MULTIPART_FORM_DATA_HEADER.equalsIgnoreCase(contentType);
+		}
+
+		public ContentType tryUTF8() {
+			if (encoding == null) {
+				return new ContentType(this.contentTypeHeader + "; charset=UTF-8");
+			}
+			return this;
+		}
+	}
+
+	protected class HTTPSession implements IHTTPSession {
+
+		private static final int REQUEST_BUFFER_LEN = 512;
+
+		private static final int MEMORY_STORE_LIMIT = 1024;
+
+		public static final int BUFSIZE = 8192;
+
+		public static final int MAX_HEADER_SIZE = 1024;
+
+		private final TempFileManager tempFileManager;
+
+		private final OutputStream outputStream;
+
+		private final BufferedInputStream inputStream;
+
+		private int splitbyte;
+
+		private int rlen;
+
+		private String uri;
+
+		private Method method;
+
+		private Map<String, List<String>> parms;
+
+		private Map<String, String> headers;
+
+		private CookieHandler cookies;
+
+		private String queryParameterString;
+
+		private String remoteIp;
+
+		private String remoteHostname;
+
+		private String protocolVersion;
+
+		public HTTPSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) {
+			this.tempFileManager = tempFileManager;
+			this.inputStream = new BufferedInputStream(inputStream, HTTPSession.BUFSIZE);
+			this.outputStream = outputStream;
+		}
+
+		public HTTPSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream,
+				InetAddress inetAddress) {
+			this.tempFileManager = tempFileManager;
+			this.inputStream = new BufferedInputStream(inputStream, HTTPSession.BUFSIZE);
+			this.outputStream = outputStream;
+			this.remoteIp = inetAddress.isLoopbackAddress() || inetAddress.isAnyLocalAddress() ? "127.0.0.1"
+					: inetAddress.getHostAddress().toString();
+			this.remoteHostname = inetAddress.isLoopbackAddress() || inetAddress.isAnyLocalAddress() ? "localhost"
+					: inetAddress.getHostName().toString();
+			this.headers = new HashMap<String, String>();
+		}
+
+		/**
+		 * Decodes the sent headers and loads the data into Key/value pairs
+		 */
+		private void decodeHeader(BufferedReader in, Map<String, String> pre, Map<String, List<String>> parms,
+				Map<String, String> headers) throws ResponseException {
+			try {
+				// Read the request line
+				String inLine = in.readLine();
+				if (inLine == null) {
+					return;
+				}
+
+				StringTokenizer st = new StringTokenizer(inLine);
+				if (!st.hasMoreTokens()) {
+					throw new ResponseException(Response.Status.BAD_REQUEST,
+							"BAD REQUEST: Syntax error. Usage: GET /example/file.html");
+				}
+
+				pre.put("method", st.nextToken());
+
+				if (!st.hasMoreTokens()) {
+					throw new ResponseException(Response.Status.BAD_REQUEST,
+							"BAD REQUEST: Missing URI. Usage: GET /example/file.html");
+				}
+
+				String uri = st.nextToken();
+
+				// Decode parameters from the URI
+				int qmi = uri.indexOf('?');
+				if (qmi >= 0) {
+					decodeParms(uri.substring(qmi + 1), parms);
+					uri = decodePercent(uri.substring(0, qmi));
+				} else {
+					uri = decodePercent(uri);
+				}
+
+				// If there's another token, its protocol version,
+				// followed by HTTP headers.
+				// NOTE: this now forces header names lower case since they are
+				// case insensitive and vary by client.
+				if (st.hasMoreTokens()) {
+					protocolVersion = st.nextToken();
+				} else {
+					protocolVersion = "HTTP/1.1";
+					NanoHTTPD.LOG.log(Level.FINE, "no protocol version specified, strange. Assuming HTTP/1.1.");
+				}
+				String line = in.readLine();
+				while (line != null && !line.trim().isEmpty()) {
+					int p = line.indexOf(':');
+					if (p >= 0) {
+						headers.put(line.substring(0, p).trim().toLowerCase(Locale.US), line.substring(p + 1).trim());
+					}
+					line = in.readLine();
+				}
+
+				pre.put("uri", uri);
+			} catch (IOException ioe) {
+				throw new ResponseException(Response.Status.INTERNAL_ERROR,
+						"SERVER INTERNAL ERROR: IOException: " + ioe.getMessage(), ioe);
+			}
+		}
+
+		/**
+		 * Decodes the Multipart Body data and put it into Key/Value pairs.
+		 */
+		private void decodeMultipartFormData(ContentType contentType, ByteBuffer fbuf, Map<String, List<String>> parms,
+				Map<String, String> files) throws ResponseException {
+			int pcount = 0;
+			try {
+				int[] boundaryIdxs = getBoundaryPositions(fbuf, contentType.getBoundary().getBytes());
+				if (boundaryIdxs.length < 2) {
+					throw new ResponseException(Response.Status.BAD_REQUEST,
+							"BAD REQUEST: Content type is multipart/form-data but contains less than two boundary strings.");
+				}
+
+				byte[] partHeaderBuff = new byte[MAX_HEADER_SIZE];
+				for (int boundaryIdx = 0; boundaryIdx < boundaryIdxs.length - 1; boundaryIdx++) {
+					fbuf.position(boundaryIdxs[boundaryIdx]);
+					int len = (fbuf.remaining() < MAX_HEADER_SIZE) ? fbuf.remaining() : MAX_HEADER_SIZE;
+					fbuf.get(partHeaderBuff, 0, len);
+					BufferedReader in = new BufferedReader(
+							new InputStreamReader(new ByteArrayInputStream(partHeaderBuff, 0, len),
+									Charset.forName(contentType.getEncoding())),
+							len);
+
+					int headerLines = 0;
+					// First line is boundary string
+					String mpline = in.readLine();
+					headerLines++;
+					if (mpline == null || !mpline.contains(contentType.getBoundary())) {
+						throw new ResponseException(Response.Status.BAD_REQUEST,
+								"BAD REQUEST: Content type is multipart/form-data but chunk does not start with boundary.");
+					}
+
+					String partName = null, fileName = null, partContentType = null;
+					// Parse the reset of the header lines
+					mpline = in.readLine();
+					headerLines++;
+					while (mpline != null && mpline.trim().length() > 0) {
+						Matcher matcher = CONTENT_DISPOSITION_PATTERN.matcher(mpline);
+						if (matcher.matches()) {
+							String attributeString = matcher.group(2);
+							matcher = CONTENT_DISPOSITION_ATTRIBUTE_PATTERN.matcher(attributeString);
+							while (matcher.find()) {
+								String key = matcher.group(1);
+								if ("name".equalsIgnoreCase(key)) {
+									partName = matcher.group(2);
+								} else if ("filename".equalsIgnoreCase(key)) {
+									fileName = matcher.group(2);
+									// add these two line to support multiple
+									// files uploaded using the same field Id
+									if (!fileName.isEmpty()) {
+										if (pcount > 0)
+											partName = partName + String.valueOf(pcount++);
+										else
+											pcount++;
+									}
+								}
+							}
+						}
+						matcher = CONTENT_TYPE_PATTERN.matcher(mpline);
+						if (matcher.matches()) {
+							partContentType = matcher.group(2).trim();
+						}
+						mpline = in.readLine();
+						headerLines++;
+					}
+					int partHeaderLength = 0;
+					while (headerLines-- > 0) {
+						partHeaderLength = scipOverNewLine(partHeaderBuff, partHeaderLength);
+					}
+					// Read the part data
+					if (partHeaderLength >= len - 4) {
+						throw new ResponseException(Response.Status.INTERNAL_ERROR,
+								"Multipart header size exceeds MAX_HEADER_SIZE.");
+					}
+					int partDataStart = boundaryIdxs[boundaryIdx] + partHeaderLength;
+					int partDataEnd = boundaryIdxs[boundaryIdx + 1] - 4;
+
+					fbuf.position(partDataStart);
+
+					List<String> values = parms.get(partName);
+					if (values == null) {
+						values = new ArrayList<String>();
+						parms.put(partName, values);
+					}
+
+					if (partContentType == null) {
+						// Read the part into a string
+						byte[] data_bytes = new byte[partDataEnd - partDataStart];
+						fbuf.get(data_bytes);
+
+						values.add(new String(data_bytes, contentType.getEncoding()));
+					} else {
+						// Read it into a file
+						String path = saveTmpFile(fbuf, partDataStart, partDataEnd - partDataStart, fileName);
+						if (!files.containsKey(partName)) {
+							files.put(partName, path);
+						} else {
+							int count = 2;
+							while (files.containsKey(partName + count)) {
+								count++;
+							}
+							files.put(partName + count, path);
+						}
+						values.add(fileName);
+					}
+				}
+			} catch (ResponseException re) {
+				throw re;
+			} catch (Exception e) {
+				throw new ResponseException(Response.Status.INTERNAL_ERROR, e.toString());
+			}
+		}
+
+		private int scipOverNewLine(byte[] partHeaderBuff, int index) {
+			while (partHeaderBuff[index] != '\n') {
+				index++;
+			}
+			return ++index;
+		}
+
+		/**
+		 * Decodes parameters in percent-encoded URI-format ( e.g.
+		 * "name=Jack%20Daniels&pass=Single%20Malt" ) and adds them to given Map.
+		 */
+		private void decodeParms(String parms, Map<String, List<String>> p) {
+			if (parms == null) {
+				this.queryParameterString = "";
+				return;
+			}
+
+			this.queryParameterString = parms;
+			StringTokenizer st = new StringTokenizer(parms, "&");
+			while (st.hasMoreTokens()) {
+				String e = st.nextToken();
+				int sep = e.indexOf('=');
+				String key = null;
+				String value = null;
+
+				if (sep >= 0) {
+					key = decodePercent(e.substring(0, sep)).trim();
+					value = decodePercent(e.substring(sep + 1));
+				} else {
+					key = decodePercent(e).trim();
+					value = "";
+				}
+
+				List<String> values = p.get(key);
+				if (values == null) {
+					values = new ArrayList<String>();
+					p.put(key, values);
+				}
+
+				values.add(value);
+			}
+		}
+
+		@Override
+		public void execute() throws IOException {
+			Response r = null;
+			try {
+				// Read the first 8192 bytes.
+				// The full header should fit in here.
+				// Apache's default header limit is 8KB.
+				// Do NOT assume that a single read will get the entire header
+				// at once!
+				byte[] buf = new byte[HTTPSession.BUFSIZE];
+				this.splitbyte = 0;
+				this.rlen = 0;
+
+				int read = -1;
+				this.inputStream.mark(HTTPSession.BUFSIZE);
+				try {
+					read = this.inputStream.read(buf, 0, HTTPSession.BUFSIZE);
+				} catch (SSLException e) {
+					throw e;
+				} catch (IOException e) {
+					safeClose(this.inputStream);
+					safeClose(this.outputStream);
+					throw new SocketException("NanoHttpd Shutdown");
+				}
+				if (read == -1) {
+					// socket was been closed
+					safeClose(this.inputStream);
+					safeClose(this.outputStream);
+					throw new SocketException("NanoHttpd Shutdown");
+				}
+				while (read > 0) {
+					this.rlen += read;
+					this.splitbyte = findHeaderEnd(buf, this.rlen);
+					if (this.splitbyte > 0) {
+						break;
+					}
+					read = this.inputStream.read(buf, this.rlen, HTTPSession.BUFSIZE - this.rlen);
+				}
+
+				if (this.splitbyte < this.rlen) {
+					this.inputStream.reset();
+					this.inputStream.skip(this.splitbyte);
+				}
+
+				this.parms = new HashMap<String, List<String>>();
+				if (null == this.headers) {
+					this.headers = new HashMap<String, String>();
+				} else {
+					this.headers.clear();
+				}
+
+				// Create a BufferedReader for parsing the header.
+				BufferedReader hin = new BufferedReader(
+						new InputStreamReader(new ByteArrayInputStream(buf, 0, this.rlen)));
+
+				// Decode the header into parms and header java properties
+				Map<String, String> pre = new HashMap<String, String>();
+				decodeHeader(hin, pre, this.parms, this.headers);
+
+				if (null != this.remoteIp) {
+					this.headers.put("remote-addr", this.remoteIp);
+					this.headers.put("http-client-ip", this.remoteIp);
+				}
+
+				this.method = Method.lookup(pre.get("method"));
+				if (this.method == null) {
+					throw new ResponseException(Response.Status.BAD_REQUEST,
+							"BAD REQUEST: Syntax error. HTTP verb " + pre.get("method") + " unhandled.");
+				}
+
+				this.uri = pre.get("uri");
+
+				this.cookies = new CookieHandler(this.headers);
+
+				String connection = this.headers.get("connection");
+				boolean keepAlive = "HTTP/1.1".equals(protocolVersion)
+						&& (connection == null || !connection.matches("(?i).*close.*"));
+
+				// Ok, now do the serve()
+
+				// TODO: long body_size = getBodySize();
+				// TODO: long pos_before_serve = this.inputStream.totalRead()
+				// (requires implementation for totalRead())
+				r = serve(this);
+				// TODO: this.inputStream.skip(body_size -
+				// (this.inputStream.totalRead() - pos_before_serve))
+
+				if (r == null) {
+					throw new ResponseException(Response.Status.INTERNAL_ERROR,
+							"SERVER INTERNAL ERROR: Serve() returned a null response.");
+				} else {
+					String acceptEncoding = this.headers.get("accept-encoding");
+					this.cookies.unloadQueue(r);
+					r.setRequestMethod(this.method);
+					r.setGzipEncoding(
+							useGzipWhenAccepted(r) && acceptEncoding != null && acceptEncoding.contains("gzip"));
+					r.setKeepAlive(keepAlive);
+					r.send(this.outputStream);
+				}
+				if (!keepAlive || r.isCloseConnection()) {
+					throw new SocketException("NanoHttpd Shutdown");
+				}
+			} catch (SocketException e) {
+				// throw it out to close socket object (finalAccept)
+				throw e;
+			} catch (SocketTimeoutException ste) {
+				// treat socket timeouts the same way we treat socket exceptions
+				// i.e. close the stream & finalAccept object by throwing the
+				// exception up the call stack.
+				throw ste;
+			} catch (SSLException ssle) {
+				Response resp = newFixedLengthResponse(Response.Status.INTERNAL_ERROR, NanoHTTPD.MIME_PLAINTEXT,
+						"SSL PROTOCOL FAILURE: " + ssle.getMessage());
+				resp.send(this.outputStream);
+				safeClose(this.outputStream);
+			} catch (IOException ioe) {
+				Response resp = newFixedLengthResponse(Response.Status.INTERNAL_ERROR, NanoHTTPD.MIME_PLAINTEXT,
+						"SERVER INTERNAL ERROR: IOException: " + ioe.getMessage());
+				resp.send(this.outputStream);
+				safeClose(this.outputStream);
+			} catch (ResponseException re) {
+				Response resp = newFixedLengthResponse(re.getStatus(), NanoHTTPD.MIME_PLAINTEXT, re.getMessage());
+				resp.send(this.outputStream);
+				safeClose(this.outputStream);
+			} finally {
+				safeClose(r);
+				this.tempFileManager.clear();
+			}
+		}
+
+		/**
+		 * Find byte index separating header from body. It must be the last byte of the
+		 * first two sequential new lines.
+		 */
+		private int findHeaderEnd(final byte[] buf, int rlen) {
+			int splitbyte = 0;
+			while (splitbyte + 1 < rlen) {
+
+				// RFC2616
+				if (buf[splitbyte] == '\r' && buf[splitbyte + 1] == '\n' && splitbyte + 3 < rlen
+						&& buf[splitbyte + 2] == '\r' && buf[splitbyte + 3] == '\n') {
+					return splitbyte + 4;
+				}
+
+				// tolerance
+				if (buf[splitbyte] == '\n' && buf[splitbyte + 1] == '\n') {
+					return splitbyte + 2;
+				}
+				splitbyte++;
+			}
+			return 0;
+		}
+
+		/**
+		 * Find the byte positions where multipart boundaries start. This reads a large
+		 * block at a time and uses a temporary buffer to optimize (memory mapped) file
+		 * access.
+		 */
+		private int[] getBoundaryPositions(ByteBuffer b, byte[] boundary) {
+			int[] res = new int[0];
+			if (b.remaining() < boundary.length) {
+				return res;
+			}
+
+			int search_window_pos = 0;
+			byte[] search_window = new byte[4 * 1024 + boundary.length];
+
+			int first_fill = (b.remaining() < search_window.length) ? b.remaining() : search_window.length;
+			b.get(search_window, 0, first_fill);
+			int new_bytes = first_fill - boundary.length;
+
+			do {
+				// Search the search_window
+				for (int j = 0; j < new_bytes; j++) {
+					for (int i = 0; i < boundary.length; i++) {
+						if (search_window[j + i] != boundary[i])
+							break;
+						if (i == boundary.length - 1) {
+							// Match found, add it to results
+							int[] new_res = new int[res.length + 1];
+							System.arraycopy(res, 0, new_res, 0, res.length);
+							new_res[res.length] = search_window_pos + j;
+							res = new_res;
+						}
+					}
+				}
+				search_window_pos += new_bytes;
+
+				// Copy the end of the buffer to the start
+				System.arraycopy(search_window, search_window.length - boundary.length, search_window, 0,
+						boundary.length);
+
+				// Refill search_window
+				new_bytes = search_window.length - boundary.length;
+				new_bytes = (b.remaining() < new_bytes) ? b.remaining() : new_bytes;
+				b.get(search_window, boundary.length, new_bytes);
+			} while (new_bytes > 0);
+			return res;
+		}
+
+		@Override
+		public CookieHandler getCookies() {
+			return this.cookies;
+		}
+
+		@Override
+		public final Map<String, String> getHeaders() {
+			return this.headers;
+		}
+
+		@Override
+		public final InputStream getInputStream() {
+			return this.inputStream;
+		}
+
+		@Override
+		public final Method getMethod() {
+			return this.method;
+		}
+
+		/**
+		 * @deprecated use {@link #getParameters()} instead.
+		 */
+		@Override
+		@Deprecated
+		public final Map<String, String> getParms() {
+			Map<String, String> result = new HashMap<String, String>();
+			for (String key : this.parms.keySet()) {
+				result.put(key, this.parms.get(key).get(0));
+			}
+
+			return result;
+		}
+
+		@Override
+		public final Map<String, List<String>> getParameters() {
+			return this.parms;
+		}
+
+		@Override
+		public String getQueryParameterString() {
+			return this.queryParameterString;
+		}
+
+		private RandomAccessFile getTmpBucket() {
+			try {
+				TempFile tempFile = this.tempFileManager.createTempFile(null);
+				return new RandomAccessFile(tempFile.getName(), "rw");
+			} catch (Exception e) {
+				throw new Error(e); // we won't recover, so throw an error
+			}
+		}
+
+		@Override
+		public final String getUri() {
+			return this.uri;
+		}
+
+		/**
+		 * Deduce body length in bytes. Either from "content-length" header or read
+		 * bytes.
+		 */
+		public long getBodySize() {
+			if (this.headers.containsKey("content-length")) {
+				return Long.parseLong(this.headers.get("content-length"));
+			} else if (this.splitbyte < this.rlen) {
+				return this.rlen - this.splitbyte;
+			}
+			return 0;
+		}
+
+		@Override
+		public void parseBody(Map<String, String> files) throws IOException, ResponseException {
+			RandomAccessFile randomAccessFile = null;
+			try {
+				long size = getBodySize();
+				ByteArrayOutputStream baos = null;
+				DataOutput requestDataOutput = null;
+
+				// Store the request in memory or a file, depending on size
+				if (size < MEMORY_STORE_LIMIT) {
+					baos = new ByteArrayOutputStream();
+					requestDataOutput = new DataOutputStream(baos);
+				} else {
+					randomAccessFile = getTmpBucket();
+					requestDataOutput = randomAccessFile;
+				}
+
+				// Read all the body and write it to request_data_output
+				byte[] buf = new byte[REQUEST_BUFFER_LEN];
+				while (this.rlen >= 0 && size > 0) {
+					this.rlen = this.inputStream.read(buf, 0, (int) Math.min(size, REQUEST_BUFFER_LEN));
+					size -= this.rlen;
+					if (this.rlen > 0) {
+						requestDataOutput.write(buf, 0, this.rlen);
+					}
+				}
+
+				ByteBuffer fbuf = null;
+				if (baos != null) {
+					fbuf = ByteBuffer.wrap(baos.toByteArray(), 0, baos.size());
+				} else {
+					fbuf = randomAccessFile.getChannel().map(FileChannel.MapMode.READ_ONLY, 0,
+							randomAccessFile.length());
+					randomAccessFile.seek(0);
+				}
+
+				// If the method is POST, there may be parameters
+				// in data section, too, read it:
+				if (Method.POST.equals(this.method)) {
+					ContentType contentType = new ContentType(this.headers.get("content-type"));
+					if (contentType.isMultipart()) {
+						String boundary = contentType.getBoundary();
+						if (boundary == null) {
+							throw new ResponseException(Response.Status.BAD_REQUEST,
+									"BAD REQUEST: Content type is multipart/form-data but boundary missing. Usage: GET /example/file.html");
+						}
+						decodeMultipartFormData(contentType, fbuf, this.parms, files);
+					} else {
+						byte[] postBytes = new byte[fbuf.remaining()];
+						fbuf.get(postBytes);
+						String postLine = new String(postBytes, contentType.getEncoding()).trim();
+						// Handle application/x-www-form-urlencoded
+						if ("application/x-www-form-urlencoded".equalsIgnoreCase(contentType.getContentType())) {
+							decodeParms(postLine, this.parms);
+						} else if (postLine.length() != 0) {
+							// Special case for raw POST data => create a
+							// special files entry "postData" with raw content
+							// data
+							files.put("postData", postLine);
+						}
+					}
+				} else if (Method.PUT.equals(this.method)) {
+					files.put("content", saveTmpFile(fbuf, 0, fbuf.limit(), null));
+				}
+			} finally {
+				safeClose(randomAccessFile);
+			}
+		}
+
+		/**
+		 * Retrieves the content of a sent file and saves it to a temporary file. The
+		 * full path to the saved file is returned.
+		 */
+		private String saveTmpFile(ByteBuffer b, int offset, int len, String filename_hint) {
+			String path = "";
+			if (len > 0) {
+				FileOutputStream fileOutputStream = null;
+				try {
+					TempFile tempFile = this.tempFileManager.createTempFile(filename_hint);
+					ByteBuffer src = b.duplicate();
+					fileOutputStream = new FileOutputStream(tempFile.getName());
+					FileChannel dest = fileOutputStream.getChannel();
+					src.position(offset).limit(offset + len);
+					dest.write(src.slice());
+					path = tempFile.getName();
+				} catch (Exception e) { // Catch exception if any
+					throw new Error(e); // we won't recover, so throw an error
+				} finally {
+					safeClose(fileOutputStream);
+				}
+			}
+			return path;
+		}
+
+		@Override
+		public String getRemoteIpAddress() {
+			return this.remoteIp;
+		}
+
+		@Override
+		public String getRemoteHostName() {
+			return this.remoteHostname;
+		}
+	}
+
+	/**
+	 * Handles one session, i.e. parses the HTTP request and returns the response.
+	 */
+	public interface IHTTPSession {
+
+		void execute() throws IOException;
+
+		CookieHandler getCookies();
+
+		Map<String, String> getHeaders();
+
+		InputStream getInputStream();
+
+		Method getMethod();
+
+		/**
+		 * This method will only return the first value for a given parameter. You will
+		 * want to use getParameters if you expect multiple values for a given key.
+		 * 
+		 * @deprecated use {@link #getParameters()} instead.
+		 */
+		@Deprecated
+		Map<String, String> getParms();
+
+		Map<String, List<String>> getParameters();
+
+		String getQueryParameterString();
+
+		/**
+		 * @return the path part of the URL.
+		 */
+		String getUri();
+
+		/**
+		 * Adds the files in the request body to the files map.
+		 * 
+		 * @param files map to modify
+		 */
+		void parseBody(Map<String, String> files) throws IOException, ResponseException;
+
+		/**
+		 * Get the remote ip address of the requester.
+		 * 
+		 * @return the IP address.
+		 */
+		String getRemoteIpAddress();
+
+		/**
+		 * Get the remote hostname of the requester.
+		 * 
+		 * @return the hostname.
+		 */
+		String getRemoteHostName();
+	}
+
+	/**
+	 * HTTP Request methods, with the ability to decode a <code>String</code> back
+	 * to its enum value.
+	 */
+	public enum Method {
+		GET, PUT, POST, DELETE, HEAD, OPTIONS, TRACE, CONNECT, PATCH, PROPFIND, PROPPATCH, MKCOL, MOVE, COPY, LOCK,
+		UNLOCK;
+
+		static Method lookup(String method) {
+			if (method == null)
+				return null;
+
+			try {
+				return valueOf(method);
+			} catch (IllegalArgumentException e) {
+				// TODO: Log it?
+				return null;
+			}
+		}
+	}
+
+	/**
+	 * HTTP response. Return one of these from serve().
+	 */
+	public static class Response implements Closeable {
+
+		public interface IStatus {
+
+			String getDescription();
+
+			int getRequestStatus();
+		}
+
+		/**
+		 * Some HTTP response status codes
+		 */
+		public enum Status implements IStatus {
+			SWITCH_PROTOCOL(101, "Switching Protocols"),
+
+			OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(202, "Accepted"), NO_CONTENT(204, "No Content"),
+			PARTIAL_CONTENT(206, "Partial Content"), MULTI_STATUS(207, "Multi-Status"),
+
+			REDIRECT(301, "Moved Permanently"),
+			/**
+			 * Many user agents mishandle 302 in ways that violate the RFC1945 spec (i.e.,
+			 * redirect a POST to a GET). 303 and 307 were added in RFC2616 to address this.
+			 * You should prefer 303 and 307 unless the calling user agent does not support
+			 * 303 and 307 functionality
+			 */
+			@Deprecated
+			FOUND(302, "Found"), REDIRECT_SEE_OTHER(303, "See Other"), NOT_MODIFIED(304, "Not Modified"),
+			TEMPORARY_REDIRECT(307, "Temporary Redirect"),
+
+			BAD_REQUEST(400, "Bad Request"), UNAUTHORIZED(401, "Unauthorized"), FORBIDDEN(403, "Forbidden"),
+			NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"),
+			NOT_ACCEPTABLE(406, "Not Acceptable"), REQUEST_TIMEOUT(408, "Request Timeout"), CONFLICT(409, "Conflict"),
+			GONE(410, "Gone"), LENGTH_REQUIRED(411, "Length Required"), PRECONDITION_FAILED(412, "Precondition Failed"),
+			PAYLOAD_TOO_LARGE(413, "Payload Too Large"), UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"),
+			RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"),
+			EXPECTATION_FAILED(417, "Expectation Failed"), TOO_MANY_REQUESTS(429, "Too Many Requests"),
+
+			INTERNAL_ERROR(500, "Internal Server Error"), NOT_IMPLEMENTED(501, "Not Implemented"),
+			SERVICE_UNAVAILABLE(503, "Service Unavailable"),
+			UNSUPPORTED_HTTP_VERSION(505, "HTTP Version Not Supported");
+
+			private final int requestStatus;
+
+			private final String description;
+
+			Status(int requestStatus, String description) {
+				this.requestStatus = requestStatus;
+				this.description = description;
+			}
+
+			public static Status lookup(int requestStatus) {
+				for (Status status : Status.values()) {
+					if (status.getRequestStatus() == requestStatus) {
+						return status;
+					}
+				}
+				return null;
+			}
+
+			@Override
+			public String getDescription() {
+				return "" + this.requestStatus + " " + this.description;
+			}
+
+			@Override
+			public int getRequestStatus() {
+				return this.requestStatus;
+			}
+
+		}
+
+		/**
+		 * Output stream that will automatically send every write to the wrapped
+		 * OutputStream according to chunked transfer:
+		 * http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1
+		 */
+		private static class ChunkedOutputStream extends FilterOutputStream {
+
+			public ChunkedOutputStream(OutputStream out) {
+				super(out);
+			}
+
+			@Override
+			public void write(int b) throws IOException {
+				byte[] data = { (byte) b };
+				write(data, 0, 1);
+			}
+
+			@Override
+			public void write(byte[] b) throws IOException {
+				write(b, 0, b.length);
+			}
+
+			@Override
+			public void write(byte[] b, int off, int len) throws IOException {
+				if (len == 0)
+					return;
+				out.write(String.format("%x\r\n", len).getBytes());
+				out.write(b, off, len);
+				out.write("\r\n".getBytes());
+			}
+
+			public void finish() throws IOException {
+				out.write("0\r\n\r\n".getBytes());
+			}
+
+		}
+
+		/**
+		 * HTTP status code after processing, e.g. "200 OK", Status.OK
+		 */
+		private IStatus status;
+
+		/**
+		 * MIME type of content, e.g. "text/html"
+		 */
+		private String mimeType;
+
+		/**
+		 * Data of the response, may be null.
+		 */
+		private InputStream data;
+
+		private long contentLength;
+
+		/**
+		 * Headers for the HTTP response. Use addHeader() to add lines. the lowercase
+		 * map is automatically kept up to date.
+		 */
+		@SuppressWarnings("serial")
+		private final Map<String, String> header = new HashMap<String, String>() {
+
+			public String put(String key, String value) {
+				lowerCaseHeader.put(key == null ? key : key.toLowerCase(), value);
+				return super.put(key, value);
+			};
+		};
+
+		/**
+		 * copy of the header map with all the keys lowercase for faster searching.
+		 */
+		private final Map<String, String> lowerCaseHeader = new HashMap<String, String>();
+
+		/**
+		 * The request method that spawned this response.
+		 */
+		private Method requestMethod;
+
+		/**
+		 * Use chunkedTransfer
+		 */
+		private boolean chunkedTransfer;
+
+		private boolean encodeAsGzip;
+
+		private boolean keepAlive;
+
+		/**
+		 * Creates a fixed length response if totalBytes>=0, otherwise chunked.
+		 */
+		protected Response(IStatus status, String mimeType, InputStream data, long totalBytes) {
+			this.status = status;
+			this.mimeType = mimeType;
+			if (data == null) {
+				this.data = new ByteArrayInputStream(new byte[0]);
+				this.contentLength = 0L;
+			} else {
+				this.data = data;
+				this.contentLength = totalBytes;
+			}
+			this.chunkedTransfer = this.contentLength < 0;
+			keepAlive = true;
+		}
+
+		@Override
+		public void close() throws IOException {
+			if (this.data != null) {
+				this.data.close();
+			}
+		}
+
+		/**
+		 * Adds given line to the header.
+		 */
+		public void addHeader(String name, String value) {
+			this.header.put(name, value);
+		}
+
+		/**
+		 * Indicate to close the connection after the Response has been sent.
+		 * 
+		 * @param close {@code true} to hint connection closing, {@code false} to let
+		 *              connection be closed by client.
+		 */
+		public void closeConnection(boolean close) {
+			if (close)
+				this.header.put("connection", "close");
+			else
+				this.header.remove("connection");
+		}
+
+		/**
+		 * @return {@code true} if connection is to be closed after this Response has
+		 *         been sent.
+		 */
+		public boolean isCloseConnection() {
+			return "close".equals(getHeader("connection"));
+		}
+
+		public InputStream getData() {
+			return this.data;
+		}
+
+		public String getHeader(String name) {
+			return this.lowerCaseHeader.get(name.toLowerCase());
+		}
+
+		public String getMimeType() {
+			return this.mimeType;
+		}
+
+		public Method getRequestMethod() {
+			return this.requestMethod;
+		}
+
+		public IStatus getStatus() {
+			return this.status;
+		}
+
+		public void setGzipEncoding(boolean encodeAsGzip) {
+			this.encodeAsGzip = encodeAsGzip;
+		}
+
+		public void setKeepAlive(boolean useKeepAlive) {
+			this.keepAlive = useKeepAlive;
+		}
+
+		/**
+		 * Sends given response to the socket.
+		 */
+		protected void send(OutputStream outputStream) {
+			SimpleDateFormat gmtFrmt = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss 'GMT'", Locale.US);
+			gmtFrmt.setTimeZone(TimeZone.getTimeZone("GMT"));
+
+			try {
+				if (this.status == null) {
+					throw new Error("sendResponse(): Status can't be null.");
+				}
+				PrintWriter pw = new PrintWriter(
+						new BufferedWriter(
+								new OutputStreamWriter(outputStream, new ContentType(this.mimeType).getEncoding())),
+						false);
+				pw.append("HTTP/1.1 ").append(this.status.getDescription()).append(" \r\n");
+				if (this.mimeType != null) {
+					printHeader(pw, "Content-Type", this.mimeType);
+				}
+				if (getHeader("date") == null) {
+					printHeader(pw, "Date", gmtFrmt.format(new Date()));
+				}
+				for (Entry<String, String> entry : this.header.entrySet()) {
+					printHeader(pw, entry.getKey(), entry.getValue());
+				}
+				if (getHeader("connection") == null) {
+					printHeader(pw, "Connection", (this.keepAlive ? "keep-alive" : "close"));
+				}
+				if (getHeader("content-length") != null) {
+					encodeAsGzip = false;
+				}
+				if (encodeAsGzip) {
+					printHeader(pw, "Content-Encoding", "gzip");
+					setChunkedTransfer(true);
+				}
+				long pending = this.data != null ? this.contentLength : 0;
+				if (this.requestMethod != Method.HEAD && this.chunkedTransfer) {
+					printHeader(pw, "Transfer-Encoding", "chunked");
+				} else if (!encodeAsGzip) {
+					pending = sendContentLengthHeaderIfNotAlreadyPresent(pw, pending);
+				}
+				pw.append("\r\n");
+				pw.flush();
+				sendBodyWithCorrectTransferAndEncoding(outputStream, pending);
+				outputStream.flush();
+				safeClose(this.data);
+			} catch (IOException ioe) {
+				NanoHTTPD.LOG.log(Level.SEVERE, "Could not send response to the client", ioe);
+			}
+		}
+
+		@SuppressWarnings("static-method")
+		protected void printHeader(PrintWriter pw, String key, String value) {
+			pw.append(key).append(": ").append(value).append("\r\n");
+		}
+
+		protected long sendContentLengthHeaderIfNotAlreadyPresent(PrintWriter pw, long defaultSize) {
+			String contentLengthString = getHeader("content-length");
+			long size = defaultSize;
+			if (contentLengthString != null) {
+				try {
+					size = Long.parseLong(contentLengthString);
+				} catch (NumberFormatException ex) {
+					LOG.severe("content-length was no number " + contentLengthString);
+				}
+			}
+			pw.print("Content-Length: " + size + "\r\n");
+			return size;
+		}
+
+		private void sendBodyWithCorrectTransferAndEncoding(OutputStream outputStream, long pending)
+				throws IOException {
+			if (this.requestMethod != Method.HEAD && this.chunkedTransfer) {
+				ChunkedOutputStream chunkedOutputStream = new ChunkedOutputStream(outputStream);
+				sendBodyWithCorrectEncoding(chunkedOutputStream, -1);
+				chunkedOutputStream.finish();
+			} else {
+				sendBodyWithCorrectEncoding(outputStream, pending);
+			}
+		}
+
+		private void sendBodyWithCorrectEncoding(OutputStream outputStream, long pending) throws IOException {
+			if (encodeAsGzip) {
+				GZIPOutputStream gzipOutputStream = new GZIPOutputStream(outputStream);
+				sendBody(gzipOutputStream, -1);
+				gzipOutputStream.finish();
+			} else {
+				sendBody(outputStream, pending);
+			}
+		}
+
+		/**
+		 * Sends the body to the specified OutputStream. The pending parameter limits
+		 * the maximum amounts of bytes sent unless it is -1, in which case everything
+		 * is sent.
+		 * 
+		 * @param outputStream the OutputStream to send data to
+		 * @param pending      -1 to send everything, otherwise sets a max limit to the
+		 *                     number of bytes sent
+		 * @throws IOException if something goes wrong while sending the data.
+		 */
+		private void sendBody(OutputStream outputStream, long pending) throws IOException {
+			long BUFFER_SIZE = 16 * 1024;
+			byte[] buff = new byte[(int) BUFFER_SIZE];
+			boolean sendEverything = pending == -1;
+			while (pending > 0 || sendEverything) {
+				long bytesToRead = sendEverything ? BUFFER_SIZE : Math.min(pending, BUFFER_SIZE);
+				int read = this.data.read(buff, 0, (int) bytesToRead);
+				if (read <= 0) {
+					break;
+				}
+				outputStream.write(buff, 0, read);
+				if (!sendEverything) {
+					pending -= read;
+				}
+			}
+		}
+
+		public void setChunkedTransfer(boolean chunkedTransfer) {
+			this.chunkedTransfer = chunkedTransfer;
+		}
+
+		public void setData(InputStream data) {
+			this.data = data;
+		}
+
+		public void setMimeType(String mimeType) {
+			this.mimeType = mimeType;
+		}
+
+		public void setRequestMethod(Method requestMethod) {
+			this.requestMethod = requestMethod;
+		}
+
+		public void setStatus(IStatus status) {
+			this.status = status;
+		}
+	}
+
+	public static final class ResponseException extends Exception {
+
+		private static final long serialVersionUID = 6569838532917408380L;
+
+		private final Response.Status status;
+
+		public ResponseException(Response.Status status, String message) {
+			super(message);
+			this.status = status;
+		}
+
+		public ResponseException(Response.Status status, String message, Exception e) {
+			super(message, e);
+			this.status = status;
+		}
+
+		public Response.Status getStatus() {
+			return this.status;
+		}
+	}
+
+	/**
+	 * The runnable that will be used for the main listening thread.
+	 */
+	public class ServerRunnable implements Runnable {
+
+		private final int timeout;
+
+		private IOException bindException;
+
+		private boolean hasBinded = false;
+
+		public ServerRunnable(int timeout) {
+			this.timeout = timeout;
+		}
+
+		@Override
+		public void run() {
+			try {
+				myServerSocket.bind(
+						hostname != null ? new InetSocketAddress(hostname, myPort) : new InetSocketAddress(myPort));
+				hasBinded = true;
+			} catch (IOException e) {
+				this.bindException = e;
+				return;
+			}
+			do {
+				try {
+					final Socket finalAccept = NanoHTTPD.this.myServerSocket.accept();
+					if (this.timeout > 0) {
+						finalAccept.setSoTimeout(this.timeout);
+					}
+					final InputStream inputStream = finalAccept.getInputStream();
+					NanoHTTPD.this.asyncRunner.exec(createClientHandler(finalAccept, inputStream));
+				} catch (IOException e) {
+					NanoHTTPD.LOG.log(Level.FINE, "Communication with the client broken", e);
+				}
+			} while (!NanoHTTPD.this.myServerSocket.isClosed());
+		}
+	}
+
+	/**
+	 * A temp file.
+	 * <p/>
+	 * <p>
+	 * Temp files are responsible for managing the actual temporary storage and
+	 * cleaning themselves up when no longer needed.
+	 * </p>
+	 */
+	public interface TempFile {
+
+		public void delete() throws Exception;
+
+		public String getName();
+
+		public OutputStream open() throws Exception;
+	}
+
+	/**
+	 * Temp file manager.
+	 * <p/>
+	 * <p>
+	 * Temp file managers are created 1-to-1 with incoming requests, to create and
+	 * cleanup temporary files created as a result of handling the request.
+	 * </p>
+	 */
+	public interface TempFileManager {
+
+		void clear();
+
+		public TempFile createTempFile(String filename_hint) throws Exception;
+	}
+
+	/**
+	 * Factory to create temp file managers.
+	 */
+	public interface TempFileManagerFactory {
+
+		public TempFileManager create();
+	}
+
+	/**
+	 * Factory to create ServerSocketFactories.
+	 */
+	public interface ServerSocketFactory {
+
+		public ServerSocket create() throws IOException;
+
+	}
+
+	/**
+	 * Maximum time to wait on Socket.getInputStream().read() (in milliseconds) This
+	 * is required as the Keep-Alive HTTP connections would otherwise block the
+	 * socket reading thread forever (or as long the browser is open).
+	 */
+	public static final int SOCKET_READ_TIMEOUT = 5000;
+
+	/**
+	 * Common MIME type for dynamic content: plain text
+	 */
+	public static final String MIME_PLAINTEXT = "text/plain";
+
+	/**
+	 * Common MIME type for dynamic content: html
+	 */
+	public static final String MIME_HTML = "text/html";
+
+	/**
+	 * Pseudo-Parameter to use to store the actual query string in the parameters
+	 * map for later re-processing.
+	 */
+	private static final String QUERY_STRING_PARAMETER = "NanoHttpd.QUERY_STRING";
+
+	/**
+	 * logger to log to.
+	 */
+	private static final Logger LOG = Logger.getLogger(NanoHTTPD.class.getName());
+
+	/**
+	 * Hashtable mapping (String)FILENAME_EXTENSION -> (String)MIME_TYPE
+	 */
+	protected static Map<String, String> MIME_TYPES;
+
+	public static Map<String, String> mimeTypes() {
+		if (MIME_TYPES == null) {
+			MIME_TYPES = new HashMap<String, String>();
+			loadMimeTypes(MIME_TYPES, "META-INF/nanohttpd/default-mimetypes.properties");
+			loadMimeTypes(MIME_TYPES, "META-INF/nanohttpd/mimetypes.properties");
+			if (MIME_TYPES.isEmpty()) {
+				LOG.log(Level.WARNING, "no mime types found in the classpath! please provide mimetypes.properties");
+			}
+		}
+		return MIME_TYPES;
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	private static void loadMimeTypes(Map<String, String> result, String resourceName) {
+		try {
+			Enumeration<URL> resources = NanoHTTPD.class.getClassLoader().getResources(resourceName);
+			while (resources.hasMoreElements()) {
+				URL url = (URL) resources.nextElement();
+				Properties properties = new Properties();
+				InputStream stream = null;
+				try {
+					stream = url.openStream();
+					properties.load(stream);
+				} catch (IOException e) {
+					LOG.log(Level.SEVERE, "could not load mimetypes from " + url, e);
+				} finally {
+					safeClose(stream);
+				}
+				result.putAll((Map) properties);
+			}
+		} catch (IOException e) {
+			LOG.log(Level.INFO, "no mime types available at " + resourceName);
+		}
+	};
+
+	/**
+	 * Creates an SSLSocketFactory for HTTPS. Pass a loaded KeyStore and an array of
+	 * loaded KeyManagers. These objects must properly loaded/initialized by the
+	 * caller.
+	 */
+	public static SSLServerSocketFactory makeSSLSocketFactory(KeyStore loadedKeyStore, KeyManager[] keyManagers)
+			throws IOException {
+		SSLServerSocketFactory res = null;
+		try {
+			TrustManagerFactory trustManagerFactory = TrustManagerFactory
+					.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+			trustManagerFactory.init(loadedKeyStore);
+			SSLContext ctx = SSLContext.getInstance("TLS");
+			ctx.init(keyManagers, trustManagerFactory.getTrustManagers(), null);
+			res = ctx.getServerSocketFactory();
+		} catch (Exception e) {
+			throw new IOException(e.getMessage());
+		}
+		return res;
+	}
+
+	/**
+	 * Creates an SSLSocketFactory for HTTPS. Pass a loaded KeyStore and a loaded
+	 * KeyManagerFactory. These objects must properly loaded/initialized by the
+	 * caller.
+	 */
+	public static SSLServerSocketFactory makeSSLSocketFactory(KeyStore loadedKeyStore,
+			KeyManagerFactory loadedKeyFactory) throws IOException {
+		try {
+			return makeSSLSocketFactory(loadedKeyStore, loadedKeyFactory.getKeyManagers());
+		} catch (Exception e) {
+			throw new IOException(e.getMessage());
+		}
+	}
+
+	/**
+	 * Creates an SSLSocketFactory for HTTPS. Pass a KeyStore resource with your
+	 * certificate and passphrase
+	 */
+	public static SSLServerSocketFactory makeSSLSocketFactory(String keyAndTrustStoreClasspathPath, char[] passphrase)
+			throws IOException {
+		try {
+			KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
+			InputStream keystoreStream = NanoHTTPD.class.getResourceAsStream(keyAndTrustStoreClasspathPath);
+
+			if (keystoreStream == null) {
+				throw new IOException("Unable to load keystore from classpath: " + keyAndTrustStoreClasspathPath);
+			}
+
+			keystore.load(keystoreStream, passphrase);
+			KeyManagerFactory keyManagerFactory = KeyManagerFactory
+					.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+			keyManagerFactory.init(keystore, passphrase);
+			return makeSSLSocketFactory(keystore, keyManagerFactory);
+		} catch (Exception e) {
+			throw new IOException(e.getMessage());
+		}
+	}
+
+	/**
+	 * Get MIME type from file name extension, if possible
+	 * 
+	 * @param uri the string representing a file
+	 * @return the connected mime/type
+	 */
+	public static String getMimeTypeForFile(String uri) {
+		int dot = uri.lastIndexOf('.');
+		String mime = null;
+		if (dot >= 0) {
+			mime = mimeTypes().get(uri.substring(dot + 1).toLowerCase());
+		}
+		return mime == null ? "application/octet-stream" : mime;
+	}
+
+	private static final void safeClose(Object closeable) {
+		try {
+			if (closeable != null) {
+				if (closeable instanceof Closeable) {
+					((Closeable) closeable).close();
+				} else if (closeable instanceof Socket) {
+					((Socket) closeable).close();
+				} else if (closeable instanceof ServerSocket) {
+					((ServerSocket) closeable).close();
+				} else {
+					throw new IllegalArgumentException("Unknown object to close");
+				}
+			}
+		} catch (IOException e) {
+			NanoHTTPD.LOG.log(Level.SEVERE, "Could not close", e);
+		}
+	}
+
+	private final String hostname;
+
+	private final int myPort;
+
+	private volatile ServerSocket myServerSocket;
+
+	private ServerSocketFactory serverSocketFactory = new DefaultServerSocketFactory();
+
+	private Thread myThread;
+
+	/**
+	 * Pluggable strategy for asynchronously executing requests.
+	 */
+	protected AsyncRunner asyncRunner;
+
+	/**
+	 * Pluggable strategy for creating and cleaning up temporary files.
+	 */
+	private TempFileManagerFactory tempFileManagerFactory;
+
+	/**
+	 * Constructs an HTTP server on given port.
+	 */
+	public NanoHTTPD(int port) {
+		this(null, port);
+	}
+
+	// -------------------------------------------------------------------------------
+	// //
+	//
+	// Threading Strategy.
+	//
+	// -------------------------------------------------------------------------------
+	// //
+
+	/**
+	 * Constructs an HTTP server on given hostname and port.
+	 */
+	public NanoHTTPD(String hostname, int port) {
+		this.hostname = hostname;
+		this.myPort = port;
+		setTempFileManagerFactory(new DefaultTempFileManagerFactory());
+		setAsyncRunner(new DefaultAsyncRunner());
+	}
+
+	/**
+	 * Forcibly closes all connections that are open.
+	 */
+	public synchronized void closeAllConnections() {
+		stop();
+	}
+
+	/**
+	 * create a instance of the client handler, subclasses can return a subclass of
+	 * the ClientHandler.
+	 * 
+	 * @param finalAccept the socket the cleint is connected to
+	 * @param inputStream the input stream
+	 * @return the client handler
+	 */
+	protected ClientHandler createClientHandler(final Socket finalAccept, final InputStream inputStream) {
+		return new ClientHandler(inputStream, finalAccept);
+	}
+
+	/**
+	 * Instantiate the server runnable, can be overwritten by subclasses to provide
+	 * a subclass of the ServerRunnable.
+	 * 
+	 * @param timeout the socet timeout to use.
+	 * @return the server runnable.
+	 */
+	protected ServerRunnable createServerRunnable(final int timeout) {
+		return new ServerRunnable(timeout);
+	}
+
+	/**
+	 * Decode parameters from a URL, handing the case where a single parameter name
+	 * might have been supplied several times, by return lists of values. In general
+	 * these lists will contain a single element.
+	 * 
+	 * @param parms original <b>NanoHTTPD</b> parameters values, as passed to the
+	 *              <code>serve()</code> method.
+	 * @return a map of <code>String</code> (parameter name) to
+	 *         <code>List&lt;String&gt;</code> (a list of the values supplied).
+	 */
+	protected static Map<String, List<String>> decodeParameters(Map<String, String> parms) {
+		return decodeParameters(parms.get(NanoHTTPD.QUERY_STRING_PARAMETER));
+	}
+
+	// -------------------------------------------------------------------------------
+	// //
+
+	/**
+	 * Decode parameters from a URL, handing the case where a single parameter name
+	 * might have been supplied several times, by return lists of values. In general
+	 * these lists will contain a single element.
+	 * 
+	 * @param queryString a query string pulled from the URL.
+	 * @return a map of <code>String</code> (parameter name) to
+	 *         <code>List&lt;String&gt;</code> (a list of the values supplied).
+	 */
+	protected static Map<String, List<String>> decodeParameters(String queryString) {
+		Map<String, List<String>> parms = new HashMap<String, List<String>>();
+		if (queryString != null) {
+			StringTokenizer st = new StringTokenizer(queryString, "&");
+			while (st.hasMoreTokens()) {
+				String e = st.nextToken();
+				int sep = e.indexOf('=');
+				String propertyName = sep >= 0 ? decodePercent(e.substring(0, sep)).trim() : decodePercent(e).trim();
+				if (!parms.containsKey(propertyName)) {
+					parms.put(propertyName, new ArrayList<String>());
+				}
+				String propertyValue = sep >= 0 ? decodePercent(e.substring(sep + 1)) : null;
+				if (propertyValue != null) {
+					parms.get(propertyName).add(propertyValue);
+				}
+			}
+		}
+		return parms;
+	}
+
+	/**
+	 * Decode percent encoded <code>String</code> values.
+	 * 
+	 * @param str the percent encoded <code>String</code>
+	 * @return expanded form of the input, for example "foo%20bar" becomes "foo bar"
+	 */
+	protected static String decodePercent(String str) {
+		String decoded = null;
+		try {
+			decoded = URLDecoder.decode(str, "UTF8");
+		} catch (UnsupportedEncodingException ignored) {
+			NanoHTTPD.LOG.log(Level.WARNING, "Encoding not supported, ignored", ignored);
+		}
+		return decoded;
+	}
+
+	/**
+	 * @return true if the gzip compression should be used if the client accespts
+	 *         it. Default this option is on for text content and off for
+	 *         everything. Override this for custom semantics.
+	 */
+	@SuppressWarnings("static-method")
+	protected boolean useGzipWhenAccepted(Response r) {
+		return r.getMimeType() != null
+				&& (r.getMimeType().toLowerCase().contains("text/") || r.getMimeType().toLowerCase().contains("/json"));
+	}
+
+	public final int getListeningPort() {
+		return this.myServerSocket == null ? -1 : this.myServerSocket.getLocalPort();
+	}
+
+	public final boolean isAlive() {
+		return wasStarted() && !this.myServerSocket.isClosed() && this.myThread.isAlive();
+	}
+
+	public ServerSocketFactory getServerSocketFactory() {
+		return serverSocketFactory;
+	}
+
+	public void setServerSocketFactory(ServerSocketFactory serverSocketFactory) {
+		this.serverSocketFactory = serverSocketFactory;
+	}
+
+	public String getHostname() {
+		return hostname;
+	}
+
+	public TempFileManagerFactory getTempFileManagerFactory() {
+		return tempFileManagerFactory;
+	}
+
+	/**
+	 * Call before start() to serve over HTTPS instead of HTTP
+	 */
+	public void makeSecure(SSLServerSocketFactory sslServerSocketFactory, String[] sslProtocols) {
+		this.serverSocketFactory = new SecureServerSocketFactory(sslServerSocketFactory, sslProtocols);
+	}
+
+	/**
+	 * Create a response with unknown length (using HTTP 1.1 chunking).
+	 */
+	public static Response newChunkedResponse(IStatus status, String mimeType, InputStream data) {
+		return new Response(status, mimeType, data, -1);
+	}
+
+	/**
+	 * Create a response with known length.
+	 */
+	public static Response newFixedLengthResponse(IStatus status, String mimeType, InputStream data, long totalBytes) {
+		return new Response(status, mimeType, data, totalBytes);
+	}
+
+	/**
+	 * Create a text response with known length.
+	 */
+	public static Response newFixedLengthResponse(IStatus status, String mimeType, String txt) {
+		ContentType contentType = new ContentType(mimeType);
+		if (txt == null) {
+			return newFixedLengthResponse(status, mimeType, new ByteArrayInputStream(new byte[0]), 0);
+		} else {
+			byte[] bytes;
+			try {
+				CharsetEncoder newEncoder = Charset.forName(contentType.getEncoding()).newEncoder();
+				if (!newEncoder.canEncode(txt)) {
+					contentType = contentType.tryUTF8();
+				}
+				bytes = txt.getBytes(contentType.getEncoding());
+			} catch (UnsupportedEncodingException e) {
+				NanoHTTPD.LOG.log(Level.SEVERE, "encoding problem, responding nothing", e);
+				bytes = new byte[0];
+			}
+			return newFixedLengthResponse(status, contentType.getContentTypeHeader(), new ByteArrayInputStream(bytes),
+					bytes.length);
+		}
+	}
+
+	/**
+	 * Create a text response with known length.
+	 */
+	public static Response newFixedLengthResponse(String msg) {
+		return newFixedLengthResponse(Status.OK, NanoHTTPD.MIME_HTML, msg);
+	}
+
+	/**
+	 * Override this to customize the server.
+	 * <p/>
+	 * <p/>
+	 * (By default, this returns a 404 "Not Found" plain text error response.)
+	 * 
+	 * @param session The HTTP session
+	 * @return HTTP response, see class Response for details
+	 */
+	public Response serve(IHTTPSession session) {
+		Map<String, String> files = new HashMap<String, String>();
+		Method method = session.getMethod();
+		if (Method.PUT.equals(method) || Method.POST.equals(method)) {
+			try {
+				session.parseBody(files);
+			} catch (IOException ioe) {
+				return newFixedLengthResponse(Response.Status.INTERNAL_ERROR, NanoHTTPD.MIME_PLAINTEXT,
+						"SERVER INTERNAL ERROR: IOException: " + ioe.getMessage());
+			} catch (ResponseException re) {
+				return newFixedLengthResponse(re.getStatus(), NanoHTTPD.MIME_PLAINTEXT, re.getMessage());
+			}
+		}
+
+		Map<String, String> parms = session.getParms();
+		parms.put(NanoHTTPD.QUERY_STRING_PARAMETER, session.getQueryParameterString());
+		return serve(session.getUri(), method, session.getHeaders(), parms, files);
+	}
+
+	/**
+	 * Override this to customize the server.
+	 * <p/>
+	 * <p/>
+	 * (By default, this returns a 404 "Not Found" plain text error response.)
+	 * 
+	 * @param uri     Percent-decoded URI without parameters, for example
+	 *                "/index.cgi"
+	 * @param method  "GET", "POST" etc.
+	 * @param parms   Parsed, percent decoded parameters from URI and, in case of
+	 *                POST, data.
+	 * @param headers Header entries, percent decoded
+	 * @return HTTP response, see class Response for details
+	 */
+	@Deprecated
+	public Response serve(String uri, Method method, Map<String, String> headers, Map<String, String> parms,
+			Map<String, String> files) {
+		return newFixedLengthResponse(Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT, "Not Found");
+	}
+
+	/**
+	 * Pluggable strategy for asynchronously executing requests.
+	 * 
+	 * @param asyncRunner new strategy for handling threads.
+	 */
+	public void setAsyncRunner(AsyncRunner asyncRunner) {
+		this.asyncRunner = asyncRunner;
+	}
+
+	/**
+	 * Pluggable strategy for creating and cleaning up temporary files.
+	 * 
+	 * @param tempFileManagerFactory new strategy for handling temp files.
+	 */
+	public void setTempFileManagerFactory(TempFileManagerFactory tempFileManagerFactory) {
+		this.tempFileManagerFactory = tempFileManagerFactory;
+	}
+
+	/**
+	 * Start the server.
+	 * 
+	 * @throws IOException if the socket is in use.
+	 */
+	public void start() throws IOException {
+		start(NanoHTTPD.SOCKET_READ_TIMEOUT);
+	}
+
+	/**
+	 * Starts the server (in setDaemon(true) mode).
+	 */
+	public void start(final int timeout) throws IOException {
+		start(timeout, true);
+	}
+
+	/**
+	 * Start the server.
+	 * 
+	 * @param timeout timeout to use for socket connections.
+	 * @param daemon  start the thread daemon or not.
+	 * @throws IOException if the socket is in use.
+	 */
+	public void start(final int timeout, boolean daemon) throws IOException {
+		this.myServerSocket = this.getServerSocketFactory().create();
+		this.myServerSocket.setReuseAddress(true);
+
+		ServerRunnable serverRunnable = createServerRunnable(timeout);
+		this.myThread = new Thread(serverRunnable);
+		this.myThread.setDaemon(daemon);
+		this.myThread.setName("NanoHttpd Main Listener");
+		this.myThread.start();
+		while (!serverRunnable.hasBinded && serverRunnable.bindException == null) {
+			try {
+				Thread.sleep(10L);
+			} catch (Throwable e) {
+				// on android this may not be allowed, that's why we
+				// catch throwable the wait should be very short because we are
+				// just waiting for the bind of the socket
+			}
+		}
+		if (serverRunnable.bindException != null) {
+			throw serverRunnable.bindException;
+		}
+	}
+
+	/**
+	 * Stop the server.
+	 */
+	public void stop() {
+		try {
+			safeClose(this.myServerSocket);
+			this.asyncRunner.closeAll();
+			if (this.myThread != null) {
+				this.myThread.join();
+			}
+		} catch (Exception e) {
+			NanoHTTPD.LOG.log(Level.SEVERE, "Could not stop all connections", e);
+		}
+	}
+
+	public final boolean wasStarted() {
+		return this.myServerSocket != null && this.myThread != null;
+	}
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/OpenGLObjects.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/OpenGLObjects.java
index 14ef71f..e04a69a 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/OpenGLObjects.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/OpenGLObjects.java
@@ -25,6 +25,10 @@ class OpenGLObjects {
 			this.ptr = ptr;
 		}
 
+		public int hashCode() {
+			return ptr;
+		}
+
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteBuffers(this);
@@ -40,6 +44,10 @@ class OpenGLObjects {
 			this.ptr = ptr;
 		}
 
+		public int hashCode() {
+			return ptr;
+		}
+
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteVertexArrays(this);
@@ -55,6 +63,10 @@ class OpenGLObjects {
 			this.ptr = ptr;
 		}
 
+		public int hashCode() {
+			return ptr;
+		}
+
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteTextures(this);
@@ -70,6 +82,10 @@ class OpenGLObjects {
 			this.ptr = ptr;
 		}
 
+		public int hashCode() {
+			return ptr;
+		}
+
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteProgram(this);
@@ -85,6 +101,10 @@ class OpenGLObjects {
 			this.ptr = ptr;
 		}
 
+		public int hashCode() {
+			return ptr;
+		}
+
 		@Override
 		public void free() {
 		}
@@ -99,6 +119,10 @@ class OpenGLObjects {
 			this.ptr = ptr;
 		}
 
+		public int hashCode() {
+			return ptr;
+		}
+
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteShader(this);
@@ -114,6 +138,10 @@ class OpenGLObjects {
 			this.ptr = ptr;
 		}
 
+		public int hashCode() {
+			return ptr;
+		}
+
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteFramebuffer(this);
@@ -129,6 +157,10 @@ class OpenGLObjects {
 			this.ptr = ptr;
 		}
 
+		public int hashCode() {
+			return ptr;
+		}
+
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteRenderbuffer(this);
@@ -144,6 +176,10 @@ class OpenGLObjects {
 			this.ptr = ptr;
 		}
 
+		public int hashCode() {
+			return ptr;
+		}
+
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteQueries(this);
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
index 4d92c0f..5ec41c1 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
@@ -7,6 +7,7 @@ import java.awt.Desktop;
 import java.awt.EventQueue;
 import java.awt.HeadlessException;
 import java.awt.Toolkit;
+import java.awt.image.BufferedImage;
 import java.awt.Dialog.ModalExclusionType;
 import java.awt.Dialog.ModalityType;
 import java.io.File;
@@ -14,16 +15,23 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URI;
+import java.net.URISyntaxException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
+import javax.imageio.ImageIO;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.MainMenuCreditsDialog;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums;
 
 /**
  * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
@@ -49,10 +57,23 @@ public class PlatformApplication {
 	}
 
 	public static void openLink(String url) {
+		URI safeURL;
 		try {
-			Desktop.getDesktop().browse(new URI(url));
+			safeURL = new URI(url);
+			String proto = safeURL.getScheme();
+			if(!proto.equalsIgnoreCase("http") && !proto.equalsIgnoreCase("https")) {
+				throw new IllegalArgumentException("Suspicious protocol: " + proto);
+			}
+		}catch(URISyntaxException | IllegalArgumentException ex) {
+			PlatformRuntime.logger.error("Refusing to open invalid URL: {}", url);
+			PlatformRuntime.logger.error(ex);
+			return;
+		}
+		try {
+			Desktop.getDesktop().browse(safeURL);
 		} catch (Throwable var5) {
-			EagRuntime.debugPrintStackTrace(var5);
+			PlatformRuntime.logger.error("Failed to browse to URL: {}", safeURL.toString());
+			PlatformRuntime.logger.error(var5);
 		}
 	}
 
@@ -98,9 +119,40 @@ public class PlatformApplication {
 			return null;
 		}
 	}
+
+	private static final DateFormat dateFormatSS = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss");
+	private static final File screeshotsDir = new File("screenshots");
 	
 	public static String saveScreenshot() {
-		return "nothing";
+		if(!screeshotsDir.isDirectory() && !screeshotsDir.mkdirs()) {
+			PlatformRuntime.logger.error("Failed to create screenshots directory: {}", screeshotsDir.getAbsolutePath());
+			return "nothing";
+		}
+		String name = "screenshot_" + dateFormatSS.format(new Date()).toString() + ".png";
+		int w = PlatformInput.getWindowWidth();
+		int h = PlatformInput.getWindowHeight();
+		ByteBuffer screenshotBuffer = PlatformRuntime.allocateByteBuffer(w * h * 4);
+		PlatformOpenGL._wglReadPixels(0, 0, w, h, RealOpenGLEnums.GL_RGBA, RealOpenGLEnums.GL_UNSIGNED_BYTE, screenshotBuffer);
+		BufferedImage bufferedImage = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
+		int i;
+		for(int y = 0; y < h; ++y) {
+			for(int x = 0; x < w; ++x) {
+				i = (x + (h - y - 1) * w) << 2;
+				bufferedImage.setRGB(x, y,
+						((screenshotBuffer.get(i) & 0xFF) << 16) | ((screenshotBuffer.get(i + 1) & 0xFF) << 8)
+								| (screenshotBuffer.get(i + 2) & 0xFF) | 0xFF000000);
+			}
+		}
+		PlatformRuntime.freeByteBuffer(screenshotBuffer);
+		File screenshotFile = new File(screeshotsDir, name);
+		try {
+			ImageIO.write(bufferedImage, "PNG", screenshotFile);
+		}catch(IOException ex) {
+			PlatformRuntime.logger.error("Failed to write screenshot: {}", screenshotFile.getAbsolutePath());
+			return "nothing";
+		}
+		PlatformRuntime.logger.info("Saved screenshot to: {}", screenshotFile.getAbsolutePath());
+		return name;
 	}
 	
 	public static void showPopup(String msg) {
@@ -127,6 +179,7 @@ public class PlatformApplication {
 	public static void displayFileChooser(final String mime, final String ext) {
 		if(!fileChooserOpen) {
 			fileChooserOpen = true;
+			clearFileChooserResult();
 			EventQueue.invokeLater(new Runnable() {
 				@Override
 				public void run() {
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAssets.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAssets.java
index b173261..085de7e 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAssets.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAssets.java
@@ -43,7 +43,11 @@ public class PlatformAssets {
 		}
 	}
 	
-	public static final byte[] getResourceBytes(String path) {
+	public static boolean getResourceExists(String path) {
+		return (new File("resources", path)).isFile();
+	}
+	
+	public static byte[] getResourceBytes(String path) {
 		File loadFile = new File("resources", path);
 		byte[] ret = new byte[(int) loadFile.length()];
 		try(FileInputStream is = new FileInputStream(loadFile)) {
@@ -56,8 +60,12 @@ public class PlatformAssets {
 			return null;
 		}
 	}
-	
-	public static final ImageData loadImageFile(InputStream data) {
+
+	public static ImageData loadImageFile(InputStream data) {
+		return loadImageFile(data, "image/png");
+	}
+
+	public static ImageData loadImageFile(InputStream data, String mime) {
 		try {
 			BufferedImage img = ImageIO.read(data);
 			if(img == null) {
@@ -81,9 +89,13 @@ public class PlatformAssets {
 			return null;
 		}
 	}
-	
-	public static final ImageData loadImageFile(byte[] data) {
-		return loadImageFile(new EaglerInputStream(data));
+
+	public static ImageData loadImageFile(byte[] data) {
+		return loadImageFile(new EaglerInputStream(data), "image/png");
 	}
-	
+
+	public static ImageData loadImageFile(byte[] data, String mime) {
+		return loadImageFile(new EaglerInputStream(data), mime);
+	}
+
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java
index 02affcc..d324485 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java
@@ -46,7 +46,7 @@ public class PlatformAudio {
 		
 		protected PaulscodeAudioHandle(String sourceName) {
 			this.sourceName = sourceName;
-			this.stall = System.currentTimeMillis();
+			this.stall = PlatformRuntime.steadyTimeMillis();
 		}
 
 		@Override
@@ -64,7 +64,7 @@ public class PlatformAudio {
 
 		@Override
 		public void restart() {
-			this.stall = System.currentTimeMillis();
+			this.stall = PlatformRuntime.steadyTimeMillis();
 			sndSystem.rewind(sourceName);
 			sndSystem.play(sourceName);
 		}
@@ -91,7 +91,7 @@ public class PlatformAudio {
 
 		@Override
 		public boolean shouldFree() {
-			return !sndSystem.playing(sourceName) && System.currentTimeMillis() - this.stall > 250l; //TODO: I hate this hack
+			return !sndSystem.playing(sourceName) && PlatformRuntime.steadyTimeMillis() - this.stall > 250l; //TODO: I hate this hack
 		}
 		
 	}
@@ -125,7 +125,7 @@ public class PlatformAudio {
 	private static SoundSystem sndSystem = null;
 	
 	static void platformInitialize() {
-		logger.info("Eaglercraft still uses Paul Lamb's SoundSystem but with LWJGL3");
+		logger.info("Eaglercraft uses Paul Lamb's SoundSystem (with LWJGL3)");
 		logger.info("    \"Author: Paul Lamb, www.paulscode.com\"");
 		try {
 			SoundSystemConfig.addLibrary(LibraryLWJGLOpenAL.class);
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
index da004b4..f613ac8 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
@@ -2,7 +2,6 @@ package net.lax1dude.eaglercraft.v1_8.internal;
 
 import java.io.File;
 
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.DebugFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.JDBCFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.JDBCFilesystemConverter;
@@ -28,104 +27,50 @@ public class PlatformFilesystem {
 
 	public static final Logger logger = LogManager.getLogger("PlatformFilesystem");
 
+	@Deprecated
 	public static final File debugFilesystemRoot = (new File("filesystem/sp")).getAbsoluteFile();
 
-	private static IFilesystemProvider provider = null;
+	public static final File filesystemsRoot = (new File("filesystem")).getAbsoluteFile();
 
-	public static String jdbcUri = null;
-	public static String jdbcDriver = null;
+	private static final boolean isLegacyFolder = checkLegacy();
 
-	public static void initialize() {
-		if(provider == null) {
-			if(jdbcUri != null && jdbcDriver != null) {
-				provider = JDBCFilesystem.initialize(jdbcUri, jdbcDriver);
+	private static boolean checkLegacy() {
+		if(!debugFilesystemRoot.isDirectory()) return false;
+		String[] str = debugFilesystemRoot.list();
+		return str != null && str.length > 0;
+	}
+
+	public static IEaglerFilesystem initializePersist(String dbName) {
+		String jdbcUri = System.getProperty("eagler.jdbc." + dbName + ".uri");
+		String jdbcDriver = System.getProperty("eagler.jdbc." + dbName + ".driver");
+		if(jdbcUri != null && jdbcDriver != null) {
+			try {
+				IEaglerFilesystem provider = JDBCFilesystem.initialize(dbName, jdbcUri, jdbcDriver);
 				if(((JDBCFilesystem)provider).isNewFilesystem() && debugFilesystemRoot.isDirectory() && debugFilesystemRoot.list().length > 0) {
 					JDBCFilesystemConverter.convertFilesystem("Converting filesystem, please wait...", debugFilesystemRoot, provider, true);
 				}
+				return provider;
+			}catch(Throwable t) {
+				logger.error("Could not open jdbc-based filesystem: {}", dbName);
+				logger.error(t);
+				return null;
+			}
+		}else {
+			File f;
+			if(isLegacyFolder && (dbName.equals("worlds") || dbName.equals("resourcePacks"))) {
+				f = debugFilesystemRoot;
+				logger.info("Note: filesystem \"{}\" will be stored in the legacy \"sp\" folder because it exists and is not empty", dbName);
 			}else {
-				provider = DebugFilesystem.initialize(debugFilesystemRoot);
+				f = new File(filesystemsRoot, dbName);
+			}
+			try {
+				return DebugFilesystem.initialize(dbName, f);
+			}catch(Throwable t) {
+				logger.error("Could not open folder-based filesystem: {}", dbName);
+				logger.error(t);
+				return null;
 			}
 		}
 	}
 
-	public static void setUseJDBC(String uri) {
-		jdbcUri = uri;
-	}
-
-	public static void setJDBCDriverClass(String driver) {
-		jdbcDriver = driver;
-	}
-
-	public static interface IFilesystemProvider {
-
-		boolean eaglerDelete(String pathName);
-
-		ByteBuffer eaglerRead(String pathName);
-
-		void eaglerWrite(String pathName, ByteBuffer data);
-
-		boolean eaglerExists(String pathName);
-
-		boolean eaglerMove(String pathNameOld, String pathNameNew);
-
-		int eaglerCopy(String pathNameOld, String pathNameNew);
-
-		int eaglerSize(String pathName);
-
-		void eaglerIterate(String pathName, VFSFilenameIterator itr, boolean recursive);
-
-	}
-
-	private static void throwNotInitialized() {
-		throw new UnsupportedOperationException("Filesystem has not been initialized!");
-	}
-
-	public static boolean eaglerDelete(String pathName) {
-		if(provider == null) throwNotInitialized();
-		return provider.eaglerDelete(pathName);
-	}
-
-	public static ByteBuffer eaglerRead(String pathName) {
-		if(provider == null) throwNotInitialized();
-		return provider.eaglerRead(pathName);
-	}
-
-	public static void eaglerWrite(String pathName, ByteBuffer data) {
-		if(provider == null) throwNotInitialized();
-		provider.eaglerWrite(pathName, data);
-	}
-
-	public static boolean eaglerExists(String pathName) {
-		if(provider == null) throwNotInitialized();
-		return provider.eaglerExists(pathName);
-	}
-
-	public static boolean eaglerMove(String pathNameOld, String pathNameNew) {
-		if(provider == null) throwNotInitialized();
-		return provider.eaglerMove(pathNameOld, pathNameNew);
-	}
-
-	public static int eaglerCopy(String pathNameOld, String pathNameNew) {
-		if(provider == null) throwNotInitialized();
-		return provider.eaglerCopy(pathNameOld, pathNameNew);
-	}
-
-	public static int eaglerSize(String pathName) {
-		if(provider == null) throwNotInitialized();
-		return provider.eaglerSize(pathName);
-	}
-
-	public static void eaglerIterate(String pathName, VFSFilenameIterator itr, boolean recursive) {
-		if(provider == null) throwNotInitialized();
-		provider.eaglerIterate(pathName, itr, recursive);
-	}
-
-	public static void platformShutdown() {
-		if(provider != null) {
-			if(provider instanceof JDBCFilesystem) {
-				((JDBCFilesystem)provider).shutdown();
-			}
-			provider = null;
-		}
-	}
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
index 5aec52d..fc5a43e 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
@@ -2,15 +2,20 @@ package net.lax1dude.eaglercraft.v1_8.internal;
 
 import static org.lwjgl.glfw.GLFW.*;
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 import org.lwjgl.PointerBuffer;
+import org.lwjgl.glfw.GLFWGamepadState;
 import org.lwjgl.glfw.GLFWVidMode;
 import org.lwjgl.system.MemoryStack;
 
 /**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -34,6 +39,7 @@ public class PlatformInput {
 	
 	private static boolean windowFocused = true;
 	private static boolean windowResized = true;
+	private static boolean windowResized2 = true;
 	
 	private static boolean windowCursorEntered = true;
 	private static boolean windowMouseGrabbed = false;
@@ -46,7 +52,7 @@ public class PlatformInput {
 	private static int windowWidth = 640;
 	private static int windowHeight = 480;
 	
-	private static final List<KeyboardEvent> keyboardEventList = new LinkedList();
+	private static final List<KeyboardEvent> keyboardEventList = new LinkedList<>();
 	private static KeyboardEvent currentKeyboardEvent = null;
 	
 	private static final char[] keyboardReleaseEventChars = new char[256];
@@ -56,7 +62,7 @@ public class PlatformInput {
 
 	public static boolean lockKeys = false;
 
-	private static final List<Character> keyboardCharList = new LinkedList();
+	private static final List<Character> keyboardCharList = new LinkedList<>();
 
 	private static boolean vsync = true;
 	private static boolean glfwVSyncState = false;
@@ -75,8 +81,8 @@ public class PlatformInput {
 		}
 		
 	}
-	
-	private static final List<MouseEvent> mouseEventList = new LinkedList();
+
+	private static final List<MouseEvent> mouseEventList = new LinkedList<>();
 	private static MouseEvent currentMouseEvent = null;
 	
 	private static class MouseEvent {
@@ -97,6 +103,44 @@ public class PlatformInput {
 		
 	}
 
+	private static final List<Gamepad> gamepadList = new ArrayList<>();
+	private static int selectedGamepad = -1;
+	private static String selectedGamepadName = null;
+	private static String selectedGamepadUUID = null;
+	private static final boolean[] gamepadButtonStates = new boolean[24];
+	private static final float[] gamepadAxisStates = new float[4];
+	
+	private static class Gamepad {
+		
+		protected final int gamepadId;
+		protected final String gamepadName;
+		protected final String gamepadUUID;
+		
+		protected Gamepad(int gamepadId, String gamepadName, String gamepadUUID) {
+			this.gamepadId = gamepadId;
+			this.gamepadName = gamepadName;
+			this.gamepadUUID = gamepadUUID;
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(gamepadId, gamepadName, gamepadUUID);
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+				return true;
+			if (obj == null)
+				return false;
+			if (getClass() != obj.getClass())
+				return false;
+			Gamepad other = (Gamepad) obj;
+			return gamepadId == other.gamepadId && Objects.equals(gamepadName, other.gamepadName)
+					&& Objects.equals(gamepadUUID, other.gamepadUUID);
+		}
+	}
+
 	static void initHooks(long glfwWindow) {
 		win = glfwWindow;
 		
@@ -121,13 +165,20 @@ public class PlatformInput {
 		
 		windowWidth = v1[0];
 		windowHeight = v2[0];
+		windowResized = true;
+		windowResized2 = true;
 		
 		glfwSetFramebufferSizeCallback(glfwWindow, (window, width, height) -> {
-			windowWidth = width;
-			windowHeight = height;
-			windowResized = true;
+			if(windowWidth != width || windowHeight != height) {
+				windowWidth = width;
+				windowHeight = height;
+				windowResized = true;
+				windowResized2 = true;
+			}
 		});
 		
+		windowFocused = true;
+		
 		glfwSetWindowFocusCallback(glfwWindow, (window, focused) -> {
 			windowFocused = focused;
 		});
@@ -199,6 +250,15 @@ public class PlatformInput {
 		if(!fullscreen && startupFullscreen) {
 			toggleFullscreen();
 		}
+		
+		gamepadEnumerateDevices();
+		
+		glfwSetJoystickCallback((jid, event) -> {
+			if(event == GLFW_DISCONNECTED && jid == selectedGamepad) {
+				selectedGamepad = -1;
+			}
+			gamepadEnumerateDevices();
+		});
 	}
 	
 	public static int getWindowWidth() {
@@ -209,6 +269,22 @@ public class PlatformInput {
 		return windowHeight;
 	}
 
+	public static int getVisualViewportX() {
+		return 0;
+	}
+
+	public static int getVisualViewportY() {
+		return 0;
+	}
+
+	public static int getVisualViewportW() {
+		return windowWidth;
+	}
+
+	public static int getVisualViewportH() {
+		return windowHeight;
+	}
+
 	public static boolean getWindowFocused() {
 		return windowFocused;
 	}
@@ -240,6 +316,12 @@ public class PlatformInput {
 		return b;
 	}
 
+	public static boolean wasVisualViewportResized() {
+		boolean b = windowResized2;
+		windowResized2 = false;
+		return b;
+	}
+
 	public static boolean keyboardNext() {
 		if(keyboardEventList.size() > 0) {
 			currentKeyboardEvent = keyboardEventList.remove(0);
@@ -274,6 +356,33 @@ public class PlatformInput {
 		}
 	}
 
+	public static void keyboardFireEvent(EnumFireKeyboardEvent eventType, int eagKey, char keyChar) {
+		switch(eventType) {
+		case KEY_DOWN:
+			keyboardCharList.add(keyChar);
+			keyboardEventList.add(new KeyboardEvent(eagKey, true, false));
+			break;
+		case KEY_UP:
+			if(eagKey >= 0 && eagKey < keyboardReleaseEventChars.length) {
+				keyboardReleaseEventChars[eagKey] = keyChar;
+			}
+			keyboardEventList.add(new KeyboardEvent(eagKey, false, false));
+			break;
+		case KEY_REPEAT:
+			keyboardCharList.add(keyChar);
+			keyboardEventList.add(new KeyboardEvent(eagKey, true, true));
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
+		if(keyboardEventList.size() > 64) {
+			keyboardEventList.remove(0);
+		}
+		if(keyboardCharList.size() > 64) {
+			keyboardCharList.remove(0);
+		}
+	}
+
 	public static boolean keyboardGetEventKeyState() {
 		return currentKeyboardEvent.pressed;
 	}
@@ -315,6 +424,44 @@ public class PlatformInput {
 		}
 	}
 
+	public static void mouseFireMoveEvent(EnumFireMouseEvent eventType, int posX, int posY) {
+		if(eventType == EnumFireMouseEvent.MOUSE_MOVE) {
+			mouseEventList.add(new MouseEvent(-1, false, posX, posY, 0.0f));
+			if(mouseEventList.size() > 64) {
+				mouseEventList.remove(0);
+			}
+		}else {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	public static void mouseFireButtonEvent(EnumFireMouseEvent eventType, int posX, int posY, int button) {
+		switch(eventType) {
+		case MOUSE_DOWN:
+			mouseEventList.add(new MouseEvent(button, true, posX, posY, 0.0f));
+			break;
+		case MOUSE_UP:
+			mouseEventList.add(new MouseEvent(button, false, posX, posY, 0.0f));
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
+		if(mouseEventList.size() > 64) {
+			mouseEventList.remove(0);
+		}
+	}
+
+	public static void mouseFireWheelEvent(EnumFireMouseEvent eventType, int posX, int posY, float wheel) {
+		if(eventType == EnumFireMouseEvent.MOUSE_WHEEL) {
+			mouseEventList.add(new MouseEvent(-1, false, posX, posY, wheel));
+			if(mouseEventList.size() > 64) {
+				mouseEventList.remove(0);
+			}
+		}else {
+			throw new UnsupportedOperationException();
+		}
+	}
+
 	public static boolean mouseGetEventButtonState() {
 		return currentMouseEvent.pressed;
 	}
@@ -366,6 +513,10 @@ public class PlatformInput {
 		}
 	}
 
+	public static boolean mouseGrabSupported() {
+		return true;
+	}
+
 	public static boolean isPointerLocked() {
 		return windowMouseGrabbed;
 	}
@@ -404,6 +555,10 @@ public class PlatformInput {
 		functionKeyModifier = KeyboardConstants.getGLFWKeyFromEagler(key);
 	}
 
+	public static boolean supportsFullscreen() {
+		return true;
+	}
+
 	private static boolean fullscreen = false;
 	private static boolean startupFullscreen = false;
 	private static int[] lastPos = new int[4];
@@ -483,4 +638,247 @@ public class PlatformInput {
 			break;
 		}
 	}
+
+	public static boolean touchNext() {
+		return false;
+	}
+
+	public static EnumTouchEvent touchGetEventType() {
+		return null;
+	}
+
+	public static int touchGetEventTouchPointCount() {
+		return 0;
+	}
+
+	public static int touchGetEventTouchX(int pointId) {
+		return 0;
+	}
+
+	public static int touchGetEventTouchY(int pointId) {
+		return 0;
+	}
+
+	public static float touchGetEventTouchRadiusX(int pointId) {
+		return 0.0f;
+	}
+
+	public static float touchGetEventTouchRadiusY(int pointId) {
+		return 0.0f;
+	}
+
+	public static float touchGetEventTouchRadiusMixed(int pointId) {
+		return touchGetEventTouchRadiusX(pointId) * 0.5f + touchGetEventTouchRadiusY(pointId) * 0.5f;
+	}
+
+	public static float touchGetEventTouchForce(int pointId) {
+		return 0.0f;
+	}
+
+	public static int touchGetEventTouchPointUID(int pointId) {
+		return 0;
+	}
+
+	public static int touchPointCount() {
+		return 0;
+	}
+
+	public static int touchPointX(int pointId) {
+		return 0;
+	}
+
+	public static int touchPointY(int pointId) {
+		return 0;
+	}
+
+	public static float touchRadiusX(int pointId) {
+		return 0.0f;
+	}
+
+	public static float touchRadiusY(int pointId) {
+		return 0.0f;
+	}
+
+	public static float touchRadiusMixed(int pointId) {
+		return touchRadiusX(pointId) * 0.5f + touchRadiusY(pointId) * 0.5f;
+	}
+
+	public static float touchForce(int pointId) {
+		return 0.0f;
+	}
+
+	public static int touchPointUID(int pointId) {
+		return 0;
+	}
+
+	public static void touchSetOpenKeyboardZone(int x, int y, int w, int h) {
+		
+	}
+
+	public static void touchCloseDeviceKeyboard() {
+		
+	}
+
+	public static boolean touchIsDeviceKeyboardOpenMAYBE() {
+		return false;
+	}
+
+	public static String touchGetPastedString() {
+		return null;
+	}
+
+	private static void gamepadEnumerateDevices() {
+		if(selectedGamepad != -1 && !glfwJoystickIsGamepad(selectedGamepad)) {
+			selectedGamepad = -1;
+		}
+		List<Gamepad> oldList = null;
+		if(!gamepadList.isEmpty()) {
+			oldList = new ArrayList<>(gamepadList);
+			gamepadList.clear();
+		}
+		for(int i = GLFW_JOYSTICK_1; i <= GLFW_JOYSTICK_16; ++i) {
+			if(glfwJoystickIsGamepad(i)) {
+				gamepadList.add(new Gamepad(i, gamepadMakeName(i), glfwGetJoystickGUID(i)));
+			}
+		}
+		vigg: if(selectedGamepad != -1) {
+			for(int i = 0, l = gamepadList.size(); i < l; ++i) {
+				Gamepad gp = gamepadList.get(i);
+				if(gp.gamepadId == selectedGamepad && gp.gamepadUUID.equals(selectedGamepadUUID)) {
+					break vigg;
+				}
+			}
+			selectedGamepad = -1;
+		}
+		if(oldList == null) {
+			if(!gamepadList.isEmpty()) {
+				for(int i = 0, l = gamepadList.size(); i < l; ++i) {
+					PlatformRuntime.logger.info("Found controller: {}", gamepadList.get(i).gamepadName);
+				}
+			}
+		}else {
+			if(gamepadList.isEmpty()) {
+				for(int i = 0, l = oldList.size(); i < l; ++i) {
+					PlatformRuntime.logger.info("Lost controller: {}", oldList.get(i).gamepadName);
+				}
+			}else {
+				Set<String> oldGamepadUUIDs = new HashSet<>();
+				for(int i = 0, l = oldList.size(); i < l; ++i) {
+					oldGamepadUUIDs.add(oldList.get(i).gamepadUUID);
+				}
+				Set<String> newGamepadUUIDs = new HashSet<>();
+				for(int i = 0, l = gamepadList.size(); i < l; ++i) {
+					newGamepadUUIDs.add(gamepadList.get(i).gamepadUUID);
+				}
+				for(int i = 0, l = oldList.size(); i < l; ++i) {
+					Gamepad g = oldList.get(i);
+					if(!newGamepadUUIDs.contains(g.gamepadUUID)) {
+						PlatformRuntime.logger.info("Lost controller: {}", g.gamepadName);
+					}
+				}
+				for(int i = 0, l = gamepadList.size(); i < l; ++i) {
+					Gamepad g = gamepadList.get(i);
+					if(!oldGamepadUUIDs.contains(g.gamepadUUID)) {
+						PlatformRuntime.logger.info("Found controller: {}", g.gamepadName);
+					}
+				}
+			}
+		}
+		
+	}
+
+	private static String gamepadMakeName(int glfwId) {
+		String s = glfwGetGamepadName(glfwId);
+		if(s.endsWith(" (GLFW)")) {
+			s = s.substring(0, s.length() - 7);
+		}
+		return glfwGetJoystickName(glfwId) + " (" + s + ")";
+	}
+
+	public static int gamepadGetValidDeviceCount() {
+		return gamepadList.size();
+	}
+
+	public static String gamepadGetDeviceName(int deviceId) {
+		if(deviceId >= 0 && deviceId < gamepadList.size()) {
+			return gamepadList.get(deviceId).gamepadName;
+		}else {
+			return "Unknown";
+		}
+	}
+
+	public static void gamepadSetSelectedDevice(int deviceId) {
+		gamepadReset();
+		if(deviceId >= 0 && deviceId < gamepadList.size()) {
+			selectedGamepad = gamepadList.get(deviceId).gamepadId;
+			if(!glfwJoystickIsGamepad(selectedGamepad)) {
+				selectedGamepad = -1;
+			}
+		}else {
+			selectedGamepad = -1;
+		}
+	}
+
+	private static void gamepadReset() {
+		for(int i = 0; i < gamepadButtonStates.length; ++i) {
+			gamepadButtonStates[i] = false;
+		}
+		for(int i = 0; i < gamepadAxisStates.length; ++i) {
+			gamepadAxisStates[i] = 0.0f;
+		}
+	}
+
+	public static void gamepadUpdate() {
+		gamepadReset();
+		if(selectedGamepad != -1) {
+			if(!glfwJoystickIsGamepad(selectedGamepad)) {
+				selectedGamepad = -1;
+				return;
+			}
+			try(MemoryStack ms = MemoryStack.stackPush()) {
+				GLFWGamepadState state = GLFWGamepadState.calloc(ms);
+				glfwGetGamepadState(selectedGamepad, state);
+				java.nio.FloatBuffer axes = state.axes();
+				axes.get(gamepadAxisStates);
+				java.nio.ByteBuffer buttons = state.buttons();
+				for(int i = 0, l = buttons.remaining(); i < l && i < gamepadButtonStates.length; ++i) {
+					boolean v = buttons.get() != (byte)0;
+					int j = GamepadConstants.getEaglerButtonFromGLFW(i);
+					if(j != -1) {
+						gamepadButtonStates[j] = v;
+					}
+				}
+				gamepadButtonStates[GamepadConstants.GAMEPAD_LEFT_TRIGGER] = axes.get() > 0.4f;
+				gamepadButtonStates[GamepadConstants.GAMEPAD_RIGHT_TRIGGER] = axes.get() > 0.4f;
+			}
+		}
+	}
+
+	public static boolean gamepadIsValid() {
+		return selectedGamepad != -1;
+	}
+
+	public static String gamepadGetName() {
+		return selectedGamepad != -1 ? selectedGamepadName : "Unknown";
+	}
+
+	public static boolean gamepadGetButtonState(int button) {
+		return selectedGamepad != -1 && button >= 0 && button < gamepadButtonStates.length ? gamepadButtonStates[button] : false;
+	}
+
+	public static float gamepadGetAxis(int axis) {
+		return selectedGamepad != -1 && axis >= 0 && axis < gamepadAxisStates.length ? gamepadAxisStates[axis] : 0.0f;
+	}
+
+	public static float getDPI() {
+		float[] dpiX = new float[1];
+		float[] dpiY = new float[1];
+		glfwGetWindowContentScale(win, dpiX, dpiY);
+		float ret = dpiX[0] * 0.5f + dpiY[0] * 0.5f;
+		if(ret <= 0.0f) {
+			ret = 1.0f;
+		}
+		return ret;
+	}
+
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformNetworking.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformNetworking.java
index 84050cf..389f46d 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformNetworking.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformNetworking.java
@@ -2,17 +2,13 @@ package net.lax1dude.eaglercraft.v1_8.internal;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.java_websocket.enums.ReadyState;
 
+import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.DesktopWebSocketClient;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
 /**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -28,124 +24,22 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  */
 public class PlatformNetworking {
 	
-	static final Logger networkLogger = LogManager.getLogger("PlatformNetworking");
+	private static final Logger logger = LogManager.getLogger("PlatformNetworking");
 	
-	private static WebSocketPlayClient wsPlayClient = null;
-	static EnumEaglerConnectionState playConnectState = EnumEaglerConnectionState.CLOSED;
-	static EnumServerRateLimit serverRateLimit = null;
-	
-	static String currentURI = null;
-	
-	public static EnumEaglerConnectionState playConnectionState() {
-		return ((wsPlayClient == null || wsPlayClient.isClosed()) && playConnectState == EnumEaglerConnectionState.CONNECTING) ? EnumEaglerConnectionState.FAILED :
-			((wsPlayClient != null && wsPlayClient.getReadyState() == ReadyState.NOT_YET_CONNECTED) ? EnumEaglerConnectionState.CONNECTING : 
-				(((wsPlayClient == null || wsPlayClient.isClosed()) && playConnectState != EnumEaglerConnectionState.FAILED) ? EnumEaglerConnectionState.CLOSED : playConnectState));
-	}
-	
-	public static void startPlayConnection(String destination) {
-		if(!playConnectionState().isClosed()) {
-			networkLogger.warn("Tried connecting to a server while already connected to a different server!");
-			playDisconnect();
-		}
-		
-		currentURI = destination;
-		
-		synchronized(playPackets) {
-			playPackets.clear();
-		}
-		
-		playConnectState = EnumEaglerConnectionState.CONNECTING;
-		networkLogger.info("Connecting to server: {}", destination);
-		
-		URI u;
-		
+	public static IWebSocketClient openWebSocket(String socketURI) {
 		try {
-			u = new URI(destination);
-		}catch(URISyntaxException ex) {
-			networkLogger.error("Invalid server URI: {}", destination);
-			playConnectState = EnumEaglerConnectionState.FAILED;
-			return;
-		}
-		
-		wsPlayClient = new WebSocketPlayClient(u);
-		wsPlayClient.connect();
-	}
-	
-	public static void playDisconnect() {
-		if(!playConnectionState().isClosed() && wsPlayClient != null) {
-			try {
-				wsPlayClient.closeBlocking();
-			} catch (InterruptedException e) {
-				// :(
-			}
-			playConnectState = EnumEaglerConnectionState.CLOSED;
-		}
-	}
-	
-	private static final List<byte[]> playPackets = new LinkedList();
-	
-	public static byte[] readPlayPacket() {
-		synchronized(playPackets) {
-			return playPackets.size() > 0 ? playPackets.remove(0) : null;
-		}
-	}
-	
-	public static List<byte[]> readAllPacket() {
-		synchronized(playPackets) {
-			if(!playPackets.isEmpty()) {
-				List<byte[]> ret = new ArrayList<>(playPackets);
-				playPackets.clear();
-				return ret;
-			}else {
-				return null;
-			}
-		}
-	}
-	
-	public static int countAvailableReadData() {
-		int total = 0;
-		synchronized(playPackets) {
-			for(int i = 0, l = playPackets.size(); i < l; ++i) {
-				total += playPackets.get(i).length;
-			}
-		}
-		return total;
-	}
-	
-	static void recievedPlayPacket(byte[] arg0) {
-		synchronized(playPackets) {
-			playPackets.add(arg0);
-		}
-	}
-	
-	public static void writePlayPacket(byte[] pkt) {
-		if(wsPlayClient == null || wsPlayClient.isClosed()) {
-			networkLogger.error("Tried to send {} byte play packet while the socket was closed!", pkt.length);
-		}else {
-			wsPlayClient.send(pkt);
-		}
-	}
-	
-	public static IServerQuery sendServerQuery(String uri, String accept) {
-		URI u;
-		
-		try {
-			u = new URI(uri);
-		}catch(URISyntaxException ex) {
-			networkLogger.error("Invalid server URI: {}", uri);
-			playConnectState = EnumEaglerConnectionState.FAILED;
+			URI uri = new URI(socketURI);
+			return new DesktopWebSocketClient(uri);
+		}catch(Throwable t) {
+			logger.error("Could not open WebSocket to \"{}\"!", socketURI);
+			logger.error(t);
 			return null;
 		}
-		
-		return new WebSocketServerQuery(accept, u);
 	}
 	
-	public static EnumServerRateLimit getRateLimit() {
-		return serverRateLimit == null ? EnumServerRateLimit.OK : serverRateLimit;
-	}
-	
-	public static String getCurrentURI() {
-		return currentURI;
+	public static IWebSocketClient openWebSocketUnsafe(String socketURI) throws URISyntaxException {
+		URI uri = new URI(socketURI);
+		return new DesktopWebSocketClient(uri);
 	}
 	
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java
index 14b6e86..d861d08 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java
@@ -6,6 +6,13 @@ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
 
 import static org.lwjgl.opengles.GLES30.*;
+import static org.lwjgl.opengles.ANGLEInstancedArrays.*;
+import static org.lwjgl.opengles.EXTInstancedArrays.*;
+import static org.lwjgl.opengles.EXTTextureStorage.*;
+import static org.lwjgl.opengles.OESVertexArrayObject.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import org.lwjgl.opengles.GLESCapabilities;
 
@@ -26,10 +33,103 @@ import org.lwjgl.opengles.GLESCapabilities;
  */
 public class PlatformOpenGL {
 
+	private static int glesVers = -1;
+
+	private static boolean hasANGLEInstancedArrays = false;
+	private static boolean hasEXTColorBufferFloat = false;
+	private static boolean hasEXTColorBufferHalfFloat = false;
+	private static boolean hasEXTGPUShader5 = false;
+	private static boolean hasEXTInstancedArrays = false;
+	private static boolean hasEXTShaderTextureLOD = false;
+	private static boolean hasEXTTextureStorage = false;
+	private static boolean hasOESFBORenderMipmap = false;
+	private static boolean hasOESGPUShader5 = false;
+	private static boolean hasOESVertexArrayObject = false;
+	private static boolean hasOESTextureFloat = false;
+	private static boolean hasOESTextureFloatLinear = false;
+	private static boolean hasOESTextureHalfFloat = false;
+	private static boolean hasOESTextureHalfFloatLinear = false;
+	private static boolean hasEXTTextureFilterAnisotropic = false;
+
+	private static boolean hasFBO16FSupport = false;
+	private static boolean hasFBO32FSupport = false;
+	private static boolean hasLinearHDR16FSupport = false;
 	private static boolean hasLinearHDR32FSupport = false;
 
-	static void setCurrentContext(GLESCapabilities caps) {
+	private static final int VAO_IMPL_NONE = -1;
+	private static final int VAO_IMPL_CORE = 0;
+	private static final int VAO_IMPL_OES = 1;
+	private static int vertexArrayImpl = VAO_IMPL_NONE;
+
+	private static final int INSTANCE_IMPL_NONE = -1;
+	private static final int INSTANCE_IMPL_CORE = 0;
+	private static final int INSTANCE_IMPL_ANGLE = 1;
+	private static final int INSTANCE_IMPL_EXT = 2;
+	private static int instancingImpl = INSTANCE_IMPL_NONE;
+
+	private static final int TEX_STORAGE_IMPL_NONE = -1;
+	private static final int TEX_STORAGE_IMPL_CORE = 0;
+	private static final int TEX_STORAGE_IMPL_EXT = 1;
+	private static int texStorageImpl = TEX_STORAGE_IMPL_NONE;
+
+	static void setCurrentContext(int glesVersIn, GLESCapabilities caps) {
+		glesVers = glesVersIn;
+
+		hasANGLEInstancedArrays = glesVersIn == 200 && caps.GL_ANGLE_instanced_arrays;
+		hasOESTextureFloat = glesVersIn == 200 && caps.GL_OES_texture_float;
+		hasOESTextureFloatLinear = glesVersIn >= 300 && caps.GL_OES_texture_float_linear;
+		hasOESTextureHalfFloat = glesVersIn == 200 && caps.GL_OES_texture_half_float;
+		hasOESTextureHalfFloatLinear = glesVersIn == 200 && caps.GL_OES_texture_half_float_linear;
+		hasEXTColorBufferFloat = (glesVersIn == 310 || glesVersIn == 300) && caps.GL_EXT_color_buffer_float;
+		hasEXTColorBufferHalfFloat = !hasEXTColorBufferFloat
+				&& (glesVersIn == 310 || glesVersIn == 300 || glesVersIn == 200) && caps.GL_EXT_color_buffer_half_float;
+		hasEXTInstancedArrays = !hasANGLEInstancedArrays && glesVersIn == 200 && caps.GL_EXT_instanced_arrays;
+		hasEXTShaderTextureLOD = glesVersIn == 200 && caps.GL_EXT_shader_texture_lod;
+		hasEXTTextureStorage = glesVersIn == 200 && caps.GL_EXT_texture_storage;
+		hasOESGPUShader5 = glesVersIn == 310 && caps.GL_OES_gpu_shader5;
+		hasEXTGPUShader5 = !hasOESGPUShader5 && glesVersIn == 310 && caps.GL_EXT_gpu_shader5;
+		hasOESFBORenderMipmap = glesVersIn == 200 && caps.GL_OES_fbo_render_mipmap;
+		hasOESVertexArrayObject = glesVersIn == 200 && caps.GL_OES_vertex_array_object;
 		hasLinearHDR32FSupport = caps.GL_OES_texture_float_linear;
+		hasEXTTextureFilterAnisotropic = caps.GL_EXT_texture_filter_anisotropic;
+		
+		hasFBO16FSupport = glesVersIn >= 320 || ((glesVersIn >= 300 || hasOESTextureFloat) && (hasEXTColorBufferFloat || hasEXTColorBufferHalfFloat));
+		hasFBO32FSupport = glesVersIn >= 320 || ((glesVersIn >= 300 || hasOESTextureHalfFloat) && hasEXTColorBufferFloat);
+		hasLinearHDR16FSupport = glesVersIn >= 300 || hasOESTextureHalfFloatLinear;
+		hasLinearHDR32FSupport = glesVersIn >= 300 && hasOESTextureFloatLinear;
+		
+		if(glesVersIn >= 300) {
+			vertexArrayImpl = VAO_IMPL_CORE;
+			instancingImpl = INSTANCE_IMPL_CORE;
+			texStorageImpl = TEX_STORAGE_IMPL_CORE;
+		}else if(glesVersIn == 200) {
+			vertexArrayImpl = hasOESVertexArrayObject ? VAO_IMPL_OES : VAO_IMPL_NONE;
+			instancingImpl = hasANGLEInstancedArrays ? INSTANCE_IMPL_ANGLE : (hasEXTInstancedArrays ? INSTANCE_IMPL_EXT : INSTANCE_IMPL_NONE);
+			texStorageImpl = hasEXTTextureStorage ? TEX_STORAGE_IMPL_EXT : TEX_STORAGE_IMPL_NONE;
+		}else {
+			vertexArrayImpl = VAO_IMPL_NONE;
+			instancingImpl = INSTANCE_IMPL_NONE;
+			texStorageImpl = TEX_STORAGE_IMPL_NONE;
+		}
+	}
+
+	public static final List<String> dumpActiveExtensions() {
+		List<String> exts = new ArrayList<>();
+		if(hasANGLEInstancedArrays) exts.add("ANGLE_instanced_arrays");
+		if(hasEXTColorBufferFloat) exts.add("EXT_color_buffer_float");
+		if(hasEXTColorBufferHalfFloat) exts.add("EXT_color_buffer_half_float");
+		if(hasEXTGPUShader5) exts.add("EXT_gpu_shader5");
+		if(hasEXTInstancedArrays) exts.add("EXT_instanced_arrays");
+		if(hasEXTTextureStorage) exts.add("EXT_texture_storage");
+		if(hasOESFBORenderMipmap) exts.add("OES_fbo_render_mipmap");
+		if(hasOESGPUShader5) exts.add("OES_gpu_shader5");
+		if(hasOESVertexArrayObject) exts.add("OES_vertex_array_object");
+		if(hasOESTextureFloat) exts.add("OES_texture_float");
+		if(hasOESTextureFloatLinear) exts.add("OES_texture_float_linear");
+		if(hasOESTextureHalfFloat) exts.add("OES_texture_half_float");
+		if(hasOESTextureHalfFloatLinear) exts.add("OES_texture_half_float_linear");
+		if(hasEXTTextureFilterAnisotropic) exts.add("EXT_texture_filter_anisotropic");
+		return exts;
 	}
 
 	public static final void _wglEnable(int glEnum) {
@@ -89,17 +189,45 @@ public class PlatformOpenGL {
 	}
 
 	public static final void _wglDrawBuffers(int buffer) {
-		glDrawBuffers(buffer);
+		if(glesVers == 200) {
+			if(buffer != 0x8CE0) { // GL_COLOR_ATTACHMENT0
+				throw new UnsupportedOperationException();
+			}
+		}else {
+			glDrawBuffers(buffer);
+		}
 	}
 
 	public static final void _wglDrawBuffers(int[] buffers) {
-		glDrawBuffers(buffers);
+		if(glesVers == 200) {
+			if(buffers.length != 1 || buffers[0] != 0x8CE0) { // GL_COLOR_ATTACHMENT0
+				throw new UnsupportedOperationException();
+			}
+		}else {
+			glDrawBuffers(buffers);
+		}
 	}
 
 	public static final void _wglReadBuffer(int buffer) {
 		glReadBuffer(buffer);
 	}
 
+	public static final void _wglReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer data) {
+		nglReadPixels(x, y, width, height, format, type, EaglerLWJGLAllocator.getAddress(data));
+	}
+
+	public static final void _wglReadPixels_u16(int x, int y, int width, int height, int format, int type, ByteBuffer data) {
+		nglReadPixels(x, y, width, height, format, type, EaglerLWJGLAllocator.getAddress(data));
+	}
+
+	public static final void _wglReadPixels(int x, int y, int width, int height, int format, int type, IntBuffer data) {
+		nglReadPixels(x, y, width, height, format, type, EaglerLWJGLAllocator.getAddress(data));
+	}
+
+	public static final void _wglReadPixels(int x, int y, int width, int height, int format, int type, FloatBuffer data) {
+		nglReadPixels(x, y, width, height, format, type, EaglerLWJGLAllocator.getAddress(data));
+	}
+
 	public static final void _wglPolygonOffset(float f1, float f2) {
 		glPolygonOffset(f1, f2);
 	}
@@ -117,7 +245,14 @@ public class PlatformOpenGL {
 	}
 
 	public static final IBufferArrayGL _wglGenVertexArrays() {
-		return new OpenGLObjects.BufferArrayGL(glGenVertexArrays());
+		switch(vertexArrayImpl) {
+		case VAO_IMPL_CORE:
+			return new OpenGLObjects.BufferArrayGL(glGenVertexArrays());
+		case VAO_IMPL_OES:
+			return new OpenGLObjects.BufferArrayGL(glGenVertexArraysOES());
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 
 	public static final IProgramGL _wglCreateProgram() {
@@ -149,7 +284,17 @@ public class PlatformOpenGL {
 	}
 
 	public static final void _wglDeleteVertexArrays(IBufferArrayGL obj) {
-		glDeleteVertexArrays(((OpenGLObjects.BufferArrayGL) obj).ptr);
+		int ptr = ((OpenGLObjects.BufferArrayGL) obj).ptr;
+		switch(vertexArrayImpl) {
+		case VAO_IMPL_CORE:
+			glDeleteVertexArrays(ptr);
+			break;
+		case VAO_IMPL_OES:
+			glDeleteVertexArraysOES(ptr);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 
 	public static final void _wglDeleteProgram(IProgramGL obj) {
@@ -211,7 +356,17 @@ public class PlatformOpenGL {
 	}
 
 	public static final void _wglBindVertexArray(IBufferArrayGL obj) {
-		glBindVertexArray(obj == null ? 0 : ((OpenGLObjects.BufferArrayGL) obj).ptr);
+		int ptr = obj == null ? 0 : ((OpenGLObjects.BufferArrayGL) obj).ptr;
+		switch(vertexArrayImpl) {
+		case VAO_IMPL_CORE:
+			glBindVertexArray(ptr);
+			break;
+		case VAO_IMPL_OES:
+			glBindVertexArrayOES(ptr);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 
 	public static final void _wglEnableVertexAttribArray(int index) {
@@ -228,7 +383,19 @@ public class PlatformOpenGL {
 	}
 
 	public static final void _wglVertexAttribDivisor(int index, int divisor) {
-		glVertexAttribDivisor(index, divisor);
+		switch(instancingImpl) {
+		case INSTANCE_IMPL_CORE:
+			glVertexAttribDivisor(index, divisor);
+			break;
+		case INSTANCE_IMPL_ANGLE:
+			glVertexAttribDivisorANGLE(index, divisor);
+			break;
+		case INSTANCE_IMPL_EXT:
+			glVertexAttribDivisorEXT(index, divisor);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 
 	public static final void _wglActiveTexture(int texture) {
@@ -313,7 +480,16 @@ public class PlatformOpenGL {
 	}
 
 	public static final void _wglTexStorage2D(int target, int levels, int internalFormat, int w, int h) {
-		glTexStorage2D(target, levels, internalFormat, w, h);
+		switch(texStorageImpl) {
+		case TEX_STORAGE_IMPL_CORE:
+			glTexStorage2D(target, levels, internalFormat, w, h);
+			break;
+		case TEX_STORAGE_IMPL_EXT:
+			glTexStorage2DEXT(target, levels, internalFormat, w, h);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 
 	public static final void _wglPixelStorei(int pname, int value) {
@@ -377,7 +553,19 @@ public class PlatformOpenGL {
 	}
 
 	public static final void _wglDrawArraysInstanced(int mode, int first, int count, int instanced) {
-		glDrawArraysInstanced(mode, first, count, instanced);
+		switch(instancingImpl) {
+		case INSTANCE_IMPL_CORE:
+			glDrawArraysInstanced(mode, first, count, instanced);
+			break;
+		case INSTANCE_IMPL_ANGLE:
+			glDrawArraysInstancedANGLE(mode, first, count, instanced);
+			break;
+		case INSTANCE_IMPL_EXT:
+			glDrawArraysInstancedEXT(mode, first, count, instanced);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 
 	public static final void _wglDrawElements(int mode, int count, int type, int offset) {
@@ -385,7 +573,19 @@ public class PlatformOpenGL {
 	}
 
 	public static final void _wglDrawElementsInstanced(int mode, int count, int type, int offset, int instanced) {
-		glDrawElementsInstanced(mode, count, type, offset, instanced);
+		switch(instancingImpl) {
+		case INSTANCE_IMPL_CORE:
+			glDrawElementsInstanced(mode, count, type, offset, instanced);
+			break;
+		case INSTANCE_IMPL_ANGLE:
+			glDrawElementsInstancedANGLE(mode, count, type, offset, instanced);
+			break;
+		case INSTANCE_IMPL_EXT:
+			glDrawElementsInstancedEXT(mode, count, type, offset, instanced);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 
 	public static final IUniformGL _wglGetUniformLocation(IProgramGL obj, String name) {
@@ -533,11 +733,79 @@ public class PlatformOpenGL {
 		return glGetError();
 	}
 
-	public static final boolean checkHDRFramebufferSupport(int bits) {
-		return true;
+	public static final int checkOpenGLESVersion() {
+		return glesVers;
 	}
 
+	public static final boolean checkEXTGPUShader5Capable() {
+		return hasEXTGPUShader5;
+	}
+
+	public static final boolean checkOESGPUShader5Capable() {
+		return hasOESGPUShader5;
+	}
+
+	public static final boolean checkFBORenderMipmapCapable() {
+		return hasOESFBORenderMipmap;
+	}
+
+	public static final boolean checkVAOCapable() {
+		return vertexArrayImpl != VAO_IMPL_NONE;
+	}
+
+	public static final boolean checkInstancingCapable() {
+		return instancingImpl != INSTANCE_IMPL_NONE;
+	}
+
+	public static final boolean checkTexStorageCapable() {
+		return texStorageImpl != TEX_STORAGE_IMPL_NONE;
+	}
+
+	public static final boolean checkTextureLODCapable() {
+		return glesVers >= 300 || hasEXTShaderTextureLOD;
+	}
+
+	public static final boolean checkNPOTCapable() {
+		return glesVers >= 300;
+	}
+
+	public static final boolean checkHDRFramebufferSupport(int bits) {
+		switch(bits) {
+		case 16:
+			return hasFBO16FSupport;
+		case 32:
+			return hasFBO32FSupport;
+		default:
+			return false;
+		}
+	}
+
+	public static final boolean checkLinearHDRFilteringSupport(int bits) {
+		switch(bits) {
+		case 16:
+			return hasLinearHDR16FSupport;
+		case 32:
+			return hasLinearHDR32FSupport;
+		default:
+			return false;
+		}
+	}
+
+	// legacy
 	public static final boolean checkLinearHDR32FSupport() {
 		return hasLinearHDR32FSupport;
 	}
+
+	public static final boolean checkAnisotropicFilteringSupport() {
+		return hasEXTTextureFilterAnisotropic;
+	}
+
+	public static final String[] getAllExtensions() {
+		return glGetString(GL_EXTENSIONS).split(" ");
+	}
+
+	public static final void enterVAOEmulationHook() {
+		
+	}
+
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
index 0d939b2..ea4647a 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
@@ -13,7 +13,9 @@ import java.io.OutputStream;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 import java.util.Random;
 import java.util.function.Consumer;
 import java.util.zip.DeflaterOutputStream;
@@ -31,6 +33,7 @@ import org.lwjgl.opengles.GLDebugMessageKHRCallback;
 import org.lwjgl.opengles.GLDebugMessageKHRCallbackI;
 import org.lwjgl.opengles.GLES;
 import org.lwjgl.opengles.GLES30;
+import org.lwjgl.opengles.GLESCapabilities;
 import org.lwjgl.opengles.KHRDebug;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.system.MemoryUtil;
@@ -38,16 +41,19 @@ import org.lwjgl.system.jemalloc.JEmalloc;
 
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.EaglerLWJGLAllocator;
 import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
+import net.lax1dude.eaglercraft.v1_8.Filesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.DesktopClientConfigAdapter;
+import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
+import net.lax1dude.eaglercraft.v1_8.sp.server.internal.ServerPlatformSingleplayer;
 
 /**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -74,7 +80,22 @@ public class PlatformRuntime {
 
 	public static void create() {
 		logger.info("Starting Desktop Runtime...");
-		PlatformFilesystem.initialize();
+		
+		ByteBuffer endiannessTestBytes = allocateByteBuffer(4);
+		try {
+			endiannessTestBytes.asIntBuffer().put(0x6969420);
+			if (((endiannessTestBytes.get(0) & 0xFF) | ((endiannessTestBytes.get(1) & 0xFF) << 8)
+					| ((endiannessTestBytes.get(2) & 0xFF) << 16) | ((endiannessTestBytes.get(3) & 0xFF) << 24)) != 0x6969420) {
+				throw new UnsupportedOperationException("Big endian CPU detected! (somehow)");
+			}else {
+				logger.info("Endianness: this CPU is little endian");
+			}
+		}finally {
+			freeByteBuffer(endiannessTestBytes);
+		}
+		
+		IEaglerFilesystem resourcePackFilesystem = Filesystem.getHandleFor(getClientConfigAdapter().getResourcePacksDB());
+		VFile2.setPrimaryFilesystem(resourcePackFilesystem);
 		EaglerFolderResourcePack.setSupported(true);
 		
 		if(requestedANGLEPlatform != EnumPlatformANGLE.DEFAULT) {
@@ -91,23 +112,54 @@ public class PlatformRuntime {
 
 		glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API);
 		glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API);
-		glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-		glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
 
 		glfwWindowHint(GLFW_CENTER_CURSOR, GLFW_TRUE);
 		glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GLFW_TRUE);
-		
 
 		PointerBuffer buf = glfwGetMonitors();
 		GLFWVidMode mon = glfwGetVideoMode(buf.get(0));
 
 		int windowWidth = mon.width() - 200;
 		int windowHeight = mon.height() - 250;
+		String title = "Eaglercraft Desktop Runtime";
 
 		int winX = (mon.width() - windowWidth) / 2;
 		int winY = (mon.height() - windowHeight - 20) / 2;
 		
-		windowHandle = glfwCreateWindow(windowWidth, windowHeight, "Eaglercraft Desktop Runtime", 0l, 0l);
+		int myGLVersion = -1;
+		if(requestedGLVersion >= 310 && windowHandle == 0) {
+			glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+			glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
+			windowHandle = glfwCreateWindow(windowWidth, windowHeight, title, 0l, 0l);
+			if(windowHandle == 0l) {
+				logger.error("Failed to create OpenGL ES 3.1 context!");
+			}else {
+				myGLVersion = 310;
+			}
+		}
+		if(requestedGLVersion >= 300 && windowHandle == 0) {
+			glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+			glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
+			windowHandle = glfwCreateWindow(windowWidth, windowHeight, title, 0l, 0l);
+			if(windowHandle == 0l) {
+				logger.error("Failed to create OpenGL ES 3.0 context!");
+			}else {
+				myGLVersion = 300;
+			}
+		}
+		if(requestedGLVersion >= 200 && windowHandle == 0) {
+			glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
+			glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
+			windowHandle = glfwCreateWindow(windowWidth, windowHeight, title, 0l, 0l);
+			if(windowHandle == 0l) {
+				logger.error("Failed to create OpenGL ES 2.0 context!");
+			}else {
+				myGLVersion = 200;
+			}
+		}
+		if(myGLVersion == -1) {
+			throw new RuntimeException("Could not create a supported OpenGL ES context!");
+		}
 		
 		glfwSetWindowPos(windowHandle, winX, winY);
 		
@@ -171,13 +223,28 @@ public class PlatformRuntime {
 		
 		EGL.createDisplayCapabilities(glfw_eglHandle, major[0], minor[0]);
 		glfwMakeContextCurrent(windowHandle);
-		PlatformOpenGL.setCurrentContext(GLES.createCapabilities());
+		GLESCapabilities caps = GLES.createCapabilities();
+		PlatformOpenGL.setCurrentContext(myGLVersion, caps);
 		
 		logger.info("OpenGL Version: {}", (glVersion = GLES30.glGetString(GLES30.GL_VERSION)));
 		logger.info("OpenGL Renderer: {}", (glRenderer = GLES30.glGetString(GLES30.GL_RENDERER)));
-		
 		rendererANGLEPlatform = EnumPlatformANGLE.fromGLRendererString(glRenderer);
 		
+		int realGLVersion = (glVersion != null && probablyGLES2(glVersion)) ? 200
+				: (GLES30.glGetInteger(GLES30.GL_MAJOR_VERSION) * 100
+						+ GLES30.glGetInteger(GLES30.GL_MINOR_VERSION) * 10);
+		if(realGLVersion != myGLVersion) {
+			logger.warn("Unexpected GLES verison resolved for requested {} context: {}", myGLVersion, realGLVersion);
+			if(myGLVersion == 200) {
+				logger.warn("Note: try adding the \"d3d9\" option if you are on windows trying to get GLES 2.0");
+			}
+			if(realGLVersion != 320 && realGLVersion != 310 && realGLVersion != 300 && realGLVersion != 200) {
+				throw new RuntimeException("Unsupported OpenGL ES version detected: " + realGLVersion);
+			}
+			myGLVersion = realGLVersion;
+			PlatformOpenGL.setCurrentContext(myGLVersion, caps);
+		}
+		
 		if(requestedANGLEPlatform != EnumPlatformANGLE.DEFAULT
 				&& rendererANGLEPlatform != requestedANGLEPlatform) {
 			logger.warn("Incorrect ANGLE Platform: {}", rendererANGLEPlatform.name);
@@ -187,6 +254,18 @@ public class PlatformRuntime {
 			logger.info("ANGLE Platform: {}", rendererANGLEPlatform.name);
 		}
 		
+		List<String> exts = PlatformOpenGL.dumpActiveExtensions();
+		if(exts.isEmpty()) {
+			logger.info("Unlocked the following OpenGL ES extensions: (NONE)");
+		}else {
+			Collections.sort(exts);
+			logger.info("Unlocked the following OpenGL ES extensions:");
+			for(int i = 0, l = exts.size(); i < l; ++i) {
+				logger.info(" - " + exts.get(i));
+			}
+		}
+		
+		
 		glfwSwapInterval(0);
 		
 		KHRDebug.glDebugMessageCallbackKHR(new GLDebugMessageKHRCallbackI() {
@@ -245,13 +324,20 @@ public class PlatformRuntime {
 	
 	public static void destroy() {
 		PlatformAudio.platformShutdown();
-		PlatformFilesystem.platformShutdown();
+		Filesystem.closeAllHandles();
+		ServerPlatformSingleplayer.platformShutdown();
 		GLES.destroy();
 		EGL.destroy();
 		glfwDestroyWindow(windowHandle);
 		glfwTerminate();
 	}
 
+	private static boolean probablyGLES2(String glVersion) {
+		if(glVersion == null) return false;
+		glVersion = glVersion.toLowerCase();
+		return glVersion.contains("opengl es 2.0") || glVersion.contains("ES 2.0");
+	}
+
 	public static EnumPlatformType getPlatformType() {
 		return EnumPlatformType.DESKTOP;
 	}
@@ -274,11 +360,16 @@ public class PlatformRuntime {
 	}
 	
 	private static EnumPlatformANGLE requestedANGLEPlatform = EnumPlatformANGLE.DEFAULT;
+	private static int requestedGLVersion = 300;
 	
 	public static void requestANGLE(EnumPlatformANGLE plaf) {
 		requestedANGLEPlatform = plaf;
 	}
 
+	public static void requestGL(int i) {
+		requestedGLVersion = i;
+	}
+
 	public static EnumPlatformANGLE getPlatformANGLE() {
 		return rendererANGLEPlatform;
 	}
@@ -499,18 +590,6 @@ public class PlatformRuntime {
 		return DesktopClientConfigAdapter.instance;
 	}
 
-	public static String getRecText() {
-		return "recording.unsupported";
-	}
-
-	public static boolean recSupported() {
-		return false;
-	}
-
-	public static void toggleRec() {
-		//
-	}
-
 	private static final Random seedProvider = new Random();
 
 	public static long randomSeed() {
@@ -530,4 +609,25 @@ public class PlatformRuntime {
 	public static long getWindowHandle() {
 		return windowHandle;
 	}
+
+	public static long steadyTimeMillis() {
+		return System.nanoTime() / 1000000l;
+	}
+
+	public static long nanoTime() {
+		return System.nanoTime();
+	}
+
+	public static void postCreate() {
+		
+	}
+
+	public static void setDisplayBootMenuNextRefresh(boolean en) {
+		
+	}
+
+	public static void immediateContinue() {
+		// nope
+	}
+
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformScreenRecord.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformScreenRecord.java
new file mode 100755
index 0000000..eb1f80c
--- /dev/null
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformScreenRecord.java
@@ -0,0 +1,59 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+import net.lax1dude.eaglercraft.v1_8.recording.EnumScreenRecordingCodec;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PlatformScreenRecord {
+
+	public static boolean isSupported() {
+		return false;
+	}
+
+	public static boolean isCodecSupported(EnumScreenRecordingCodec codec) {
+		return false;
+	}
+
+	public static void setGameVolume(float volume) {
+		
+	}
+
+	public static void setMicrophoneVolume(float volume) {
+		
+	}
+
+	public static void startRecording(ScreenRecordParameters params) {
+		
+	}
+
+	public static void endRecording() {
+		
+	}
+
+	public static boolean isRecording() {
+		return false;
+	}
+
+	public static boolean isMicVolumeLocked() {
+		return false;
+	}
+
+	public static boolean isVSyncLocked() {
+		return false;
+	}
+
+
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformUpdateSvc.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformUpdateSvc.java
index d981cfd..c82caaf 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformUpdateSvc.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformUpdateSvc.java
@@ -2,6 +2,7 @@ package net.lax1dude.eaglercraft.v1_8.internal;
 
 import net.lax1dude.eaglercraft.v1_8.update.UpdateCertificate;
 import net.lax1dude.eaglercraft.v1_8.update.UpdateProgressStruct;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateResultObj;
 
 /**
  * Copyright (c) 2024 lax1dude. All Rights Reserved.
@@ -46,6 +47,15 @@ public class PlatformUpdateSvc {
 		return dummyStruct;
 	}
 
+	public static UpdateResultObj getUpdateResult() {
+		return null;
+	}
+
+	public static void installSignedClient(UpdateCertificate clientCert, byte[] clientPayload, boolean setDefault,
+			boolean setTimeout) {
+
+	}
+
 	public static void quine(String filename, byte[] cert, byte[] data, String date) {
 		
 	}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
index 4e349a6..3e803ae 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
@@ -4,20 +4,22 @@ import dev.onvoid.webrtc.*;
 import dev.onvoid.webrtc.internal.NativeLoader;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
-import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANPeerEvent;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayLoggerImpl;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayQuery;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayQueryImpl;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayQueryRateLimitDummy;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServerRateLimitTracker;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServerSocket;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServerSocketImpl;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServerSocketRateLimitDummy;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayWorldsQuery;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.*;
-import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayWorldsQueryImpl;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayWorldsQueryRateLimitDummy;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.handshake.ServerHandshake;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.JSONWriter;
@@ -25,10 +27,7 @@ import org.json.JSONWriter;
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.ListMultimap;
 
-import java.io.DataInputStream;
-import java.io.IOException;
 import java.lang.reflect.Field;
-import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.file.Paths;
 import java.util.*;
@@ -52,10 +51,25 @@ public class PlatformWebRTC {
 
 	private static final Logger logger = LogManager.getLogger("PlatformWebRTC");
 
+	private static final RelayLoggerImpl loggerImpl = new RelayLoggerImpl(LogManager.getLogger("RelayPacket"));
+
 	private static final Object lock1 = new Object();
 	private static final Object lock2 = new Object();
 	private static final Object lock3 = new Object();
-	private static final Object lock4 = new Object();
+
+	private static final List<ScheduledRunnable> scheduledRunnables = new LinkedList<>();
+
+	private static class ScheduledRunnable {
+		
+		private final long runAt;
+		private final Runnable runnable;
+		
+		private ScheduledRunnable(long runAt, Runnable runnable) {
+			this.runAt = runAt;
+			this.runnable = runnable;
+		}
+		
+	}
 
 	public static PeerConnectionFactory pcFactory;
 
@@ -72,7 +86,8 @@ public class PlatformWebRTC {
 				Runtime.getRuntime().addShutdownHook(new Thread(() -> pcFactory.dispose()));
 				supported = true;
 			} catch (Exception e) {
-				EagRuntime.debugPrintStackTrace(e);
+				logger.error("Failed to load WebRTC native library!");
+				logger.error(e);
 				supported = false;
 			}
 		}
@@ -81,6 +96,46 @@ public class PlatformWebRTC {
 
 	private static final Map<String, RTCDataChannel> fuckTeaVM = new HashMap<>();
 
+	private static final Comparator<ScheduledRunnable> sortTasks = (r1, r2) -> {
+		return (int)(r1.runAt - r2.runAt);
+	};
+
+	public static void runScheduledTasks() {
+		List<ScheduledRunnable> toRun = null;
+		synchronized(scheduledRunnables) {
+			if(scheduledRunnables.isEmpty()) return;
+			long millis = PlatformRuntime.steadyTimeMillis();
+			Iterator<ScheduledRunnable> itr = scheduledRunnables.iterator();
+			while(itr.hasNext()) {
+				ScheduledRunnable r = itr.next();
+				if(r.runAt < millis) {
+					itr.remove();
+					if(toRun == null) {
+						toRun = new ArrayList<>(1);
+					}
+					toRun.add(r);
+				}
+			}
+		}
+		if(toRun != null) {
+			Collections.sort(toRun, sortTasks);
+			for(int i = 0, l = toRun.size(); i < l; ++i) {
+				try {
+					toRun.get(i).runnable.run();
+				}catch(Throwable t) {
+					logger.error("Caught exception running scheduled WebRTC task!");
+					logger.error(t);
+				}
+			}
+		}
+	}
+
+	static void scheduleTask(long runAfter, Runnable runnable) {
+		synchronized(scheduledRunnables) {
+			scheduledRunnables.add(new ScheduledRunnable(PlatformRuntime.steadyTimeMillis() + runAfter, runnable));
+		}
+	}
+
 	public static class LANClient {
 		public static final byte READYSTATE_INIT_FAILED = -2;
 		public static final byte READYSTATE_FAILED = -1;
@@ -123,15 +178,14 @@ public class PlatformWebRTC {
 							synchronized (lock1) {
 								if (iceCandidate.sdp != null && !iceCandidate.sdp.isEmpty()) {
 									if (iceCandidates.isEmpty()) {
-										new Thread(() -> {
-											EagUtils.sleep(3000);
+										scheduleTask(3000l, () -> {
 											synchronized (lock1) {
 												if (peerConnection != null && peerConnection.getConnectionState() != RTCPeerConnectionState.DISCONNECTED) {
 													clientICECandidate = JSONWriter.valueToString(iceCandidates);
 													iceCandidates.clear();
 												}
 											}
-										}).start();
+										});
 									}
 									Map<String, String> m = new HashMap<>();
 									m.put("sdpMLineIndex", "" + iceCandidate.sdpMLineIndex);
@@ -203,7 +257,7 @@ public class PlatformWebRTC {
 				@Override
 				public void onStateChange() {
 					if (dataChannel != null && dataChannel.getState() == RTCDataChannelState.OPEN) {
-						new Thread(() -> {
+						scheduleTask(-1l, () -> {
 							while (true) {
 								synchronized (lock1) {
 									if (iceCandidates.isEmpty()) {
@@ -216,7 +270,7 @@ public class PlatformWebRTC {
 								clientDataChannelClosed = false;
 								clientDataChannelOpen = true;
 							}
-						}).start();
+						});
 					}
 				}
 
@@ -486,8 +540,7 @@ public class PlatformWebRTC {
 						synchronized (lock3) {
 							if (iceCandidate.sdp != null && !iceCandidate.sdp.isEmpty()) {
 								if (iceCandidates.isEmpty()) {
-									new Thread(() -> {
-										EagUtils.sleep(3000);
+									scheduleTask(3000l, () -> {
 										synchronized (lock3) {
 											if (peerConnection[0] != null && peerConnection[0].getConnectionState() != RTCPeerConnectionState.DISCONNECTED) {
 												LANPeerEvent.LANPeerICECandidateEvent e = new LANPeerEvent.LANPeerICECandidateEvent(peerId, JSONWriter.valueToString(iceCandidates));
@@ -497,7 +550,7 @@ public class PlatformWebRTC {
 												iceCandidates.clear();
 											}
 										}
-									}).start();
+									});
 								}
 								Map<String, String> m = new HashMap<>();
 								m.put("sdpMLineIndex", "" + iceCandidate.sdpMLineIndex);
@@ -509,7 +562,7 @@ public class PlatformWebRTC {
 
 					@Override
 					public void onDataChannel(RTCDataChannel dataChannel) {
-						new Thread(() -> {
+						scheduleTask(-1l, () -> {
 							while (true) {
 								synchronized (lock3) {
 									if (iceCandidates.isEmpty()) {
@@ -547,7 +600,7 @@ public class PlatformWebRTC {
 									}
 								}
 							});
-						}).start();
+						});
 					}
 
 					@Override
@@ -625,795 +678,27 @@ public class PlatformWebRTC {
 			return peerList.size();
 		}
 	}
-
-	private static final Map<String,Long> relayQueryLimited = new HashMap<>();
-	private static final Map<String,Long> relayQueryBlocked = new HashMap<>();
-
-	private static class RelayQueryImpl implements RelayQuery {
-
-		private final WebSocketClient sock;
-		private final String uri;
-
-		private boolean open;
-		private boolean failed;
-
-		private boolean hasRecievedAnyData = false;
-
-		private int vers = -1;
-		private String comment = "<no comment>";
-		private String brand = "<no brand>";
-
-		private long connectionOpenedAt;
-		private long connectionPingStart = -1;
-		private long connectionPingTimer = -1;
-
-		private RateLimit rateLimitStatus = RateLimit.NONE;
-
-		private VersionMismatch versError = VersionMismatch.UNKNOWN;
-
-		private RelayQueryImpl(String uri) {
-			this.uri = uri;
-			WebSocketClient s;
-			try {
-				connectionOpenedAt = System.currentTimeMillis();
-				s = new WebSocketClient(new URI(uri)) {
-					@Override
-					public void onOpen(ServerHandshake serverHandshake) {
-						try {
-							connectionPingStart = System.currentTimeMillis();
-							sock.send(IPacket.writePacket(new IPacket00Handshake(0x03, RelayManager.preferredRelayVersion, "")));
-						} catch (IOException e) {
-							logger.error(e.toString());
-							sock.close();
-							failed = true;
-						}
-					}
-
-					@Override
-					public void onMessage(String s) {
-						//
-					}
-
-					@Override
-					public void onMessage(ByteBuffer bb) {
-						if(bb != null) {
-							hasRecievedAnyData = true;
-							byte[] arr = new byte[bb.remaining()];
-							bb.get(arr);
-							if(arr.length == 2 && arr[0] == (byte)0xFC) {
-								long millis = System.currentTimeMillis();
-								if(arr[1] == (byte)0x00 || arr[1] == (byte)0x01) {
-									rateLimitStatus = RateLimit.BLOCKED;
-									relayQueryLimited.put(RelayQueryImpl.this.uri, millis);
-								}else if(arr[1] == (byte)0x02) {
-									rateLimitStatus = RateLimit.NOW_LOCKED;
-									relayQueryLimited.put(RelayQueryImpl.this.uri, millis);
-									relayQueryBlocked.put(RelayQueryImpl.this.uri, millis);
-								}else {
-									rateLimitStatus = RateLimit.LOCKED;
-									relayQueryBlocked.put(RelayQueryImpl.this.uri, millis);
-								}
-								failed = true;
-								open = false;
-								sock.close();
-							}else {
-								if(open) {
-									try {
-										IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)));
-										if(pkt instanceof IPacket69Pong) {
-											IPacket69Pong ipkt = (IPacket69Pong)pkt;
-											versError = VersionMismatch.COMPATIBLE;
-											if(connectionPingTimer == -1) {
-												connectionPingTimer = System.currentTimeMillis() - connectionPingStart;
-											}
-											vers = ipkt.protcolVersion;
-											comment = ipkt.comment;
-											brand = ipkt.brand;
-											open = false;
-											failed = false;
-											sock.close();
-										}else if(pkt instanceof IPacket70SpecialUpdate) {
-											IPacket70SpecialUpdate ipkt = (IPacket70SpecialUpdate)pkt;
-											if(ipkt.operation == IPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
-												UpdateService.addCertificateToSet(ipkt.updatePacket);
-											}
-										}else if(pkt instanceof IPacketFFErrorCode) {
-											IPacketFFErrorCode ipkt = (IPacketFFErrorCode)pkt;
-											if(ipkt.code == IPacketFFErrorCode.TYPE_PROTOCOL_VERSION) {
-												String s1 = ipkt.desc.toLowerCase();
-												if(s1.contains("outdated client") || s1.contains("client outdated")) {
-													versError = VersionMismatch.CLIENT_OUTDATED;
-												}else if(s1.contains("outdated server") || s1.contains("server outdated") ||
-														s1.contains("outdated relay") || s1.contains("server relay")) {
-													versError = VersionMismatch.RELAY_OUTDATED;
-												}else {
-													versError = VersionMismatch.UNKNOWN;
-												}
-											}
-											logger.error("{}\": Recieved query error code {}: {}", uri, ipkt.code, ipkt.desc);
-											open = false;
-											failed = true;
-											sock.close();
-										}else {
-											throw new IOException("Unexpected packet '" + pkt.getClass().getSimpleName() + "'");
-										}
-									} catch (IOException e) {
-										logger.error("Relay Query Error: {}", e.toString());
-										EagRuntime.debugPrintStackTrace(e);
-										open = false;
-										failed = true;
-										sock.close();
-									}
-								}
-							}
-						}
-					}
-
-					@Override
-					public void onClose(int i, String s, boolean b) {
-						open = false;
-						if(!hasRecievedAnyData) {
-							failed = true;
-							Long l = relayQueryBlocked.get(uri);
-							if(l != null) {
-								if(System.currentTimeMillis() - l.longValue() < 400000l) {
-									rateLimitStatus = RateLimit.LOCKED;
-									return;
-								}
-							}
-							l = relayQueryLimited.get(uri);
-							if(l != null) {
-								if(System.currentTimeMillis() - l.longValue() < 900000l) {
-									rateLimitStatus = RateLimit.BLOCKED;
-									return;
-								}
-							}
-						}
-					}
-
-					@Override
-					public void onError(Exception e) {
-						EagRuntime.debugPrintStackTrace(e);
-					}
-				};
-				s.connect();
-				open = true;
-				failed = false;
-			}catch(Throwable t) {
-				connectionOpenedAt = 0l;
-				sock = null;
-				open = false;
-				failed = true;
-				return;
-			}
-			sock = s;
-		}
-
-		@Override
-		public boolean isQueryOpen() {
-			return open;
-		}
-
-		@Override
-		public boolean isQueryFailed() {
-			return failed;
-		}
-
-		@Override
-		public RateLimit isQueryRateLimit() {
-			return rateLimitStatus;
-		}
-
-		@Override
-		public void close() {
-			if(sock != null && open) {
-				sock.close();
-			}
-			open = false;
-		}
-
-		@Override
-		public int getVersion() {
-			return vers;
-		}
-
-		@Override
-		public String getComment() {
-			return comment;
-		}
-
-		@Override
-		public String getBrand() {
-			return brand;
-		}
-
-		@Override
-		public long getPing() {
-			return connectionPingTimer < 1 ? 1 : connectionPingTimer;
-		}
-
-		@Override
-		public VersionMismatch getCompatible() {
-			return versError;
-		}
-
-	}
-
-	private static class RelayQueryRatelimitDummy implements RelayQuery {
-
-		private final RateLimit type;
-
-		private RelayQueryRatelimitDummy(RateLimit type) {
-			this.type = type;
-		}
-
-		@Override
-		public boolean isQueryOpen() {
-			return false;
-		}
-
-		@Override
-		public boolean isQueryFailed() {
-			return true;
-		}
-
-		@Override
-		public RateLimit isQueryRateLimit() {
-			return type;
-		}
-
-		@Override
-		public void close() {
-		}
-
-		@Override
-		public int getVersion() {
-			return RelayManager.preferredRelayVersion;
-		}
-
-		@Override
-		public String getComment() {
-			return "this query was rate limited";
-		}
-
-		@Override
-		public String getBrand() {
-			return "lax1dude";
-		}
-
-		@Override
-		public long getPing() {
-			return 0l;
-		}
-
-		@Override
-		public VersionMismatch getCompatible() {
-			return VersionMismatch.COMPATIBLE;
-		}
-
-	}
-
 	public static RelayQuery openRelayQuery(String addr) {
-		long millis = System.currentTimeMillis();
-
-		Long l = relayQueryBlocked.get(addr);
-		if(l != null && millis - l.longValue() < 60000l) {
-			return new RelayQueryRatelimitDummy(RelayQuery.RateLimit.LOCKED);
+		RelayQuery.RateLimit limit = RelayServerRateLimitTracker.isLimited(addr);
+		if(limit == RelayQuery.RateLimit.LOCKED || limit == RelayQuery.RateLimit.BLOCKED) {
+			return new RelayQueryRateLimitDummy(limit);
 		}
-
-		l = relayQueryLimited.get(addr);
-		if(l != null && millis - l.longValue() < 10000l) {
-			return new RelayQueryRatelimitDummy(RelayQuery.RateLimit.BLOCKED);
-		}
-
 		return new RelayQueryImpl(addr);
 	}
 
-	private static class RelayWorldsQueryImpl implements RelayWorldsQuery {
-
-		private final WebSocketClient sock;
-		private final String uri;
-
-		private boolean open;
-		private boolean failed;
-
-		private boolean hasRecievedAnyData = false;
-		private RelayQuery.RateLimit rateLimitStatus = RelayQuery.RateLimit.NONE;
-
-		private RelayQuery.VersionMismatch versError = RelayQuery.VersionMismatch.UNKNOWN;
-
-		private List<IPacket07LocalWorlds.LocalWorld> worlds = null;
-
-		private RelayWorldsQueryImpl(String uri) {
-			this.uri = uri;
-			WebSocketClient s;
-			try {
-				s = new WebSocketClient(new URI(uri)) {
-					@Override
-					public void onOpen(ServerHandshake serverHandshake) {
-						try {
-							sock.send(IPacket.writePacket(new IPacket00Handshake(0x04, RelayManager.preferredRelayVersion, "")));
-						} catch (IOException e) {
-							logger.error(e.toString());
-							sock.close();
-							open = false;
-							failed = true;
-						}
-					}
-
-					@Override
-					public void onMessage(String s) {
-						//
-					}
-
-					@Override
-					public void onMessage(ByteBuffer bb) {
-						if(bb != null) {
-							hasRecievedAnyData = true;
-							byte[] arr = new byte[bb.remaining()];
-							bb.get(arr);
-							if(arr.length == 2 && arr[0] == (byte)0xFC) {
-								long millis = System.currentTimeMillis();
-								if(arr[1] == (byte)0x00 || arr[1] == (byte)0x01) {
-									rateLimitStatus = RelayQuery.RateLimit.BLOCKED;
-									relayQueryLimited.put(RelayWorldsQueryImpl.this.uri, millis);
-								}else if(arr[1] == (byte)0x02) {
-									rateLimitStatus = RelayQuery.RateLimit.NOW_LOCKED;
-									relayQueryLimited.put(RelayWorldsQueryImpl.this.uri, millis);
-									relayQueryBlocked.put(RelayWorldsQueryImpl.this.uri, millis);
-								}else {
-									rateLimitStatus = RelayQuery.RateLimit.LOCKED;
-									relayQueryBlocked.put(RelayWorldsQueryImpl.this.uri, millis);
-								}
-								open = false;
-								failed = true;
-								sock.close();
-							}else {
-								if(open) {
-									try {
-										IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)));
-										if(pkt instanceof IPacket07LocalWorlds) {
-											worlds = ((IPacket07LocalWorlds)pkt).worldsList;
-											sock.close();
-											open = false;
-											failed = false;
-										}else if(pkt instanceof IPacket70SpecialUpdate) {
-											IPacket70SpecialUpdate ipkt = (IPacket70SpecialUpdate)pkt;
-											if(ipkt.operation == IPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
-												UpdateService.addCertificateToSet(ipkt.updatePacket);
-											}
-										}else if(pkt instanceof IPacketFFErrorCode) {
-											IPacketFFErrorCode ipkt = (IPacketFFErrorCode)pkt;
-											if(ipkt.code == IPacketFFErrorCode.TYPE_PROTOCOL_VERSION) {
-												String s1 = ipkt.desc.toLowerCase();
-												if(s1.contains("outdated client") || s1.contains("client outdated")) {
-													versError = RelayQuery.VersionMismatch.CLIENT_OUTDATED;
-												}else if(s1.contains("outdated server") || s1.contains("server outdated") ||
-														s1.contains("outdated relay") || s1.contains("server relay")) {
-													versError = RelayQuery.VersionMismatch.RELAY_OUTDATED;
-												}else {
-													versError = RelayQuery.VersionMismatch.UNKNOWN;
-												}
-											}
-											logger.error("{}: Recieved query error code {}: {}", uri, ipkt.code, ipkt.desc);
-											open = false;
-											failed = true;
-											sock.close();
-										}else {
-											throw new IOException("Unexpected packet '" + pkt.getClass().getSimpleName() + "'");
-										}
-									} catch (IOException e) {
-										logger.error("Relay World Query Error: {}", e.toString());
-										EagRuntime.debugPrintStackTrace(e);
-										open = false;
-										failed = true;
-										sock.close();
-									}
-								}
-							}
-						}
-					}
-
-					@Override
-					public void onClose(int i, String s, boolean b) {
-						open = false;
-						if(!hasRecievedAnyData) {
-							failed = true;
-							Long l = relayQueryBlocked.get(uri);
-							if(l != null) {
-								if(System.currentTimeMillis() - l.longValue() < 400000l) {
-									rateLimitStatus = RelayQuery.RateLimit.LOCKED;
-									return;
-								}
-							}
-							l = relayQueryLimited.get(uri);
-							if(l != null) {
-								if(System.currentTimeMillis() - l.longValue() < 900000l) {
-									rateLimitStatus = RelayQuery.RateLimit.BLOCKED;
-									return;
-								}
-							}
-						}
-					}
-
-					@Override
-					public void onError(Exception e) {
-						EagRuntime.debugPrintStackTrace(e);
-					}
-				};
-				s.connect();
-				open = true;
-				failed = false;
-			}catch(Throwable t) {
-				sock = null;
-				open = false;
-				failed = true;
-				return;
-			}
-			sock = s;
-		}
-
-		@Override
-		public boolean isQueryOpen() {
-			return open;
-		}
-
-		@Override
-		public boolean isQueryFailed() {
-			return failed;
-		}
-
-		@Override
-		public RelayQuery.RateLimit isQueryRateLimit() {
-			return rateLimitStatus;
-		}
-
-		@Override
-		public void close() {
-			if(open && sock != null) {
-				sock.close();
-			}
-			open = false;
-		}
-
-		@Override
-		public List<IPacket07LocalWorlds.LocalWorld> getWorlds() {
-			return worlds;
-		}
-
-		@Override
-		public RelayQuery.VersionMismatch getCompatible() {
-			return versError;
-		}
-
-	}
-
-	private static class RelayWorldsQueryRatelimitDummy implements RelayWorldsQuery {
-
-		private final RelayQuery.RateLimit rateLimit;
-
-		private RelayWorldsQueryRatelimitDummy(RelayQuery.RateLimit rateLimit) {
-			this.rateLimit = rateLimit;
-		}
-
-		@Override
-		public boolean isQueryOpen() {
-			return false;
-		}
-
-		@Override
-		public boolean isQueryFailed() {
-			return true;
-		}
-
-		@Override
-		public RelayQuery.RateLimit isQueryRateLimit() {
-			return rateLimit;
-		}
-
-		@Override
-		public void close() {
-		}
-
-		@Override
-		public List<IPacket07LocalWorlds.LocalWorld> getWorlds() {
-			return new ArrayList(0);
-		}
-
-		@Override
-		public RelayQuery.VersionMismatch getCompatible() {
-			return RelayQuery.VersionMismatch.COMPATIBLE;
-		}
-	}
-
 	public static RelayWorldsQuery openRelayWorldsQuery(String addr) {
-		long millis = System.currentTimeMillis();
-
-		Long l = relayQueryBlocked.get(addr);
-		if(l != null && millis - l.longValue() < 60000l) {
-			return new RelayWorldsQueryRatelimitDummy(RelayQuery.RateLimit.LOCKED);
+		RelayQuery.RateLimit limit = RelayServerRateLimitTracker.isLimited(addr);
+		if(limit == RelayQuery.RateLimit.LOCKED || limit == RelayQuery.RateLimit.BLOCKED) {
+			return new RelayWorldsQueryRateLimitDummy(limit);
 		}
-
-		l = relayQueryLimited.get(addr);
-		if(l != null && millis - l.longValue() < 10000l) {
-			return new RelayWorldsQueryRatelimitDummy(RelayQuery.RateLimit.BLOCKED);
-		}
-
 		return new RelayWorldsQueryImpl(addr);
 	}
 
-	private static class RelayServerSocketImpl implements RelayServerSocket {
-
-		private final WebSocketClient sock;
-		private final String uri;
-
-		private boolean open;
-		private boolean closed;
-		private boolean failed;
-
-		private boolean hasRecievedAnyData;
-
-		private final List<Throwable> exceptions = new LinkedList();
-		private final List<IPacket> packets = new LinkedList();
-
-		private RelayServerSocketImpl(String uri, int timeout) {
-			this.uri = uri;
-			WebSocketClient s;
-			try {
-				s = new WebSocketClient(new URI(uri)) {
-					@Override
-					public void onOpen(ServerHandshake serverHandshake) {
-						synchronized (lock4) {
-							open = true;
-						}
-					}
-
-					@Override
-					public void onMessage(String s) {
-						//
-					}
-
-					@Override
-					public void onMessage(ByteBuffer bb) {
-						if(bb != null) {
-							hasRecievedAnyData = true;
-							try {
-								byte[] arr = new byte[bb.remaining()];
-								bb.get(arr);
-								IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)));
-								if(pkt instanceof IPacket70SpecialUpdate) {
-									IPacket70SpecialUpdate ipkt = (IPacket70SpecialUpdate)pkt;
-									if(ipkt.operation == IPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
-										UpdateService.addCertificateToSet(ipkt.updatePacket);
-									}
-								}else {
-									packets.add(pkt);
-								}
-							} catch (IOException e) {
-								exceptions.add(e);
-								logger.error("Relay Socket Error: {}", e.toString());
-								EagRuntime.debugPrintStackTrace(e);
-								synchronized (lock4) {
-									open = false;
-									failed = true;
-								}
-								closed = true;
-								synchronized (lock4) {
-									sock.close();
-								}
-							}
-						}
-					}
-
-					@Override
-					public void onClose(int i, String s, boolean b) {
-						if (!hasRecievedAnyData) {
-							failed = true;
-						}
-						synchronized (lock4) {
-							open = false;
-							closed = true;
-						}
-					}
-
-					@Override
-					public void onError(Exception e) {
-						EagRuntime.debugPrintStackTrace(e);
-					}
-				};
-				s.connect();
-				synchronized (lock4) {
-					open = false;
-					closed = false;
-				}
-				failed = false;
-			}catch(Throwable t) {
-				exceptions.add(t);
-				synchronized (lock4) {
-					sock = null;
-					open = false;
-					closed = true;
-				}
-				failed = true;
-				return;
-			}
-			synchronized (lock4) {
-				sock = s;
-			}
-			new Thread(() -> {
-				EagUtils.sleep(timeout);
-				synchronized (lock4) {
-					if (!open && !closed) {
-						closed = true;
-						sock.close();
-					}
-				}
-			}).start();
-		}
-
-		@Override
-		public boolean isOpen() {
-			return open;
-		}
-
-		@Override
-		public boolean isClosed() {
-			synchronized (lock4) {
-				return closed;
-			}
-		}
-
-		@Override
-		public void close() {
-			if(open && sock != null) {
-				synchronized (lock4) {
-					sock.close();
-				}
-			}
-			synchronized (lock4) {
-				open = false;
-				closed = true;
-			}
-		}
-
-		@Override
-		public boolean isFailed() {
-			return failed;
-		}
-
-		@Override
-		public Throwable getException() {
-			if(!exceptions.isEmpty()) {
-				return exceptions.remove(0);
-			}else {
-				return null;
-			}
-		}
-
-		@Override
-		public void writePacket(IPacket pkt) {
-			try {
-				sock.send(IPacket.writePacket(pkt));
-			} catch (Throwable e) {
-				logger.error("Relay connection error: {}", e.toString());
-				EagRuntime.debugPrintStackTrace(e);
-				exceptions.add(e);
-				failed = true;
-				synchronized (lock4) {
-					open = false;
-					closed = true;
-					sock.close();
-				}
-			}
-		}
-
-		@Override
-		public IPacket readPacket() {
-			if(!packets.isEmpty()) {
-				return packets.remove(0);
-			}else {
-				return null;
-			}
-		}
-
-		@Override
-		public IPacket nextPacket() {
-			if(!packets.isEmpty()) {
-				return packets.get(0);
-			}else {
-				return null;
-			}
-		}
-
-		@Override
-		public RelayQuery.RateLimit getRatelimitHistory() {
-			if(relayQueryBlocked.containsKey(uri)) {
-				return RelayQuery.RateLimit.LOCKED;
-			}
-			if(relayQueryLimited.containsKey(uri)) {
-				return RelayQuery.RateLimit.BLOCKED;
-			}
-			return RelayQuery.RateLimit.NONE;
-		}
-
-		@Override
-		public String getURI() {
-			return uri;
-		}
-
-	}
-
-	private static class RelayServerSocketRatelimitDummy implements RelayServerSocket {
-
-		private final RelayQuery.RateLimit limit;
-
-		private RelayServerSocketRatelimitDummy(RelayQuery.RateLimit limit) {
-			this.limit = limit;
-		}
-
-		@Override
-		public boolean isOpen() {
-			return false;
-		}
-
-		@Override
-		public boolean isClosed() {
-			return true;
-		}
-
-		@Override
-		public void close() {
-		}
-
-		@Override
-		public boolean isFailed() {
-			return true;
-		}
-
-		@Override
-		public Throwable getException() {
-			return null;
-		}
-
-		@Override
-		public void writePacket(IPacket pkt) {
-		}
-
-		@Override
-		public IPacket readPacket() {
-			return null;
-		}
-
-		@Override
-		public IPacket nextPacket() {
-			return null;
-		}
-
-		@Override
-		public RelayQuery.RateLimit getRatelimitHistory() {
-			return limit;
-		}
-
-		@Override
-		public String getURI() {
-			return "<disconnected>";
-		}
-
-	}
-
 	public static RelayServerSocket openRelayConnection(String addr, int timeout) {
-		long millis = System.currentTimeMillis();
-
-		Long l = relayQueryBlocked.get(addr);
-		if(l != null && millis - l.longValue() < 60000l) {
-			return new RelayServerSocketRatelimitDummy(RelayQuery.RateLimit.LOCKED);
+		RelayQuery.RateLimit limit = RelayServerRateLimitTracker.isLimited(addr);
+		if(limit == RelayQuery.RateLimit.LOCKED || limit == RelayQuery.RateLimit.BLOCKED) {
+			return new RelayServerSocketRateLimitDummy(limit);
 		}
-
-		l = relayQueryLimited.get(addr);
-		if(l != null && millis - l.longValue() < 10000l) {
-			return new RelayServerSocketRatelimitDummy(RelayQuery.RateLimit.BLOCKED);
-		}
-
 		return new RelayServerSocketImpl(addr, timeout);
 	}
 
@@ -1453,7 +738,7 @@ public class PlatformWebRTC {
 	public static List<byte[]> clientLANReadAllPacket() {
 		synchronized(clientLANPacketBuffer) {
 			if(!clientLANPacketBuffer.isEmpty()) {
-				List<byte[]> ret = new ArrayList(clientLANPacketBuffer);
+				List<byte[]> ret = new ArrayList<>(clientLANPacketBuffer);
 				clientLANPacketBuffer.clear();
 				return ret;
 			}else {
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebView.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebView.java
new file mode 100755
index 0000000..d08cea8
--- /dev/null
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebView.java
@@ -0,0 +1,93 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.FallbackWebViewServer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketWebViewMessageV4EAG;
+import net.lax1dude.eaglercraft.v1_8.webview.WebViewOverlayController.IPacketSendCallback;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PlatformWebView {
+
+	private static FallbackWebViewServer fallbackServer = null;
+	private static IPacketSendCallback packetCallback = null;
+
+	public static boolean supported() {
+		return false;
+	}
+
+	public static boolean isShowing() {
+		return false;
+	}
+
+	public static void beginShowing(WebViewOptions options, int x, int y, int w, int h) {
+		
+	}
+
+	public static void resize(int x, int y, int w, int h) {
+		
+	}
+
+	public static void endShowing() {
+		
+	}
+
+	public static boolean fallbackSupported() {
+		return true;
+	}
+
+	public static void launchFallback(WebViewOptions options) {
+		fallbackServer = new FallbackWebViewServer(options);
+		fallbackServer.setPacketSendCallback(packetCallback);
+		fallbackServer.start();
+	}
+
+	public static boolean fallbackRunning() {
+		return fallbackServer != null && !fallbackServer.isDead();
+	}
+
+	public static String getFallbackURL() {
+		return fallbackServer != null ? fallbackServer.getURL() : null;
+	}
+
+	public static void endFallbackServer() {
+		if(fallbackServer != null && !fallbackServer.isDead()) {
+			fallbackServer.killServer();
+		}
+	}
+
+	public static void handleMessageFromServer(SPacketWebViewMessageV4EAG packet) {
+		if(fallbackServer != null && !fallbackServer.isDead()) {
+			fallbackServer.handleMessageFromServer(packet);
+		}
+	}
+
+	public static void setPacketSendCallback(IPacketSendCallback callback) {
+		packetCallback = callback;
+		if(fallbackServer != null) {
+			fallbackServer.setPacketSendCallback(callback);
+		}
+	}
+
+	public static void runTick() {
+		if(fallbackServer != null) {
+			fallbackServer.runTick();
+			if(fallbackServer.isDead()) {
+				fallbackServer = null;
+			}
+		}
+	}
+
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/WebSocketServerQuery.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/WebSocketServerQuery.java
deleted file mode 100755
index 445948f..0000000
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/WebSocketServerQuery.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.internal;
-
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.drafts.Draft;
-import org.java_websocket.drafts.Draft_6455;
-import org.java_websocket.extensions.permessage_deflate.PerMessageDeflateExtension;
-import org.java_websocket.handshake.ServerHandshake;
-import org.json.JSONObject;
-
-import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
-import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-
-/**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-class WebSocketServerQuery extends WebSocketClient implements IServerQuery {
-
-	private static final Draft perMessageDeflateDraft = new Draft_6455(new PerMessageDeflateExtension());
-
-	public static final Logger logger = LogManager.getLogger("WebSocketQuery");
-
-	private final List<QueryResponse> queryResponses = new LinkedList();
-	private final List<byte[]> queryResponsesBytes = new LinkedList();
-	private final String type;
-	private boolean open = true;
-	private boolean alive = false;
-	private long pingStart = -1l;
-	private long pingTimer = -1l;
-	private EnumServerRateLimit rateLimit = EnumServerRateLimit.OK;
-
-	WebSocketServerQuery(String type, URI serverUri) {
-		super(serverUri, perMessageDeflateDraft);
-		this.type = type;
-		this.setConnectionLostTimeout(5);
-		this.setTcpNoDelay(true);
-		this.connect();
-	}
-
-	@Override
-	public int responsesAvailable() {
-		synchronized(queryResponses) {
-			return queryResponses.size();
-		}
-	}
-
-	@Override
-	public QueryResponse getResponse() {
-		synchronized(queryResponses) {
-			if(queryResponses.size() > 0) {
-				return queryResponses.remove(0);
-			}else {
-				return null;
-			}
-		}
-	}
-
-	@Override
-	public int binaryResponsesAvailable() {
-		synchronized(queryResponsesBytes) {
-			return queryResponsesBytes.size();
-		}
-	}
-
-	@Override
-	public byte[] getBinaryResponse() {
-		synchronized(queryResponsesBytes) {
-			if(queryResponsesBytes.size() > 0) {
-				return queryResponsesBytes.remove(0);
-			}else {
-				return null;
-			}
-		}
-	}
-
-	@Override
-	public QueryReadyState readyState() {
-		return open ? (alive ? QueryReadyState.OPEN : QueryReadyState.CONNECTING)
-				: (alive ? QueryReadyState.CLOSED : QueryReadyState.FAILED);
-	}
-
-	@Override
-	public EnumServerRateLimit getRateLimit() {
-		return rateLimit;
-	}
-
-	@Override
-	public void onClose(int arg0, String arg1, boolean arg2) {
-		open = false;
-	}
-
-	@Override
-	public void onError(Exception arg0) {
-		logger.error("Exception thrown by websocket query \"" + this.getURI().toString() + "\"!");
-		logger.error(arg0);
-	}
-
-	@Override
-	public void onMessage(String arg0) {
-		alive = true;
-		if(pingTimer == -1) {
-			pingTimer = System.currentTimeMillis() - pingStart;
-			if(pingTimer < 1) {
-				pingTimer = 1;
-			}
-		}
-		if(arg0.equalsIgnoreCase("BLOCKED")) {
-			logger.error("Reached full IP ratelimit for {}!", this.uri.toString());
-			rateLimit = EnumServerRateLimit.BLOCKED;
-			return;
-		}
-		if(arg0.equalsIgnoreCase("LOCKED")) {
-			logger.error("Reached full IP ratelimit lockout for {}!", this.uri.toString());
-			rateLimit = EnumServerRateLimit.LOCKED_OUT;
-			return;
-		}
-		try {
-			JSONObject obj = new JSONObject(arg0);
-			if("blocked".equalsIgnoreCase(obj.optString("type", null))) {
-				logger.error("Reached query ratelimit for {}!", this.uri.toString());
-				rateLimit = EnumServerRateLimit.BLOCKED;
-			}else if("locked".equalsIgnoreCase(obj.optString("type", null))) {
-				logger.error("Reached query ratelimit lockout for {}!", this.uri.toString());
-				rateLimit = EnumServerRateLimit.LOCKED_OUT;
-			}else {
-				QueryResponse response = new QueryResponse(obj, pingTimer);
-				synchronized(queryResponses) {
-					queryResponses.add(response);
-				}
-			}
-		}catch(Throwable t) {
-			logger.error("Exception thrown parsing websocket query response from \"" + this.getURI().toString() + "\"!");
-			logger.error(t);
-		}
-	}
-
-	@Override
-	public void onMessage(ByteBuffer arg0) {
-		alive = true;
-		if(pingTimer == -1) {
-			pingTimer = System.currentTimeMillis() - pingStart;
-			if(pingTimer < 1) {
-				pingTimer = 1;
-			}
-		}
-		synchronized(queryResponsesBytes) {
-			queryResponsesBytes.add(arg0.array());
-		}
-	}
-
-	@Override
-	public void onOpen(ServerHandshake arg0) {
-		pingStart = System.currentTimeMillis();
-		send("Accept: " + type);
-	}
-
-}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLByteBuffer.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLByteBuffer.java
index d6d47e9..abe450c 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLByteBuffer.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLByteBuffer.java
@@ -1,7 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.internal.buffer;
 
-import org.lwjgl.system.jemalloc.JEmalloc;
-
 import net.lax1dude.unsafememcpy.UnsafeMemcpy;
 import net.lax1dude.unsafememcpy.UnsafeUtils;
 
@@ -29,7 +27,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 	private int position;
 	private int limit;
 	private int mark;
-	
+
 	EaglerLWJGLByteBuffer(long address, int capacity, boolean original) {
 		this(address, capacity, 0, capacity, -1, original);
 	}
@@ -68,18 +66,13 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 		return position < limit;
 	}
 
-	@Override
-	public boolean isReadOnly() {
-		return false;
-	}
-
 	@Override
 	public boolean hasArray() {
 		return false;
 	}
 
 	@Override
-	public Object array() {
+	public byte[] array() {
 		throw new UnsupportedOperationException();
 	}
 
@@ -88,50 +81,40 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 		return true;
 	}
 
-	@Override
-	public ByteBuffer slice() {
-		return new EaglerLWJGLByteBuffer(address + position, limit - position, false);
-	}
-
 	@Override
 	public ByteBuffer duplicate() {
 		return new EaglerLWJGLByteBuffer(address, capacity, position, limit, mark, false);
 	}
 
-	@Override
-	public ByteBuffer asReadOnlyBuffer() {
-		return new EaglerLWJGLByteBuffer(address, capacity, position, limit, mark, false);
-	}
-
 	@Override
 	public byte get() {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		return UnsafeUtils.getMemByte(address + position++);
 	}
 
 	@Override
 	public ByteBuffer put(byte b) {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		UnsafeUtils.setMemByte(address + position++, b);
 		return this;
 	}
 
 	@Override
 	public byte get(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemByte(address + index);
 	}
 
 	@Override
 	public ByteBuffer put(int index, byte b) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemByte(address + index, b);
 		return this;
 	}
 
 	@Override
 	public ByteBuffer get(byte[] dst, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		UnsafeMemcpy.memcpy(dst, offset, address + position, length);
 		position += length;
 		return this;
@@ -139,7 +122,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer get(byte[] dst) {
-		if(position + dst.length > limit) throw new ArrayIndexOutOfBoundsException(position + dst.length - 1);
+		if(position + dst.length > limit) throw Buffer.makeIOOBE(position + dst.length - 1);
 		UnsafeMemcpy.memcpy(dst, 0, address + position, dst.length);
 		position += dst.length;
 		return this;
@@ -150,13 +133,13 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 		if(src instanceof EaglerLWJGLByteBuffer) {
 			EaglerLWJGLByteBuffer c = (EaglerLWJGLByteBuffer)src;
 			int l = c.limit - c.position;
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			UnsafeMemcpy.memcpy(address + position, c.address + c.position, l);
 			position += l;
 			c.position += l;
 		}else {
 			int l = src.remaining();
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			for(int i = 0; i < l; ++i) {
 				UnsafeUtils.setMemByte(address + position + l, src.get());
 			}
@@ -167,7 +150,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer put(byte[] src, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		UnsafeMemcpy.memcpy(address + position, src, offset, length);
 		position += length;
 		return this;
@@ -175,39 +158,15 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer put(byte[] src) {
-		if(position + src.length > limit) throw new ArrayIndexOutOfBoundsException(position + src.length - 1);
+		if(position + src.length > limit) throw Buffer.makeIOOBE(position + src.length - 1);
 		UnsafeMemcpy.memcpy(address + position, src, 0, src.length);
 		position += src.length;
 		return this;
 	}
 
-	@Override
-	public int arrayOffset() {
-		return position;
-	}
-
-	@Override
-	public ByteBuffer compact() {
-		if(limit > capacity) throw new ArrayIndexOutOfBoundsException(limit);
-		if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-		
-		if(position == limit) {
-			return new EaglerLWJGLByteBuffer(0l, 0, false);
-		}
-		
-		int newLen = limit - position;
-		long newAlloc = JEmalloc.nje_malloc(newLen);
-		if(newAlloc == 0l) {
-			throw new OutOfMemoryError("Native je_malloc call returned null pointer!");
-		}
-		UnsafeMemcpy.memcpy(newAlloc, address + position, newLen);
-		
-		return new EaglerLWJGLByteBuffer(newAlloc, newLen, true);
-	}
-
 	@Override
 	public char getChar() {
-		if(position + 2 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 2 > limit) throw Buffer.makeIOOBE(position);
 		char c = UnsafeUtils.getMemChar(address + position);
 		position += 2;
 		return c;
@@ -215,7 +174,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putChar(char value) {
-		if(position + 2 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 2 > limit) throw Buffer.makeIOOBE(position);
 		UnsafeUtils.setMemChar(address + position, value);
 		position += 2;
 		return this;
@@ -223,20 +182,20 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public char getChar(int index) {
-		if(index + 2 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 2 > limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemChar(address + index);
 	}
 
 	@Override
 	public ByteBuffer putChar(int index, char value) {
-		if(index + 2 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 2 > limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemChar(address + index, value);
 		return this;
 	}
 
 	@Override
 	public short getShort() {
-		if(position + 2 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 2 > limit) throw Buffer.makeIOOBE(position);
 		short s = UnsafeUtils.getMemShort(address + position);
 		position += 2;
 		return s;
@@ -244,7 +203,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putShort(short value) {
-		if(position + 2 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 2 > limit) throw Buffer.makeIOOBE(position);
 		UnsafeUtils.setMemShort(address + position, value);
 		position += 2;
 		return this;
@@ -252,13 +211,13 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public short getShort(int index) {
-		if(index + 2 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 2 > limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemShort(address + index);
 	}
 
 	@Override
 	public ByteBuffer putShort(int index, short value) {
-		if(index + 2 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 2 > limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemShort(address + index, value);
 		return this;
 	}
@@ -270,7 +229,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public int getInt() {
-		if(position + 4 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 4 > limit) throw Buffer.makeIOOBE(position);
 		int i = UnsafeUtils.getMemInt(address + position);
 		position += 4;
 		return i;
@@ -278,7 +237,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putInt(int value) {
-		if(position + 4 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 4 > limit) throw Buffer.makeIOOBE(position);
 		UnsafeUtils.setMemInt(address + position, value);
 		position += 4;
 		return this;
@@ -286,13 +245,13 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public int getInt(int index) {
-		if(index + 4 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 4 > limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemInt(address + index);
 	}
 
 	@Override
 	public ByteBuffer putInt(int index, int value) {
-		if(index + 4 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 4 > limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemInt(address + index, value);
 		return this;
 	}
@@ -304,7 +263,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public long getLong() {
-		if(position + 8 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 8 > limit) throw Buffer.makeIOOBE(position);
 		long l = UnsafeUtils.getMemLong(address + position);
 		position += 8;
 		return l;
@@ -312,7 +271,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putLong(long value) {
-		if(position + 8 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 8 > limit) throw Buffer.makeIOOBE(position);
 		UnsafeUtils.setMemLong(address + position, value);
 		position += 8;
 		return this;
@@ -320,20 +279,20 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public long getLong(int index) {
-		if(index + 8 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 8 > limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemLong(address + index);
 	}
 
 	@Override
 	public ByteBuffer putLong(int index, long value) {
-		if(index + 8 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 8 > limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemLong(address + index, value);
 		return this;
 	}
 
 	@Override
 	public float getFloat() {
-		if(position + 4 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 4 > limit) throw Buffer.makeIOOBE(position);
 		float f = UnsafeUtils.getMemFloat(address + position);
 		position += 4;
 		return f;
@@ -341,7 +300,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putFloat(float value) {
-		if(position + 4 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 4 > limit) throw Buffer.makeIOOBE(position);
 		UnsafeUtils.setMemFloat(address + position, value);
 		position += 4;
 		return this;
@@ -349,13 +308,13 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public float getFloat(int index) {
-		if(index + 4 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 4 > limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemFloat(address + index);
 	}
 
 	@Override
 	public ByteBuffer putFloat(int index, float value) {
-		if(index + 4 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 4 > limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemFloat(address + index, value);
 		return this;
 	}
@@ -374,7 +333,7 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 	@Override
 	public ByteBuffer reset() {
 		int m = mark;
-		if(m < 0) throw new ArrayIndexOutOfBoundsException("Invalid mark: " + m);
+		if(m < 0) throw new IndexOutOfBoundsException("Invalid mark: " + m);
 		position = m;
 		return this;
 	}
@@ -404,14 +363,14 @@ public class EaglerLWJGLByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer limit(int newLimit) {
-		if(newLimit < 0 || newLimit > capacity) throw new ArrayIndexOutOfBoundsException(newLimit);
+		if(newLimit < 0 || newLimit > capacity) throw Buffer.makeIOOBE(newLimit);
 		limit = newLimit;
 		return this;
 	}
 
 	@Override
 	public ByteBuffer position(int newPosition) {
-		if(newPosition < 0 || newPosition > limit) throw new ArrayIndexOutOfBoundsException(newPosition);
+		if(newPosition < 0 || newPosition > limit) throw Buffer.makeIOOBE(newPosition);
 		position = newPosition;
 		return this;
 	}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLFloatBuffer.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLFloatBuffer.java
index 3b1be55..5e61206 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLFloatBuffer.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLFloatBuffer.java
@@ -1,7 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.internal.buffer;
 
-import org.lwjgl.system.jemalloc.JEmalloc;
-
 import net.lax1dude.unsafememcpy.UnsafeMemcpy;
 import net.lax1dude.unsafememcpy.UnsafeUtils;
 
@@ -29,9 +27,9 @@ public class EaglerLWJGLFloatBuffer implements FloatBuffer {
 	private int position;
 	private int limit;
 	private int mark;
-	
+
 	private static final int SHIFT = 2;
-	
+
 	EaglerLWJGLFloatBuffer(long address, int capacity, boolean original) {
 		this(address, capacity, 0, capacity, -1, original);
 	}
@@ -70,82 +68,62 @@ public class EaglerLWJGLFloatBuffer implements FloatBuffer {
 		return position < limit;
 	}
 
-	@Override
-	public boolean isReadOnly() {
-		return false;
-	}
-
 	@Override
 	public boolean hasArray() {
 		return false;
 	}
 
 	@Override
-	public Object array() {
+	public float[] array() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
-	public int arrayOffset() {
-		return position;
-	}
-
-	@Override
-	public FloatBuffer slice() {
-		return new EaglerLWJGLFloatBuffer(address + (position << SHIFT), limit - position, false);
-	}
-
 	@Override
 	public FloatBuffer duplicate() {
 		return new EaglerLWJGLFloatBuffer(address, capacity, position, limit, mark, false);
 	}
 
-	@Override
-	public FloatBuffer asReadOnlyBuffer() {
-		return new EaglerLWJGLFloatBuffer(address, capacity, position, limit, mark, false);
-	}
-
 	@Override
 	public float get() {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		return UnsafeUtils.getMemFloat(address + ((position++) << SHIFT));
 	}
 
 	@Override
 	public FloatBuffer put(float b) {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		UnsafeUtils.setMemFloat(address + ((position++) << SHIFT), b);
 		return this;
 	}
 
 	@Override
 	public float get(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemFloat(address + (index << SHIFT));
 	}
 
 	@Override
 	public FloatBuffer put(int index, float b) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemFloat(address + (index << SHIFT), b);
 		return this;
 	}
 
 	@Override
 	public float getElement(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemFloat(address + (index << SHIFT));
 	}
 
 	@Override
 	public void putElement(int index, float value) {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
-		UnsafeUtils.setMemFloat(address + ((position++) << SHIFT), value);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
+		UnsafeUtils.setMemFloat(address + (index << SHIFT), value);
 	}
 
 	@Override
 	public FloatBuffer get(float[] dst, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		UnsafeMemcpy.memcpyAlignDst(dst, offset << SHIFT, address + (position << SHIFT), length);
 		position += length;
 		return this;
@@ -153,7 +131,7 @@ public class EaglerLWJGLFloatBuffer implements FloatBuffer {
 
 	@Override
 	public FloatBuffer get(float[] dst) {
-		if(position + dst.length > limit) throw new ArrayIndexOutOfBoundsException(position + dst.length - 1);
+		if(position + dst.length > limit) throw Buffer.makeIOOBE(position + dst.length - 1);
 		UnsafeMemcpy.memcpyAlignDst(dst, 0, address + (position << SHIFT), dst.length);
 		position += dst.length;
 		return this;
@@ -164,13 +142,13 @@ public class EaglerLWJGLFloatBuffer implements FloatBuffer {
 		if(src instanceof EaglerLWJGLFloatBuffer) {
 			EaglerLWJGLFloatBuffer c = (EaglerLWJGLFloatBuffer)src;
 			int l = c.limit - c.position;
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			UnsafeMemcpy.memcpy(address + (position << SHIFT), c.address + (c.position << SHIFT), l << SHIFT);
 			position += l;
 			c.position += l;
 		}else {
 			int l = src.remaining();
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			for(int i = 0; i < l; ++i) {
 				UnsafeUtils.setMemFloat(address + ((position + l) << SHIFT), src.get());
 			}
@@ -181,7 +159,7 @@ public class EaglerLWJGLFloatBuffer implements FloatBuffer {
 
 	@Override
 	public FloatBuffer put(float[] src, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		UnsafeMemcpy.memcpyAlignSrc(address + (position << SHIFT), src, offset << SHIFT, length);
 		position += length;
 		return this;
@@ -189,36 +167,12 @@ public class EaglerLWJGLFloatBuffer implements FloatBuffer {
 
 	@Override
 	public FloatBuffer put(float[] src) {
-		if(position + src.length > limit) throw new ArrayIndexOutOfBoundsException(position + src.length - 1);
+		if(position + src.length > limit) throw Buffer.makeIOOBE(position + src.length - 1);
 		UnsafeMemcpy.memcpyAlignSrc(address + (position << SHIFT), src, 0, src.length);
 		position += src.length;
 		return this;
 	}
 
-	@Override
-	public int getArrayOffset() {
-		return position;
-	}
-
-	@Override
-	public FloatBuffer compact() {
-		if(limit > capacity) throw new ArrayIndexOutOfBoundsException(limit);
-		if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-		
-		if(position == limit) {
-			return new EaglerLWJGLFloatBuffer(0l, 0, false);
-		}
-		
-		int newLen = limit - position;
-		long newAlloc = JEmalloc.nje_malloc(newLen);
-		if(newAlloc == 0l) {
-			throw new OutOfMemoryError("Native je_malloc call returned null pointer!");
-		}
-		UnsafeMemcpy.memcpy(newAlloc, address + (position << SHIFT), newLen << SHIFT);
-		
-		return new EaglerLWJGLFloatBuffer(newAlloc, newLen, true);
-	}
-
 	@Override
 	public boolean isDirect() {
 		return true;
@@ -233,7 +187,7 @@ public class EaglerLWJGLFloatBuffer implements FloatBuffer {
 	@Override
 	public FloatBuffer reset() {
 		int m = mark;
-		if(m < 0) throw new ArrayIndexOutOfBoundsException("Invalid mark: " + m);
+		if(m < 0) throw new IndexOutOfBoundsException("Invalid mark: " + m);
 		position = m;
 		return this;
 	}
@@ -263,14 +217,14 @@ public class EaglerLWJGLFloatBuffer implements FloatBuffer {
 
 	@Override
 	public FloatBuffer limit(int newLimit) {
-		if(newLimit < 0 || newLimit > capacity) throw new ArrayIndexOutOfBoundsException(newLimit);
+		if(newLimit < 0 || newLimit > capacity) throw Buffer.makeIOOBE(newLimit);
 		limit = newLimit;
 		return this;
 	}
 
 	@Override
 	public FloatBuffer position(int newPosition) {
-		if(newPosition < 0 || newPosition > limit) throw new ArrayIndexOutOfBoundsException(newPosition);
+		if(newPosition < 0 || newPosition > limit) throw Buffer.makeIOOBE(newPosition);
 		position = newPosition;
 		return this;
 	}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLIntBuffer.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLIntBuffer.java
index d9391a3..23c3045 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLIntBuffer.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLIntBuffer.java
@@ -1,7 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.internal.buffer;
 
-import org.lwjgl.system.jemalloc.JEmalloc;
-
 import net.lax1dude.unsafememcpy.UnsafeMemcpy;
 import net.lax1dude.unsafememcpy.UnsafeUtils;
 
@@ -21,7 +19,7 @@ import net.lax1dude.unsafememcpy.UnsafeUtils;
  * 
  */
 public class EaglerLWJGLIntBuffer implements IntBuffer {
-	
+
 	final long address;
 	final boolean original;
 
@@ -29,9 +27,9 @@ public class EaglerLWJGLIntBuffer implements IntBuffer {
 	private int position;
 	private int limit;
 	private int mark;
-	
+
 	private static final int SHIFT = 2;
-	
+
 	EaglerLWJGLIntBuffer(long address, int capacity, boolean original) {
 		this(address, capacity, 0, capacity, -1, original);
 	}
@@ -44,7 +42,7 @@ public class EaglerLWJGLIntBuffer implements IntBuffer {
 		this.mark = mark;
 		this.original = original;
 	}
-	
+
 	@Override
 	public int capacity() {
 		return capacity;
@@ -70,82 +68,62 @@ public class EaglerLWJGLIntBuffer implements IntBuffer {
 		return position < limit;
 	}
 
-	@Override
-	public boolean isReadOnly() {
-		return false;
-	}
-
 	@Override
 	public boolean hasArray() {
 		return false;
 	}
 
 	@Override
-	public Object array() {
+	public int[] array() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
-	public int arrayOffset() {
-		return position;
-	}
-
-	@Override
-	public IntBuffer slice() {
-		return new EaglerLWJGLIntBuffer(address + (position << SHIFT), limit - position, false);
-	}
-
 	@Override
 	public IntBuffer duplicate() {
 		return new EaglerLWJGLIntBuffer(address, capacity, position, limit, mark, false);
 	}
 
-	@Override
-	public IntBuffer asReadOnlyBuffer() {
-		return new EaglerLWJGLIntBuffer(address, capacity, position, limit, mark, false);
-	}
-
 	@Override
 	public int get() {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		return UnsafeUtils.getMemInt(address + ((position++) << SHIFT));
 	}
 
 	@Override
 	public IntBuffer put(int b) {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		UnsafeUtils.setMemInt(address + ((position++) << SHIFT), b);
 		return this;
 	}
 
 	@Override
 	public int get(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemInt(address + (index << SHIFT));
 	}
 
 	@Override
 	public IntBuffer put(int index, int b) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemInt(address + (index << SHIFT), b);
 		return this;
 	}
 
 	@Override
 	public int getElement(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemInt(address + (index << SHIFT));
 	}
 
 	@Override
 	public void putElement(int index, int value) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemInt(address + (index << SHIFT), value);
 	}
 
 	@Override
 	public IntBuffer get(int[] dst, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		UnsafeMemcpy.memcpyAlignDst(dst, offset << SHIFT, address + (position << SHIFT), length);
 		position += length;
 		return this;
@@ -153,7 +131,7 @@ public class EaglerLWJGLIntBuffer implements IntBuffer {
 
 	@Override
 	public IntBuffer get(int[] dst) {
-		if(position + dst.length > limit) throw new ArrayIndexOutOfBoundsException(position + dst.length - 1);
+		if(position + dst.length > limit) throw Buffer.makeIOOBE(position + dst.length - 1);
 		UnsafeMemcpy.memcpyAlignDst(dst, 0, address + (position << SHIFT), dst.length);
 		position += dst.length;
 		return this;
@@ -164,13 +142,13 @@ public class EaglerLWJGLIntBuffer implements IntBuffer {
 		if(src instanceof EaglerLWJGLIntBuffer) {
 			EaglerLWJGLIntBuffer c = (EaglerLWJGLIntBuffer)src;
 			int l = c.limit - c.position;
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			UnsafeMemcpy.memcpy(address + (position << SHIFT), c.address + (c.position << SHIFT), l << SHIFT);
 			position += l;
 			c.position += l;
 		}else {
 			int l = src.remaining();
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			for(int i = 0; i < l; ++i) {
 				UnsafeUtils.setMemInt(address + ((position + l) << SHIFT), src.get());
 			}
@@ -181,7 +159,7 @@ public class EaglerLWJGLIntBuffer implements IntBuffer {
 
 	@Override
 	public IntBuffer put(int[] src, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		UnsafeMemcpy.memcpyAlignSrc(address + (position << SHIFT), src, offset << SHIFT, length);
 		position += length;
 		return this;
@@ -189,36 +167,12 @@ public class EaglerLWJGLIntBuffer implements IntBuffer {
 
 	@Override
 	public IntBuffer put(int[] src) {
-		if(position + src.length > limit) throw new ArrayIndexOutOfBoundsException(position + src.length - 1);
+		if(position + src.length > limit) throw Buffer.makeIOOBE(position + src.length - 1);
 		UnsafeMemcpy.memcpyAlignSrc(address + (position << SHIFT), src, 0, src.length);
 		position += src.length;
 		return this;
 	}
 
-	@Override
-	public int getArrayOffset() {
-		return position;
-	}
-
-	@Override
-	public IntBuffer compact() {
-		if(limit > capacity) throw new ArrayIndexOutOfBoundsException(limit);
-		if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-		
-		if(position == limit) {
-			return new EaglerLWJGLIntBuffer(0l, 0, false);
-		}
-		
-		int newLen = limit - position;
-		long newAlloc = JEmalloc.nje_malloc(newLen);
-		if(newAlloc == 0l) {
-			throw new OutOfMemoryError("Native je_malloc call returned null pointer!");
-		}
-		UnsafeMemcpy.memcpy(newAlloc, address + (position << SHIFT), newLen << SHIFT);
-		
-		return new EaglerLWJGLIntBuffer(newAlloc, newLen, true);
-	}
-
 	@Override
 	public boolean isDirect() {
 		return true;
@@ -233,7 +187,7 @@ public class EaglerLWJGLIntBuffer implements IntBuffer {
 	@Override
 	public IntBuffer reset() {
 		int m = mark;
-		if(m < 0) throw new ArrayIndexOutOfBoundsException("Invalid mark: " + m);
+		if(m < 0) throw new IndexOutOfBoundsException("Invalid mark: " + m);
 		position = m;
 		return this;
 	}
@@ -263,14 +217,14 @@ public class EaglerLWJGLIntBuffer implements IntBuffer {
 
 	@Override
 	public IntBuffer limit(int newLimit) {
-		if(newLimit < 0 || newLimit > capacity) throw new ArrayIndexOutOfBoundsException(newLimit);
+		if(newLimit < 0 || newLimit > capacity) throw Buffer.makeIOOBE(newLimit);
 		limit = newLimit;
 		return this;
 	}
 
 	@Override
 	public IntBuffer position(int newPosition) {
-		if(newPosition < 0 || newPosition > limit) throw new ArrayIndexOutOfBoundsException(newPosition);
+		if(newPosition < 0 || newPosition > limit) throw Buffer.makeIOOBE(newPosition);
 		position = newPosition;
 		return this;
 	}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLShortBuffer.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLShortBuffer.java
index ce95806..023658b 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLShortBuffer.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerLWJGLShortBuffer.java
@@ -1,7 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.internal.buffer;
 
-import org.lwjgl.system.jemalloc.JEmalloc;
-
 import net.lax1dude.unsafememcpy.UnsafeMemcpy;
 import net.lax1dude.unsafememcpy.UnsafeUtils;
 
@@ -21,7 +19,7 @@ import net.lax1dude.unsafememcpy.UnsafeUtils;
  * 
  */
 public class EaglerLWJGLShortBuffer implements ShortBuffer {
-	
+
 	final long address;
 	final boolean original;
 
@@ -29,9 +27,9 @@ public class EaglerLWJGLShortBuffer implements ShortBuffer {
 	private int position;
 	private int limit;
 	private int mark;
-	
+
 	private static final int SHIFT = 1;
-	
+
 	EaglerLWJGLShortBuffer(long address, int capacity, boolean original) {
 		this(address, capacity, 0, capacity, -1, original);
 	}
@@ -44,7 +42,7 @@ public class EaglerLWJGLShortBuffer implements ShortBuffer {
 		this.mark = mark;
 		this.original = original;
 	}
-	
+
 	@Override
 	public int capacity() {
 		return capacity;
@@ -70,82 +68,62 @@ public class EaglerLWJGLShortBuffer implements ShortBuffer {
 		return position < limit;
 	}
 
-	@Override
-	public boolean isReadOnly() {
-		return false;
-	}
-
 	@Override
 	public boolean hasArray() {
 		return false;
 	}
 
 	@Override
-	public Object array() {
+	public short[] array() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
-	public int arrayOffset() {
-		return position;
-	}
-
-	@Override
-	public ShortBuffer slice() {
-		return new EaglerLWJGLShortBuffer(address + (position << SHIFT), limit - position, false);
-	}
-
 	@Override
 	public ShortBuffer duplicate() {
 		return new EaglerLWJGLShortBuffer(address, capacity, position, limit, mark, false);
 	}
 
-	@Override
-	public ShortBuffer asReadOnlyBuffer() {
-		return new EaglerLWJGLShortBuffer(address, capacity, position, limit, mark, false);
-	}
-
 	@Override
 	public short get() {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		return UnsafeUtils.getMemShort(address + ((position++) << SHIFT));
 	}
 
 	@Override
 	public ShortBuffer put(short b) {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		UnsafeUtils.setMemShort(address + ((position++) << SHIFT), b);
 		return this;
 	}
 
 	@Override
 	public short get(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemShort(address + (index << SHIFT));
 	}
 
 	@Override
 	public ShortBuffer put(int index, short b) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemShort(address + (index << SHIFT), b);
 		return this;
 	}
 
 	@Override
 	public short getElement(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return UnsafeUtils.getMemShort(address + (index << SHIFT));
 	}
 
 	@Override
 	public void putElement(int index, short value) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		UnsafeUtils.setMemShort(address + (index << SHIFT), value);
 	}
 
 	@Override
 	public ShortBuffer get(short[] dst, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		UnsafeMemcpy.memcpyAlignDst(dst, offset << SHIFT, address + (position << SHIFT), length);
 		position += length;
 		return this;
@@ -153,7 +131,7 @@ public class EaglerLWJGLShortBuffer implements ShortBuffer {
 
 	@Override
 	public ShortBuffer get(short[] dst) {
-		if(position + dst.length > limit) throw new ArrayIndexOutOfBoundsException(position + dst.length - 1);
+		if(position + dst.length > limit) throw Buffer.makeIOOBE(position + dst.length - 1);
 		UnsafeMemcpy.memcpyAlignDst(dst, 0, address + (position << SHIFT), dst.length);
 		position += dst.length;
 		return this;
@@ -164,13 +142,13 @@ public class EaglerLWJGLShortBuffer implements ShortBuffer {
 		if(src instanceof EaglerLWJGLShortBuffer) {
 			EaglerLWJGLShortBuffer c = (EaglerLWJGLShortBuffer)src;
 			int l = c.limit - c.position;
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			UnsafeMemcpy.memcpy(address + (position << SHIFT), c.address + (c.position << SHIFT), l << SHIFT);
 			position += l;
 			c.position += l;
 		}else {
 			int l = src.remaining();
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			for(int i = 0; i < l; ++i) {
 				UnsafeUtils.setMemInt(address + ((position + l) << SHIFT), src.get());
 			}
@@ -181,7 +159,7 @@ public class EaglerLWJGLShortBuffer implements ShortBuffer {
 
 	@Override
 	public ShortBuffer put(short[] src, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		UnsafeMemcpy.memcpyAlignSrc(address + (position << SHIFT), src, offset << SHIFT, length);
 		position += length;
 		return this;
@@ -189,36 +167,12 @@ public class EaglerLWJGLShortBuffer implements ShortBuffer {
 
 	@Override
 	public ShortBuffer put(short[] src) {
-		if(position + src.length > limit) throw new ArrayIndexOutOfBoundsException(position + src.length - 1);
+		if(position + src.length > limit) throw Buffer.makeIOOBE(position + src.length - 1);
 		UnsafeMemcpy.memcpyAlignSrc(address + (position << SHIFT), src, 0, src.length);
 		position += src.length;
 		return this;
 	}
 
-	@Override
-	public int getArrayOffset() {
-		return position;
-	}
-
-	@Override
-	public ShortBuffer compact() {
-		if(limit > capacity) throw new ArrayIndexOutOfBoundsException(limit);
-		if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-		
-		if(position == limit) {
-			return new EaglerLWJGLShortBuffer(0l, 0, false);
-		}
-		
-		int newLen = limit - position;
-		long newAlloc = JEmalloc.nje_malloc(newLen);
-		if(newAlloc == 0l) {
-			throw new OutOfMemoryError("Native je_malloc call returned null pointer!");
-		}
-		UnsafeMemcpy.memcpy(newAlloc, address + (position << SHIFT), newLen << SHIFT);
-		
-		return new EaglerLWJGLShortBuffer(newAlloc, newLen, true);
-	}
-
 	@Override
 	public boolean isDirect() {
 		return true;
@@ -233,7 +187,7 @@ public class EaglerLWJGLShortBuffer implements ShortBuffer {
 	@Override
 	public ShortBuffer reset() {
 		int m = mark;
-		if(m < 0) throw new ArrayIndexOutOfBoundsException("Invalid mark: " + m);
+		if(m < 0) throw new IndexOutOfBoundsException("Invalid mark: " + m);
 		position = m;
 		return this;
 	}
@@ -263,14 +217,14 @@ public class EaglerLWJGLShortBuffer implements ShortBuffer {
 
 	@Override
 	public ShortBuffer limit(int newLimit) {
-		if(newLimit < 0 || newLimit > capacity) throw new ArrayIndexOutOfBoundsException(newLimit);
+		if(newLimit < 0 || newLimit > capacity) throw Buffer.makeIOOBE(newLimit);
 		limit = newLimit;
 		return this;
 	}
 
 	@Override
 	public ShortBuffer position(int newPosition) {
-		if(newPosition < 0 || newPosition > limit) throw new ArrayIndexOutOfBoundsException(newPosition);
+		if(newPosition < 0 || newPosition > limit) throw Buffer.makeIOOBE(newPosition);
 		position = newPosition;
 		return this;
 	}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DebugFilesystem.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DebugFilesystem.java
index feffec3..e8203eb 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DebugFilesystem.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DebugFilesystem.java
@@ -5,6 +5,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.VFSFilenameIterator;
@@ -27,21 +28,33 @@ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFSIterator2.BreakLoop;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class DebugFilesystem implements PlatformFilesystem.IFilesystemProvider {
+public class DebugFilesystem implements IEaglerFilesystem {
 
-	public static DebugFilesystem initialize(File filesystemRoot) {
+	public static DebugFilesystem initialize(String fsName, File filesystemRoot) {
 		if(!filesystemRoot.isDirectory() && !filesystemRoot.mkdirs()) {
 			throw new EaglerFileSystemException("Could not create directory for virtual filesystem: " + filesystemRoot.getAbsolutePath());
 		}
-		return new DebugFilesystem(filesystemRoot);
+		return new DebugFilesystem(fsName, filesystemRoot);
 	}
 
 	private final File filesystemRoot;
+	private final String fsName;
 
-	private DebugFilesystem(File root) {
+	private DebugFilesystem(String fsName, File root) {
+		this.fsName = fsName;
 		this.filesystemRoot = root;
 	}
 
+	@Override
+	public String getFilesystemName() {
+		return fsName;
+	}
+
+	@Override
+	public String getInternalDBName() {
+		return "desktopruntime:" + filesystemRoot.getAbsolutePath();
+	}
+
 	@Override
 	public boolean eaglerDelete(String pathName) {
 		File f = getJREFile(pathName);
@@ -78,7 +91,7 @@ public class DebugFilesystem implements PlatformFilesystem.IFilesystemProvider {
 				return tmp;
 			}catch (IOException e) {
 				throw new EaglerFileSystemException("Failed to read: " + f.getAbsolutePath(), e);
-			}catch(ArrayIndexOutOfBoundsException ex) {
+			}catch(IndexOutOfBoundsException ex) {
 				throw new EaglerFileSystemException("ERROR: Expected " + fileSize + " bytes, buffer overflow reading: " + f.getAbsolutePath(), ex);
 			}finally {
 				if(buf != null) {
@@ -221,4 +234,15 @@ public class DebugFilesystem implements PlatformFilesystem.IFilesystemProvider {
 			f.delete();
 		}
 	}
+
+	@Override
+	public boolean isRamdisk() {
+		return false;
+	}
+
+	@Override
+	public void closeHandle() {
+		
+	}
+
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java
index e410732..e0009ae 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java
@@ -31,7 +31,7 @@ public class DesktopClientConfigAdapter implements IClientConfigAdapter {
 
 	public static final IClientConfigAdapter instance = new DesktopClientConfigAdapter();
 
-	public final List<DefaultServer> defaultServers = new ArrayList();
+	public final List<DefaultServer> defaultServers = new ArrayList<>();
 
 	private final DesktopClientConfigAdapterHooks hooks = new DesktopClientConfigAdapterHooks();
 
@@ -52,17 +52,17 @@ public class DesktopClientConfigAdapter implements IClientConfigAdapter {
 
 	@Override
 	public String getWorldsDB() {
-		return "desktop";
+		return "worlds";
 	}
 
 	@Override
 	public String getResourcePacksDB() {
-		return "desktop";
+		return "resourcePacks";
 	}
 
 	@Override
 	public JSONObject getIntegratedServerOpts() {
-		return new JSONObject("{\"container\":null,\"worldsDB\":\"desktop\"}");
+		return new JSONObject("{\"container\":null,\"worldsDB\":\"worlds\"}");
 	}
 
 	private final List<RelayEntry> relays = new ArrayList<>();
@@ -148,6 +148,51 @@ public class DesktopClientConfigAdapter implements IClientConfigAdapter {
 		return true;
 	}
 
+	@Override
+	public boolean isEnableServerCookies() {
+		return true;
+	}
+
+	@Override
+	public boolean isAllowServerRedirects() {
+		return true;
+	}
+
+	@Override
+	public boolean isOpenDebugConsoleOnLaunch() {
+		return false;
+	}
+
+	@Override
+	public boolean isForceWebViewSupport() {
+		return false;
+	}
+
+	@Override
+	public boolean isEnableWebViewCSP() {
+		return true;
+	}
+
+	@Override
+	public boolean isAllowBootMenu() {
+		return false;
+	}
+
+	@Override
+	public boolean isForceProfanityFilter() {
+		return false;
+	}
+
+	@Override
+	public boolean isEaglerNoDelay() {
+		return false;
+	}
+
+	@Override
+	public boolean isRamdiskMode() {
+		return false;
+	}
+
 	@Override
 	public IClientConfigAdapterHooks getHooks() {
 		return hooks;
@@ -170,5 +215,12 @@ public class DesktopClientConfigAdapter implements IClientConfigAdapter {
 			
 		}
 
+		@Override
+		public void callScreenChangedHook(String screenName, int scaledWidth, int scaledHeight, int realWidth,
+				int realHeight, int scaleFactor) {
+			
+		}
+
 	}
+
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopWebSocketClient.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopWebSocketClient.java
new file mode 100755
index 0000000..fb64504
--- /dev/null
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopWebSocketClient.java
@@ -0,0 +1,109 @@
+package net.lax1dude.eaglercraft.v1_8.internal.lwjgl;
+
+import java.net.URI;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
+import net.lax1dude.eaglercraft.v1_8.internal.AbstractWebSocketClient;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class DesktopWebSocketClient extends AbstractWebSocketClient {
+
+	static final Logger logger = LogManager.getLogger("DesktopWebSocketClient");
+	
+	volatile EnumEaglerConnectionState playConnectState = EnumEaglerConnectionState.CONNECTING;
+	final Object connectOpenMutex = new Object();
+	final WebSocketClientImpl clientImpl;
+	final URI currentURI;
+	final String currentURIStr;
+
+	public DesktopWebSocketClient(URI currentURI) {
+		super(currentURI.toString());
+		this.currentURI = currentURI;
+		currentURIStr = currentURI.toString();
+		clientImpl = new WebSocketClientImpl(this, currentURI);
+		clientImpl.addHeader("Origin", "EAG_LWJGL_" + (EaglercraftVersion.projectForkName + "_"
+				+ EaglercraftVersion.projectOriginVersion).replaceAll("[^a-zA-Z0-9\\-_\\.]", "_"));
+	}
+
+	@Override
+	public EnumEaglerConnectionState getState() {
+		return playConnectState;
+	}
+
+	@Override
+	public boolean connectBlocking(int timeoutMS) {
+		synchronized(connectOpenMutex) {
+			try {
+				connectOpenMutex.wait(timeoutMS);
+			} catch (InterruptedException e) {
+				return false;
+			}
+		}
+		return playConnectState.isOpen();
+	}
+
+	@Override
+	public boolean isOpen() {
+		return playConnectState.isOpen();
+	}
+
+	@Override
+	public boolean isClosed() {
+		return playConnectState.isClosed();
+	}
+
+	@Override
+	public void close() {
+		if(!playConnectState.isClosed()) {
+			try {
+				clientImpl.closeBlocking();
+			} catch (InterruptedException e) {
+			}
+			playConnectState = EnumEaglerConnectionState.CLOSED;
+		}
+	}
+
+	@Override
+	public void send(String str) {
+		if(clientImpl.isClosed()) {
+			logger.error("[{}]: Client tried to send {} char packet while the socket was closed!", currentURIStr, str.length());
+		}else {
+			clientImpl.send(str);
+		}
+	}
+
+	@Override
+	public void send(byte[] bytes) {
+		if(clientImpl.isClosed()) {
+			logger.error("[{}]: Client tried to send {} byte packet while the socket was closed!", currentURIStr, bytes.length);
+		}else {
+			clientImpl.send(bytes);
+		}
+	}
+
+	public void handleString(String str) {
+		addRecievedFrame(new DesktopWebSocketFrameString(str));
+	}
+
+	public void handleBytes(byte[] array) {
+		addRecievedFrame(new DesktopWebSocketFrameBinary(array));
+	}
+
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopWebSocketFrameBinary.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopWebSocketFrameBinary.java
new file mode 100755
index 0000000..951cbb1
--- /dev/null
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopWebSocketFrameBinary.java
@@ -0,0 +1,64 @@
+package net.lax1dude.eaglercraft.v1_8.internal.lwjgl;
+
+import java.io.InputStream;
+
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketFrame;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class DesktopWebSocketFrameBinary implements IWebSocketFrame {
+
+	private final byte[] byteArray;
+	private final long timestamp;
+
+	public DesktopWebSocketFrameBinary(byte[] byteArray) {
+		this.byteArray = byteArray;
+		this.timestamp = PlatformRuntime.steadyTimeMillis();
+	}
+
+	@Override
+	public boolean isString() {
+		return false;
+	}
+
+	@Override
+	public String getString() {
+		return null;
+	}
+
+	@Override
+	public byte[] getByteArray() {
+		return byteArray;
+	}
+
+	@Override
+	public InputStream getInputStream() {
+		return new EaglerInputStream(byteArray);
+	}
+
+	@Override
+	public int getLength() {
+		return byteArray.length;
+	}
+
+	@Override
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopWebSocketFrameString.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopWebSocketFrameString.java
new file mode 100755
index 0000000..12e1b11
--- /dev/null
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopWebSocketFrameString.java
@@ -0,0 +1,63 @@
+package net.lax1dude.eaglercraft.v1_8.internal.lwjgl;
+
+import java.io.InputStream;
+
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketFrame;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class DesktopWebSocketFrameString implements IWebSocketFrame {
+
+	private final String string;
+	private final long timestamp;
+
+	public DesktopWebSocketFrameString(String string) {
+		this.string = string;
+		this.timestamp = PlatformRuntime.steadyTimeMillis();
+	}
+
+	@Override
+	public boolean isString() {
+		return true;
+	}
+
+	@Override
+	public String getString() {
+		return string;
+	}
+
+	@Override
+	public byte[] getByteArray() {
+		return null;
+	}
+
+	@Override
+	public InputStream getInputStream() {
+		return null;
+	}
+
+	@Override
+	public int getLength() {
+		return string.length();
+	}
+
+	@Override
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewHTTPD.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewHTTPD.java
new file mode 100755
index 0000000..0875d24
--- /dev/null
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewHTTPD.java
@@ -0,0 +1,41 @@
+package net.lax1dude.eaglercraft.v1_8.internal.lwjgl;
+
+import fi.iki.elonen.NanoHTTPD;
+import fi.iki.elonen.NanoHTTPD.Response.Status;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+class FallbackWebViewHTTPD extends NanoHTTPD {
+
+	static final Logger logger = FallbackWebViewServer.logger;
+
+	private String index;
+
+	FallbackWebViewHTTPD(String hostname, int port, String index) {
+		super(hostname, port);
+		this.index = index;
+	}
+
+	@Override
+    public Response serve(IHTTPSession session) {
+		if("/RTWebViewClient".equals(session.getUri())) {
+			return newFixedLengthResponse(Status.OK, MIME_HTML, index);
+		}else {
+			return newFixedLengthResponse(Status.NOT_FOUND, MIME_HTML, "<!DOCTYPE html><html><head><title>Eaglercraft Desktop Runtime</title></head><body><h1>404 Not Found</h1></body></html>");
+		}
+	}
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewProtocol.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewProtocol.java
new file mode 100755
index 0000000..6d55b84
--- /dev/null
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewProtocol.java
@@ -0,0 +1,299 @@
+package net.lax1dude.eaglercraft.v1_8.internal.lwjgl;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import net.lax1dude.eaglercraft.v1_8.internal.WebViewOptions;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.webview.PermissionsCache;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+class FallbackWebViewProtocol {
+
+	static final Logger logger = FallbackWebViewServer.logger;
+
+	private static final Map<Integer,Class<? extends FallbackWebViewPacket>> packetIDToClass = new HashMap<>();
+	private static final Map<Class<? extends FallbackWebViewPacket>,Integer> packetClassToID = new HashMap<>();
+
+	private static final int CLIENT_TO_SERVER = 0;
+	private static final int SERVER_TO_CLIENT = 1;
+
+	static {
+		register(0x00, CLIENT_TO_SERVER, CPacketClientHandshake.class);
+		register(0x01, SERVER_TO_CLIENT, SPacketServerHandshake.class);
+		register(0x02, SERVER_TO_CLIENT, SPacketServerError.class);
+		register(0x03, CLIENT_TO_SERVER, CPacketWebViewChannelOpen.class);
+		register(0x04, CLIENT_TO_SERVER, CPacketWebViewChannelClose.class);
+		register(0x05, CLIENT_TO_SERVER, CPacketWebViewMessage.class);
+		register(0x06, SERVER_TO_CLIENT, SPacketWebViewMessage.class);
+		register(0x07, CLIENT_TO_SERVER, CPacketWebViewJSPermission.class);
+	}
+
+	private static void register(int id, int dir, Class<? extends FallbackWebViewPacket> packet) {
+		if(dir == CLIENT_TO_SERVER) {
+			packetIDToClass.put(id, packet);
+		}else if(dir == SERVER_TO_CLIENT) {
+			packetClassToID.put(packet, id);
+		}else {
+			throw new IllegalArgumentException();
+		}
+	}
+
+	static String writePacket(FallbackWebViewPacket packet) {
+		Class<? extends FallbackWebViewPacket> cls = packet.getClass();
+		Integer id = packetClassToID.get(cls);
+		if(id == null) {
+			throw new RuntimeException("Tried to send unknown packet to client: " + cls.getSimpleName());
+		}
+		JSONObject json = new JSONObject();
+		json.put("$", id);
+		packet.writePacket(json);
+		return json.toString();
+	}
+
+	static FallbackWebViewPacket readPacket(String data) {
+		try {
+			JSONObject json = new JSONObject(data);
+			int id = json.getInt("$");
+			Class<? extends FallbackWebViewPacket> cls = packetIDToClass.get(id);
+			if(cls == null) {
+				logger.error("Unknown packet ID {} recieved from webview controller", id);
+				return null;
+			}
+			FallbackWebViewPacket ret;
+			try {
+				ret = cls.newInstance();
+			}catch(Throwable t) {
+				throw new RuntimeException("Failed to call packet constructor for \"" + cls.getSimpleName() + "\"! (is it defined?)");
+			}
+			ret.readPacket(json);
+			return ret;
+		}catch(Throwable ex) {
+			logger.error("Failed to parse message from webview controller: \"{}\"", data);
+			logger.error(ex);
+			return null;
+		}
+	}
+
+	static interface FallbackWebViewPacket {
+		
+		void readPacket(JSONObject json);
+		
+		void writePacket(JSONObject json);
+		
+	}
+
+	static class CPacketClientHandshake implements FallbackWebViewPacket {
+
+		public boolean cspSupport;
+
+		public CPacketClientHandshake() {
+		}
+
+		@Override
+		public void readPacket(JSONObject json) {
+			cspSupport = json.getBoolean("cspSupport");
+		}
+
+		@Override
+		public void writePacket(JSONObject json) {
+			throw new UnsupportedOperationException("Client only!");
+		}
+
+	}
+
+	static class CPacketWebViewChannelOpen implements FallbackWebViewPacket {
+
+		public String messageChannel;
+
+		public CPacketWebViewChannelOpen() {
+		}
+
+		public CPacketWebViewChannelOpen(String messageChannel) {
+			this.messageChannel = messageChannel;
+		}
+
+		@Override
+		public void readPacket(JSONObject json) {
+			messageChannel = json.getString("channel");
+			if(messageChannel.length() > 255) {
+				throw new JSONException("Channel name too long!");
+			}
+		}
+
+		@Override
+		public void writePacket(JSONObject json) {
+			throw new UnsupportedOperationException("Client only!");
+		}
+
+	}
+
+	static class CPacketWebViewChannelClose implements FallbackWebViewPacket {
+
+		public CPacketWebViewChannelClose() {
+		}
+
+		@Override
+		public void readPacket(JSONObject json) {
+			
+		}
+
+		@Override
+		public void writePacket(JSONObject json) {
+			throw new UnsupportedOperationException("Client only!");
+		}
+
+	}
+
+	// for string messages, binary are sent as a binary frame
+	static class CPacketWebViewMessage implements FallbackWebViewPacket {
+
+		public String messageContent;
+
+		public CPacketWebViewMessage() {
+		}
+
+		public CPacketWebViewMessage(String messageContent) {
+			this.messageContent = messageContent;
+		}
+
+		@Override
+		public void readPacket(JSONObject json) {
+			messageContent = json.getString("msg");
+		}
+
+		@Override
+		public void writePacket(JSONObject json) {
+			throw new UnsupportedOperationException("Client only!");
+		}
+
+	}
+
+	static class SPacketServerHandshake implements FallbackWebViewPacket {
+
+		public WebViewOptions options;
+		public EnumWebViewJSPermission hasApprovedJS;
+
+		public SPacketServerHandshake() {
+		}
+
+		public SPacketServerHandshake(WebViewOptions options, EnumWebViewJSPermission hasApprovedJS) {
+			this.options = options;
+			this.hasApprovedJS = hasApprovedJS;
+		}
+
+		@Override
+		public void readPacket(JSONObject json) {
+			throw new UnsupportedOperationException("Server only!");
+		}
+
+		@Override
+		public void writePacket(JSONObject json) {
+			json.put("contentMode", options.contentMode.toString());
+			json.put("fallbackTitle", options.fallbackTitle);
+			json.put("scriptEnabled", options.scriptEnabled);
+			json.put("strictCSPEnable", options.strictCSPEnable);
+			json.put("serverMessageAPIEnabled", options.serverMessageAPIEnabled);
+			json.put("url", options.url);
+			json.put("blob", options.blob != null ? new String(options.blob, StandardCharsets.UTF_8) : null);
+			json.put("hasApprovedJS", hasApprovedJS.toString());
+		}
+
+	}
+
+	static class SPacketServerError implements FallbackWebViewPacket {
+
+		public String errorMessage;
+
+		public SPacketServerError() {
+		}
+
+		public SPacketServerError(String errorMessage) {
+			this.errorMessage = errorMessage;
+		}
+
+		@Override
+		public void readPacket(JSONObject json) {
+			throw new UnsupportedOperationException("Server only!");
+		}
+
+		@Override
+		public void writePacket(JSONObject json) {
+			json.put("msg", errorMessage);
+		}
+
+	}
+
+	static class SPacketWebViewMessage implements FallbackWebViewPacket {
+
+		public String message;
+
+		public SPacketWebViewMessage() {
+		}
+
+		public SPacketWebViewMessage(String message) {
+			this.message = message;
+		}
+
+		@Override
+		public void readPacket(JSONObject json) {
+			throw new UnsupportedOperationException("Server only!");
+		}
+
+		@Override
+		public void writePacket(JSONObject json) {
+			json.put("msg", message);
+		}
+
+	}
+
+	static enum EnumWebViewJSPermission {
+		NOT_SET, ALLOW, BLOCK;
+
+		static EnumWebViewJSPermission fromPermission(PermissionsCache.Permission perm) {
+			if(perm != null) {
+				return perm.choice ? ALLOW : BLOCK;
+			}else {
+				return NOT_SET;
+			}
+		}
+	}
+
+	static class CPacketWebViewJSPermission implements FallbackWebViewPacket {
+
+		public EnumWebViewJSPermission permission;
+
+		public CPacketWebViewJSPermission() {
+		}
+
+		@Override
+		public void readPacket(JSONObject json) {
+			permission = EnumWebViewJSPermission.valueOf(json.getString("perm"));
+		}
+
+		@Override
+		public void writePacket(JSONObject json) {
+			throw new UnsupportedOperationException("Client only!");
+		}
+
+	}
+
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewServer.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewServer.java
new file mode 100755
index 0000000..9bbce4f
--- /dev/null
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewServer.java
@@ -0,0 +1,190 @@
+package net.lax1dude.eaglercraft.v1_8.internal.lwjgl;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.nio.charset.StandardCharsets;
+
+import org.json.JSONObject;
+
+import net.lax1dude.eaglercraft.v1_8.internal.IClientConfigAdapter;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.WebViewOptions;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketWebViewMessageV4EAG;
+import net.lax1dude.eaglercraft.v1_8.webview.WebViewOverlayController.IPacketSendCallback;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class FallbackWebViewServer {
+
+	static final Logger logger = LogManager.getLogger("FallbackWebViewServer");
+
+	public static final String LISTEN_ADDR = "127.69.69.69";
+
+	public static final File webViewClientHTML = new File("RTWebViewClient.html");
+
+	public final WebViewOptions options;
+
+	private FallbackWebViewWSD websocketServer;
+	private FallbackWebViewHTTPD httpServer;
+
+	private String currentURL;
+	private volatile boolean dead;
+
+	private IPacketSendCallback callback = null;
+
+	public FallbackWebViewServer(WebViewOptions options) {
+		this.options = options;
+	}
+
+	public void start() throws RuntimeException {
+		dead = false;
+		StringBuilder vigg = new StringBuilder();
+		try(BufferedReader reader = new BufferedReader(
+				new InputStreamReader(new FileInputStream(webViewClientHTML), StandardCharsets.UTF_8))) {
+			String line;
+			while((line = reader.readLine()) != null) {
+				vigg.append(line).append('\n');
+			}
+		}catch(IOException ex) {
+			logger.error("Failed to read \"{}\"!");
+		}
+		String indexHTML = vigg.toString();
+		
+		Object mutex = new Object();
+		websocketServer = new FallbackWebViewWSD(LISTEN_ADDR, randomPort(), options);
+		websocketServer.setEaglerPacketSendCallback(callback);
+		synchronized(mutex) {
+			websocketServer.doStartup(mutex);
+			try {
+				mutex.wait(5000l);
+			} catch (InterruptedException e) {
+			}
+		}
+		if(!websocketServer.hasStarted) {
+			logger.error("Failed to start WebSocket in time!");
+			try {
+				websocketServer.stop(5000);
+			}catch(Throwable t) {
+			}
+			websocketServer = null;
+			throw new RuntimeException("Failed to start WebSocket server!");
+		}
+		InetSocketAddress addr = websocketServer.getAddress();
+		String wsAddr = "ws://" + addr.getHostString() + ":" + addr.getPort() + "/";
+		logger.info("Listening for WebSocket on {}", wsAddr);
+		indexHTML = indexHTML.replace("${client_websocket_uri}", wsAddr);
+		
+		JSONObject optsExport = new JSONObject();
+		IClientConfigAdapter cfgAdapter = PlatformRuntime.getClientConfigAdapter();
+		optsExport.put("forceWebViewSupport", cfgAdapter.isForceWebViewSupport());
+		optsExport.put("enableWebViewCSP", cfgAdapter.isEnableWebViewCSP());
+		indexHTML = indexHTML.replace("{eaglercraftXOpts}", optsExport.toString());
+		
+		httpServer = new FallbackWebViewHTTPD(LISTEN_ADDR, 0, indexHTML);
+		try {
+			httpServer.start(5000, true);
+		} catch (IOException e) {
+			logger.error("Failed to start NanoHTTPD!");
+			try {
+				websocketServer.stop(5000);
+			}catch(Throwable t) {
+			}
+			websocketServer = null;
+			httpServer = null;
+			throw new RuntimeException("Failed to start NanoHTTPD!", e);
+		}
+		int httpPort = httpServer.getListeningPort();
+		currentURL = "http://" + LISTEN_ADDR + ":" + httpPort + "/RTWebViewClient";
+		logger.info("Listening for HTTP on {}", currentURL);
+	}
+
+	private int randomPort() {
+		try(ServerSocket sockler = new ServerSocket(0)) {
+			return sockler.getLocalPort();
+		}catch(IOException ex) {
+			throw new RuntimeException("Failed to find random port to bind to!", ex);
+		}
+	}
+
+	public boolean isDead() {
+		return dead;
+	}
+
+	public String getURL() {
+		return !dead ? currentURL : null;
+	}
+
+	public void handleMessageFromServer(SPacketWebViewMessageV4EAG packet) {
+		if(packet.type == SPacketWebViewMessageV4EAG.TYPE_STRING) {
+			if(websocketServer != null) {
+				websocketServer.handleServerMessageStr(new String(packet.data, StandardCharsets.UTF_8));
+			}else {
+				logger.error("Recieved string message, but the webview server is not running!");
+			}
+		}else if(packet.type == SPacketWebViewMessageV4EAG.TYPE_BINARY) {
+			if(websocketServer != null) {
+				websocketServer.handleServerMessageBytes(packet.data);
+			}else {
+				logger.error("Recieved string message, but the webview server is not running!");
+			}
+		}else {
+			logger.error("Unknown server webview message type {}", packet.type);
+		}
+	}
+
+	public void setPacketSendCallback(IPacketSendCallback callback) {
+		this.callback = callback;
+		if(websocketServer != null) {
+			websocketServer.setEaglerPacketSendCallback(callback);
+		}
+	}
+
+	public void runTick() {
+		
+	}
+
+	public void killServer() {
+		if(!dead) {
+			dead = true;
+			if(websocketServer != null) {
+				try {
+					websocketServer.stop(10000);
+				} catch (Throwable th) {
+					logger.error("Failed to stop WebSocket server, aborting");
+					logger.error(th);
+				}
+				websocketServer = null;
+			}
+			if(httpServer != null) {
+				try {
+					httpServer.stop();
+				} catch (Throwable th) {
+					logger.error("Failed to stop HTTP server, aborting");
+					logger.error(th);
+				}
+				httpServer = null;
+			}
+		}
+	}
+
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewWSD.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewWSD.java
new file mode 100755
index 0000000..3d8b343
--- /dev/null
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/FallbackWebViewWSD.java
@@ -0,0 +1,273 @@
+package net.lax1dude.eaglercraft.v1_8.internal.lwjgl;
+
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+
+import org.java_websocket.WebSocket;
+import org.java_websocket.handshake.ClientHandshake;
+import org.java_websocket.server.WebSocketServer;
+
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.WebViewOptions;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketWebViewMessageEnV4EAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketWebViewMessageV4EAG;
+import net.lax1dude.eaglercraft.v1_8.webview.PermissionsCache;
+import net.lax1dude.eaglercraft.v1_8.webview.PermissionsCache.Permission;
+import net.lax1dude.eaglercraft.v1_8.webview.WebViewOverlayController.IPacketSendCallback;
+
+import static net.lax1dude.eaglercraft.v1_8.internal.lwjgl.FallbackWebViewProtocol.*;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+class FallbackWebViewWSD extends WebSocketServer {
+
+	static final Logger logger = FallbackWebViewServer.logger;
+
+	private Object onStartNotify;
+
+	volatile boolean hasStarted = false;
+
+	private final Object webSockMutex = new Object();
+	volatile WebSocket webSocket = null;
+
+	volatile boolean hasHandshake = false;
+	volatile String currentChannelName = null;
+
+	private IPacketSendCallback callback = null;
+	WebViewOptions options;
+
+	private boolean enableCSP;
+	private boolean cspSupport;
+
+	FallbackWebViewWSD(String address, int port, WebViewOptions options) {
+		super(new InetSocketAddress(address, port), 1);
+		this.setTcpNoDelay(true);
+		this.setReuseAddr(true);
+		this.setConnectionLostTimeout(30);
+		this.options = options;
+		this.enableCSP = PlatformRuntime.getClientConfigAdapter().isEnableWebViewCSP();
+		this.cspSupport = true;
+	}
+
+	public void doStartup(Object onStartNotify) {
+		this.onStartNotify = onStartNotify;
+		this.start();
+	}
+
+	private void handleOpen() {
+		hasHandshake = false;
+		currentChannelName = null;
+	}
+
+	private void handleClose() {
+		if(currentChannelName != null && callback != null) {
+			callback.sendPacket(new CPacketWebViewMessageEnV4EAG(false, null));
+		}
+		currentChannelName = null;
+	}
+
+	private int hashPermissionFlags() {
+		int i = (options.scriptEnabled ? 1 : 0);
+		i |= ((enableCSP && cspSupport && options.strictCSPEnable) ? 0 : 2);
+		i |= (options.serverMessageAPIEnabled ? 4 : 0);
+		return i;
+	}
+
+	private void handleMessage(String str) {
+		WebSocket ws = webSocket;
+		FallbackWebViewPacket _packet = readPacket(str);
+		if(_packet != null) {
+			if(!hasHandshake) {
+				if(_packet instanceof CPacketClientHandshake) {
+					hasHandshake = true;
+					Permission perm = PermissionsCache.getJavaScriptAllowed(options.permissionsOriginUUID, hashPermissionFlags());
+					ws.send(writePacket(new SPacketServerHandshake(options, EnumWebViewJSPermission.fromPermission(perm))));
+				}else {
+					terminate("Unknown or unexpected packet: " + _packet.getClass().getSimpleName());
+				}
+			}else {
+				if(_packet instanceof CPacketWebViewChannelOpen) {
+					CPacketWebViewChannelOpen packet = (CPacketWebViewChannelOpen)_packet;
+					if(currentChannelName == null) {
+						currentChannelName = packet.messageChannel;
+						logger.info("[{}]: opened WebView channel \"{}\"", ws.getRemoteSocketAddress(), packet.messageChannel);
+						safeCallbackSend(new CPacketWebViewMessageEnV4EAG(true, packet.messageChannel));
+					}else {
+						terminate("Tried to open multiple channels");
+					}
+				}else if(_packet instanceof CPacketWebViewMessage) {
+					CPacketWebViewMessage packet = (CPacketWebViewMessage)_packet;
+					if(currentChannelName != null) {
+						safeCallbackSend(new CPacketWebViewMessageV4EAG(packet.messageContent));
+					}else {
+						terminate("Tried to send message without opening channel");
+					}
+				}else if(_packet instanceof CPacketWebViewChannelClose) {
+					if(currentChannelName != null) {
+						currentChannelName = null;
+						safeCallbackSend(new CPacketWebViewMessageEnV4EAG(false, null));
+					}else {
+						terminate("Tried to close missing channel");
+					}
+				}else if(_packet instanceof CPacketWebViewJSPermission) {
+					CPacketWebViewJSPermission packet = (CPacketWebViewJSPermission)_packet;
+					switch(packet.permission) {
+					case NOT_SET:
+						PermissionsCache.clearJavaScriptAllowed(options.permissionsOriginUUID);
+						break;
+					case ALLOW:
+						PermissionsCache.setJavaScriptAllowed(options.permissionsOriginUUID, hashPermissionFlags(), true);
+						break;
+					case BLOCK:
+						PermissionsCache.setJavaScriptAllowed(options.permissionsOriginUUID, hashPermissionFlags(), false);
+						break;
+					default:
+						terminate("Unknown permission state selected!");
+						break;
+					}
+					
+				}else {
+					terminate("Unknown or unexpected packet: " + _packet.getClass().getSimpleName());
+				}
+			}
+		}else {
+			terminate("Invalid packet recieved");
+		}
+	}
+
+	private void handleMessage(ByteBuffer buffer) {
+		if(currentChannelName != null) {
+			safeCallbackSend(new CPacketWebViewMessageV4EAG(buffer.array()));
+		}else {
+			terminate("Sent binary webview message while channel was closed");
+		}
+	}
+
+	private void terminate(String msg) {
+		if(webSocket != null) {
+			logger.error("[{}]: Terminating connection, reason: \"{}\"", webSocket.getRemoteSocketAddress(), msg);
+			webSocket.send(writePacket(new SPacketServerError(msg)));
+			webSocket.close();
+		}
+	}
+
+	private void safeCallbackSend(GameMessagePacket packet) {
+		if(callback != null) {
+			callback.sendPacket(packet);
+		}else {
+			logger.error("webview sent packet to server, but there's no callback registered to send packets!");
+		}
+	}
+
+	void handleServerMessageStr(String msg) {
+		if(webSocket != null) {
+			if(currentChannelName != null) {
+				webSocket.send(writePacket(new SPacketWebViewMessage(msg)));
+			}else {
+				logger.error("Recieved string message from server, but the channel is not open!");
+			}
+		}else {
+			logger.error("Recieved string message from server, but there is no active websocket!");
+		}
+	}
+
+	void handleServerMessageBytes(byte[] msg) {
+		if(webSocket != null) {
+			if(currentChannelName != null) {
+				webSocket.send(msg);
+			}else {
+				logger.error("Recieved binary message from server, but the channel is not open!");
+			}
+		}else {
+			logger.error("Recieved binary message from server, but there is no active websocket!");
+		}
+	}
+
+	@Override
+	public void onStart() {
+		hasStarted = true;
+		if(onStartNotify != null) {
+			synchronized(onStartNotify) {
+				onStartNotify.notifyAll();
+			}
+			onStartNotify = null;
+		}else {
+			logger.warn("No mutex to notify!");
+		}
+	}
+
+	@Override
+	public void onOpen(WebSocket arg0, ClientHandshake arg1) {
+		boolean result;
+		synchronized(webSockMutex) {
+			if(webSocket == null) {
+				webSocket = arg0;
+				result = true;
+			}else {
+				result = false;
+			}
+		}
+		if(result) {
+			logger.info("[{}]: WebSocket connection opened", arg0.getRemoteSocketAddress());
+			handleOpen();
+		}else {
+			logger.error("[{}]: Rejecting duplicate connection", arg0.getRemoteSocketAddress());
+			arg0.send(writePacket(new SPacketServerError("You already have a tab open!")));
+			arg0.close();
+		}
+	}
+
+	@Override
+	public void onMessage(WebSocket arg0, String arg1) {
+		if(arg0 == webSocket) {
+			handleMessage(arg1);
+		}
+	}
+
+	@Override
+	public void onMessage(WebSocket arg0, ByteBuffer arg1) {
+		if(arg0 == webSocket) {
+			handleMessage(arg1);
+		}
+	}
+
+	@Override
+	public void onClose(WebSocket arg0, int arg1, String arg2, boolean arg3) {
+		synchronized(webSockMutex) {
+			if(arg0 == webSocket) {
+				logger.info("[{}]: WebSocket connection closed", arg0.getRemoteSocketAddress());
+				try {
+					handleClose();
+				}finally {
+					webSocket = null;
+				}
+			}
+		}
+	}
+
+	@Override
+	public void onError(WebSocket arg0, Exception arg1) {
+		logger.error("[{}]: WebSocket caught exception", arg0 != null ? arg0.getRemoteSocketAddress() : "null");
+		logger.error(arg1);
+	}
+
+	public void setEaglerPacketSendCallback(IPacketSendCallback callback) {
+		this.callback = callback;
+	}
+
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/JDBCFilesystem.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/JDBCFilesystem.java
index eeaaa5d..92e199c 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/JDBCFilesystem.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/JDBCFilesystem.java
@@ -13,8 +13,8 @@ import java.util.LinkedList;
 import java.util.Map.Entry;
 import java.util.Properties;
 
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem.IFilesystemProvider;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.VFSFilenameIterator;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
@@ -38,15 +38,16 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class JDBCFilesystem implements IFilesystemProvider {
+public class JDBCFilesystem implements IEaglerFilesystem {
 
 	public static final Logger logger = LogManager.getLogger("JDBCFilesystem");
 
 	private boolean newFilesystem = true;
 
 	private static volatile boolean cleanupThreadStarted = false;
-	private static final Collection<JDBCFilesystem> jdbcFilesystems = new LinkedList();
+	private static final Collection<JDBCFilesystem> jdbcFilesystems = new LinkedList<>();
 
+	private final String dbName;
 	private final String jdbcUri;
 	private final String jdbcDriver;
 
@@ -64,8 +65,8 @@ public class JDBCFilesystem implements IFilesystemProvider {
 
 	private final Object mutex = new Object();
 
-	public static IFilesystemProvider initialize(String jdbcUri, String jdbcDriver) {
-		Class driver;
+	public static IEaglerFilesystem initialize(String dbName, String jdbcUri, String jdbcDriver) {
+		Class<?> driver;
 		try {
 			driver = Class.forName(jdbcDriver);
 		} catch (ClassNotFoundException e) {
@@ -87,8 +88,8 @@ public class JDBCFilesystem implements IFilesystemProvider {
 		for(Entry<Object, Object> etr : System.getProperties().entrySet()) {
 			if(etr.getKey() instanceof String) {
 				String str = (String)etr.getKey();
-				if(str.startsWith("eagler.jdbc.opts.")) {
-					props.put(str.substring(17), etr.getValue());
+				if(str.startsWith("eagler.jdbc." + dbName + ".opts.")) {
+					props.put(str.substring(18 + dbName.length()), etr.getValue());
 				}
 			}
 		}
@@ -104,7 +105,7 @@ public class JDBCFilesystem implements IFilesystemProvider {
 			throw new EaglerFileSystemException("Failed to connect to database: \"" + jdbcUri + "\"", ex);
 		}
 		try {
-			return new JDBCFilesystem(conn, jdbcUri, jdbcDriver);
+			return new JDBCFilesystem(dbName, conn, jdbcUri, jdbcDriver);
 		} catch (SQLException ex) {
 			try {
 				conn.close();
@@ -114,7 +115,8 @@ public class JDBCFilesystem implements IFilesystemProvider {
 		}
 	}
 
-	private JDBCFilesystem(Connection conn, String jdbcUri, String jdbcDriver) throws SQLException {
+	private JDBCFilesystem(String dbName, Connection conn, String jdbcUri, String jdbcDriver) throws SQLException {
+		this.dbName = dbName;
 		this.conn = conn;
 		this.jdbcUri = jdbcUri;
 		this.jdbcDriver = jdbcDriver;
@@ -152,6 +154,16 @@ public class JDBCFilesystem implements IFilesystemProvider {
 		}
 	}
 
+	@Override
+	public String getFilesystemName() {
+		return dbName;
+	}
+
+	@Override
+	public String getInternalDBName() {
+		return "desktopruntime:" + jdbcUri;
+	}
+
 	public boolean isNewFilesystem() {
 		return newFilesystem;
 	}
@@ -172,7 +184,8 @@ public class JDBCFilesystem implements IFilesystemProvider {
 		}
 	}
 
-	public void shutdown() {
+	@Override
+	public void closeHandle() {
 		shutdown0();
 		synchronized(jdbcFilesystems) {
 			jdbcFilesystems.remove(this);
@@ -438,4 +451,9 @@ public class JDBCFilesystem implements IFilesystemProvider {
 		}
 	}
 
+	@Override
+	public boolean isRamdisk() {
+		return false;
+	}
+
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/JDBCFilesystemConverter.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/JDBCFilesystemConverter.java
index 2c3edba..bf97a3b 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/JDBCFilesystemConverter.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/JDBCFilesystemConverter.java
@@ -7,7 +7,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem.IFilesystemProvider;
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.EaglerFileSystemException;
@@ -33,7 +33,7 @@ public class JDBCFilesystemConverter {
 
 	private static final Logger logger = LogManager.getLogger("JDBCFilesystemConverter");
 
-	public static void convertFilesystem(String title, File oldFS, IFilesystemProvider newFS, boolean deleteOld) {
+	public static void convertFilesystem(String title, File oldFS, IEaglerFilesystem newFS, boolean deleteOld) {
 		FilesystemConvertingDialog progressDialog = new FilesystemConvertingDialog(title);
 		try {
 			progressDialog.setProgressIndeterminate(true);
@@ -41,7 +41,7 @@ public class JDBCFilesystemConverter {
 			progressDialog.setVisible(true);
 			
 			String slug = oldFS.getAbsolutePath();
-			List<String> filesToCopy = new ArrayList();
+			List<String> filesToCopy = new ArrayList<>();
 			logger.info("Discovering files to convert...");
 			iterateFolder(slug.length(), oldFS, filesToCopy);
 			logger.info("Found {} files in the old directory", filesToCopy.size());
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java
index a35fa63..3235386 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java
@@ -6,7 +6,6 @@ import javax.swing.UnsupportedLookAndFeelException;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformANGLE;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.program.ShaderSource;
@@ -82,11 +81,12 @@ public class LWJGLEntryPoint {
 				PlatformInput.setStartupFullscreen(true);
 			}else if(args[i].equalsIgnoreCase("highp")) {
 				ShaderSource.setHighP(true);
-			}else if(args[i].startsWith("jdbc:")) {
-				if(i < args.length - 1) {
-					PlatformFilesystem.setUseJDBC(args[i]);
-					PlatformFilesystem.setJDBCDriverClass(args[++i]);
-				}
+			}else if(args[i].equalsIgnoreCase("gles=200")) {
+				PlatformRuntime.requestGL(200);
+			}else if(args[i].equalsIgnoreCase("gles=300")) {
+				PlatformRuntime.requestGL(300);
+			}else if(args[i].equalsIgnoreCase("gles=310")) {
+				PlatformRuntime.requestGL(310);
 			}else {
 				EnumPlatformANGLE angle = EnumPlatformANGLE.fromId(args[i]);
 				if(angle != EnumPlatformANGLE.DEFAULT) {
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/WebSocketPlayClient.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/WebSocketClientImpl.java
similarity index 55%
rename from src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/WebSocketPlayClient.java
rename to src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/WebSocketClientImpl.java
index 0c5eadd..08b92e5 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/WebSocketPlayClient.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/WebSocketClientImpl.java
@@ -1,4 +1,4 @@
-package net.lax1dude.eaglercraft.v1_8.internal;
+package net.lax1dude.eaglercraft.v1_8.internal.lwjgl;
 
 import java.net.URI;
 import java.nio.ByteBuffer;
@@ -9,11 +9,10 @@ import org.java_websocket.drafts.Draft_6455;
 import org.java_websocket.extensions.permessage_deflate.PerMessageDeflateExtension;
 import org.java_websocket.handshake.ServerHandshake;
 
-import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
-import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
 
 /**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -27,51 +26,54 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-class WebSocketPlayClient extends WebSocketClient {
+class WebSocketClientImpl extends WebSocketClient {
 
 	private static final Draft perMessageDeflateDraft = new Draft_6455(new PerMessageDeflateExtension());
 	
-	public static final Logger logger = LogManager.getLogger("WebSocket");
+	protected final DesktopWebSocketClient clientObj;
 
-	WebSocketPlayClient(URI serverUri) {
+	WebSocketClientImpl(DesktopWebSocketClient clientObj, URI serverUri) {
 		super(serverUri, perMessageDeflateDraft);
+		this.clientObj = clientObj;
 		this.setConnectionLostTimeout(15);
 		this.setTcpNoDelay(true);
+		this.connect();
 	}
 
 	@Override
 	public void onOpen(ServerHandshake arg0) {
-		PlatformNetworking.playConnectState = EnumEaglerConnectionState.CONNECTED;
-		PlatformNetworking.serverRateLimit = EnumServerRateLimit.OK;
-		logger.info("Connection opened: {}", this.uri.toString());
-	}
-
-	@Override
-	public void onClose(int arg0, String arg1, boolean arg2) {
-		logger.info("Connection closed: {}", this.uri.toString());
-	}
-
-	@Override
-	public void onError(Exception arg0) {
-		logger.error("Exception thrown by websocket \"" + this.getURI().toString() + "\"!");
-		logger.error(arg0);
-		PlatformNetworking.playConnectState = EnumEaglerConnectionState.FAILED;
-	}
-
-	@Override
-	public void onMessage(String arg0) {
-		if(arg0.equalsIgnoreCase("BLOCKED")) {
-			logger.error("Reached full IP ratelimit!");
-			PlatformNetworking.serverRateLimit = EnumServerRateLimit.BLOCKED;
-		}else if(arg0.equalsIgnoreCase("LOCKED")) {
-			logger.error("Reached full IP ratelimit lockout!");
-			PlatformNetworking.serverRateLimit = EnumServerRateLimit.LOCKED_OUT;
+		clientObj.playConnectState = EnumEaglerConnectionState.CONNECTED;
+		DesktopWebSocketClient.logger.info("Connection opened: {}", this.uri.toString());
+		synchronized(clientObj.connectOpenMutex) {
+			clientObj.connectOpenMutex.notifyAll();
 		}
 	}
 
 	@Override
-	public void onMessage(ByteBuffer arg0) {
-		PlatformNetworking.recievedPlayPacket(arg0.array());
+	public void onClose(int arg0, String arg1, boolean arg2) {
+		DesktopWebSocketClient.logger.info("Connection closed: {}", this.uri.toString());
+		if(clientObj.playConnectState != EnumEaglerConnectionState.FAILED) {
+			clientObj.playConnectState = EnumEaglerConnectionState.CLOSED;
+		}
 	}
-	
+
+	@Override
+	public void onError(Exception arg0) {
+		DesktopWebSocketClient.logger.error("Exception thrown by websocket \"" + this.getURI().toString() + "\"!");
+		DesktopWebSocketClient.logger.error(arg0);
+		if(clientObj.playConnectState == EnumEaglerConnectionState.CONNECTING) {
+			clientObj.playConnectState = EnumEaglerConnectionState.FAILED;
+		}
+	}
+
+	@Override
+	public void onMessage(String arg0) {
+		clientObj.handleString(arg0);
+	}
+
+	@Override
+	public void onMessage(ByteBuffer arg0) {
+		clientObj.handleBytes(arg0.array());
+	}
+
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java
index 2a7c736..7a4610e 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java
@@ -28,7 +28,7 @@ public class ClientPlatformSingleplayer {
 
 	private static CrashScreenPopup crashOverlay = null;
 
-	public static void startIntegratedServer() {
+	public static void startIntegratedServer(boolean forceSingleThread) {
 		DesktopIntegratedServer.startIntegratedServer();
 	}
 
@@ -52,7 +52,7 @@ public class ClientPlatformSingleplayer {
 			if(MemoryConnection.serverToClientQueue.size() == 0) {
 				return null;
 			}else {
-				List<IPCPacketData> ret = new ArrayList(MemoryConnection.serverToClientQueue);
+				List<IPCPacketData> ret = new ArrayList<>(MemoryConnection.serverToClientQueue);
 				MemoryConnection.serverToClientQueue.clear();
 				return ret;
 			}
@@ -71,6 +71,14 @@ public class ClientPlatformSingleplayer {
 		return false;
 	}
 
+	public static boolean isSingleThreadModeSupported() {
+		return false;
+	}
+
+	public static void updateSingleThreadMode() {
+		
+	}
+
 	public static void showCrashReportOverlay(String report, int x, int y, int w, int h) {
 		if(crashOverlay == null) {
 			crashOverlay = new CrashScreenPopup();
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java
index acb6ec2..82b31ed 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java
@@ -2,10 +2,12 @@ package net.lax1dude.eaglercraft.v1_8.sp.server.internal;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 
+import net.lax1dude.eaglercraft.v1_8.Filesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.IClientConfigAdapter;
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.DesktopClientConfigAdapter;
 import net.lax1dude.eaglercraft.v1_8.sp.server.internal.lwjgl.MemoryConnection;
 
@@ -26,8 +28,20 @@ import net.lax1dude.eaglercraft.v1_8.sp.server.internal.lwjgl.MemoryConnection;
  */
 public class ServerPlatformSingleplayer {
 
+	private static IEaglerFilesystem filesystem = null;
+
 	public static void initializeContext() {
-		PlatformFilesystem.initialize();
+		if(filesystem == null) {
+			filesystem = Filesystem.getHandleFor(getClientConfigAdapter().getWorldsDB());
+		}
+	}
+
+	public static void initializeContextSingleThread(Consumer<IPCPacketData> packetSendCallback) {
+		throw new UnsupportedOperationException();
+	}
+
+	public static IEaglerFilesystem getWorldsDatabase() {
+		return filesystem;
 	}
 
 	public static void sendPacket(IPCPacketData packet) {
@@ -50,7 +64,7 @@ public class ServerPlatformSingleplayer {
 			if(MemoryConnection.clientToServerQueue.size() == 0) {
 				return null;
 			}else {
-				List<IPCPacketData> ret = new ArrayList(MemoryConnection.clientToServerQueue);
+				List<IPCPacketData> ret = new ArrayList<>(MemoryConnection.clientToServerQueue);
 				MemoryConnection.clientToServerQueue.clear();
 				return ret;
 			}
@@ -60,4 +74,17 @@ public class ServerPlatformSingleplayer {
 	public static IClientConfigAdapter getClientConfigAdapter() {
 		return DesktopClientConfigAdapter.instance;
 	}
+
+	public static void immediateContinue() {
+		
+	}
+
+	public static void platformShutdown() {
+		filesystem = null;
+	}
+
+	public static boolean isSingleThreadMode() {
+		return false;
+	}
+
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/lwjgl/MemoryConnection.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/lwjgl/MemoryConnection.java
index 880414c..5960af3 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/lwjgl/MemoryConnection.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/lwjgl/MemoryConnection.java
@@ -22,7 +22,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
  */
 public class MemoryConnection {
 
-	public static final List<IPCPacketData> clientToServerQueue = new LinkedList();
-	public static final List<IPCPacketData> serverToClientQueue = new LinkedList();
+	public static final List<IPCPacketData> clientToServerQueue = new LinkedList<>();
+	public static final List<IPCPacketData> serverToClientQueue = new LinkedList<>();
 
 }
diff --git a/src/main/java/com/google/common/base/CharMatcher.java b/src/main/java/com/google/common/base/CharMatcher.java
index 07b1024..f3b77b0 100755
--- a/src/main/java/com/google/common/base/CharMatcher.java
+++ b/src/main/java/com/google/common/base/CharMatcher.java
@@ -140,9 +140,9 @@ public abstract class CharMatcher implements Predicate<Character> {
 	}
 
 	// Must be in ascending order.
-	private static final String ZEROES = "0\u0660\u06f0\u07c0\u0966\u09e6\u0a66\u0ae6\u0b66\u0be6"
-			+ "\u0c66\u0ce6\u0d66\u0e50\u0ed0\u0f20\u1040\u1090\u17e0\u1810\u1946\u19d0\u1b50\u1bb0"
-			+ "\u1c40\u1c50\ua620\ua8d0\ua900\uaa50\uff10";
+	private static final String ZEROES = new String(new char[] { '0', 0x0660, 0x06f0, 0x07c0, 0x0966, 0x09e6, 0x0a66,
+			0x0ae6, 0x0b66, 0x0be6, 0x0c66, 0x0ce6, 0x0d66, 0x0e50, 0x0ed0, 0x0f20, 0x1040, 0x1090, 0x17e0, 0x1810,
+			0x1946, 0x19d0, 0x1b50, 0x1bb0, 0x1c40, 0x1c50, 0xa620, 0xa8d0, 0xa900, 0xaa50, 0xff10 });
 
 	private static final String NINES;
 	static {
@@ -234,10 +234,10 @@ public abstract class CharMatcher implements Predicate<Character> {
 	 * FORMAT, SURROGATE, and PRIVATE_USE according to ICU4J.
 	 */
 	public static final CharMatcher INVISIBLE = new RangesMatcher("CharMatcher.INVISIBLE",
-			("\u0000\u007f\u00ad\u0600\u061c\u06dd\u070f\u1680\u180e\u2000\u2028\u205f\u2066\u2067\u2068"
-					+ "\u2069\u206a\u3000\ud800\ufeff\ufff9\ufffa").toCharArray(),
-			("\u0020\u00a0\u00ad\u0604\u061c\u06dd\u070f\u1680\u180e\u200f\u202f\u2064\u2066\u2067\u2068"
-					+ "\u2069\u206f\u3000\uf8ff\ufeff\ufff9\ufffb").toCharArray());
+			new char[] { 0x0000, 0x007f, 0x00ad, 0x0600, 0x061c, 0x06dd, 0x070f, 0x1680, 0x180e, 0x2000, 0x2028, 0x205f,
+					0x2066, 0x2067, 0x2068, 0x2069, 0x206a, 0x3000, 0xd800, 0xfeff, 0xfff9, 0xfffa },
+			new char[] { 0x0020, 0x00a0, 0x00ad, 0x0604, 0x061c, 0x06dd, 0x070f, 0x1680, 0x180e, 0x200f, 0x202f, 0x2064,
+					0x2066, 0x2067, 0x2068, 0x2069, 0x206f, 0x3000, 0xf8ff, 0xfeff, 0xfff9, 0xfffb });
 
 	private static String showCharacter(char c) {
 		String hex = "0123456789ABCDEF";
@@ -260,8 +260,8 @@ public abstract class CharMatcher implements Predicate<Character> {
 	 * keep it up to date.
 	 */
 	public static final CharMatcher SINGLE_WIDTH = new RangesMatcher("CharMatcher.SINGLE_WIDTH",
-			"\u0000\u05be\u05d0\u05f3\u0600\u0750\u0e00\u1e00\u2100\ufb50\ufe70\uff61".toCharArray(),
-			"\u04f9\u05be\u05ea\u05f4\u06ff\u077f\u0e7f\u20af\u213a\ufdff\ufeff\uffdc".toCharArray());
+			new char[] { 0x0000, 0x05be, 0x05d0, 0x05f3, 0x0600, 0x0750, 0x0e00, 0x1e00, 0x2100, 0xfb50, 0xfe70, 0xff61 },
+			new char[] { 0x04f9, 0x05be, 0x05ea, 0x05f4, 0x06ff, 0x077f, 0x0e7f, 0x20af, 0x213a, 0xfdff, 0xfeff, 0xffdc });
 
 	/** Matches any character. */
 	public static final CharMatcher ANY = new FastMatcher("CharMatcher.ANY") {
@@ -1474,9 +1474,9 @@ public abstract class CharMatcher implements Predicate<Character> {
 		return description;
 	}
 
-	static final String WHITESPACE_TABLE = "" + "\u2002\u3000\r\u0085\u200A\u2005\u2000\u3000"
-			+ "\u2029\u000B\u3000\u2008\u2003\u205F\u3000\u1680" + "\u0009\u0020\u2006\u2001\u202F\u00A0\u000C\u2009"
-			+ "\u3000\u2004\u3000\u3000\u2028\n\u2007\u3000";
+	static final String WHITESPACE_TABLE = new String(new char[] { 0x2002, 0x3000, '\r', 0x0085, 0x200A, 0x2005, 0x2000,
+			0x3000, 0x2029, 0x000B, 0x3000, 0x2008, 0x2003, 0x205F, 0x3000, 0x1680, 0x0009, 0x0020, 0x2006, 0x2001,
+			0x202F, 0x00A0, 0x000C, 0x2009, 0x3000, 0x2004, 0x3000, 0x3000, 0x2028, '\n', 0x2007, 0x3000 });
 	static final int WHITESPACE_MULTIPLIER = 1682554634;
 	static final int WHITESPACE_SHIFT = Integer.numberOfLeadingZeros(WHITESPACE_TABLE.length() - 1);
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/Base64.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/Base64.java
index 9f0b0db..13cf6d0 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/Base64.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/Base64.java
@@ -116,6 +116,14 @@ public class Base64 extends BaseNCodec {
 			41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 // 70-7a p-z
 	};
 
+	public static int lookupCharInt(char c) {
+		return c < 123 ? DECODE_TABLE[c] : -1;
+	}
+
+	public static char lookupIntChar(int i) {
+		return (char)STANDARD_ENCODE_TABLE[i];
+	}
+
 	/**
 	 * Base64 uses 6-bit fields.
 	 */
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/ClientUUIDLoadingCache.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/ClientUUIDLoadingCache.java
new file mode 100755
index 0000000..0cc95af
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/ClientUUIDLoadingCache.java
@@ -0,0 +1,152 @@
+package net.lax1dude.eaglercraft.v1_8;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketGetOtherClientUUIDV4EAG;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ClientUUIDLoadingCache {
+
+	private static final Logger logger = LogManager.getLogger("ClientUUIDLoadingCache");
+
+	public static final EaglercraftUUID NULL_UUID = new EaglercraftUUID(0l, 0l);
+	public static final EaglercraftUUID PENDING_UUID = new EaglercraftUUID(0x6969696969696969l, 0x6969696969696969l);
+	public static final EaglercraftUUID VANILLA_UUID = new EaglercraftUUID(0x1DCE015CD384374El, 0x85030A4DE95E5736l);
+
+	/**
+	 * For client devs, allows you to get EaglercraftVersion.clientBrandUUID of
+	 * other players on a server, to detect other players who also use your client.
+	 * 
+	 * Requires EaglerXBungee 1.3.0 or EaglerXVelocity 1.1.0
+	 * 
+	 * @return NULL_UUID if not found, PENDING_UUID if pending,
+	 *         VANILLA_UUID if vanilla, or the remote player's
+	 *         client's EaglercraftVersion.clientBrandUUID
+	 */
+	public static EaglercraftUUID getPlayerClientBrandUUID(EntityPlayer player) {
+		EaglercraftUUID ret = null;
+		if(player instanceof AbstractClientPlayer) {
+			ret = ((AbstractClientPlayer)player).clientBrandUUIDCache;
+			if(ret == null) {
+				Minecraft mc = Minecraft.getMinecraft();
+				if(mc != null && mc.thePlayer != null && mc.thePlayer.sendQueue.getEaglerMessageProtocol().ver >= 4) {
+					ret = PENDING_UUID;
+					EaglercraftUUID playerUUID = player.getUniqueID();
+					if(!waitingUUIDs.containsKey(playerUUID) && !evictedUUIDs.containsKey(playerUUID)) {
+						int reqID = ++requestId & 0x3FFF;
+						WaitingLookup newLookup = new WaitingLookup(reqID, playerUUID, EagRuntime.steadyTimeMillis(),
+								(AbstractClientPlayer) player);
+						waitingIDs.put(reqID, newLookup);
+						waitingUUIDs.put(playerUUID, newLookup);
+						mc.thePlayer.sendQueue.sendEaglerMessage(
+								new CPacketGetOtherClientUUIDV4EAG(reqID, newLookup.uuid.msb, newLookup.uuid.lsb));
+					}
+				}
+			}
+		}else if(player instanceof EntityPlayerMP) {
+			ret = ((EntityPlayerMP)player).clientBrandUUID;
+		}
+		if(ret == null) {
+			ret = NULL_UUID;
+		}
+		return ret;
+	}
+
+	private static final Map<Integer,WaitingLookup> waitingIDs = new HashMap<>();
+	private static final Map<EaglercraftUUID,WaitingLookup> waitingUUIDs = new HashMap<>();
+	private static final Map<EaglercraftUUID,Long> evictedUUIDs = new HashMap<>();
+
+	private static int requestId = 0;
+	private static long lastFlushReq = EagRuntime.steadyTimeMillis();
+	private static long lastFlushEvict = EagRuntime.steadyTimeMillis();
+
+	public static void update() {
+		long timestamp = EagRuntime.steadyTimeMillis();
+		if(timestamp - lastFlushReq > 5000l) {
+			lastFlushReq = timestamp;
+			if(!waitingIDs.isEmpty()) {
+				Iterator<WaitingLookup> itr = waitingIDs.values().iterator();
+				while(itr.hasNext()) {
+					WaitingLookup lookup = itr.next();
+					if(timestamp - lookup.timestamp > 15000l) {
+						itr.remove();
+						waitingUUIDs.remove(lookup.uuid);
+					}
+				}
+			}
+		}
+		if(timestamp - lastFlushEvict > 1000l) {
+			lastFlushEvict = timestamp;
+			if(!evictedUUIDs.isEmpty()) {
+				Iterator<Long> evictItr = evictedUUIDs.values().iterator();
+				while(evictItr.hasNext()) {
+					if(timestamp - evictItr.next().longValue() > 3000l) {
+						evictItr.remove();
+					}
+				}
+			}
+		}
+	}
+
+	public static void flushRequestCache() {
+		waitingIDs.clear();
+		waitingUUIDs.clear();
+		evictedUUIDs.clear();
+	}
+
+	public static void handleResponse(int requestId, EaglercraftUUID clientId) {
+		WaitingLookup lookup = waitingIDs.remove(requestId);
+		if(lookup != null) {
+			lookup.player.clientBrandUUIDCache = clientId;
+			waitingUUIDs.remove(lookup.uuid);
+		}else {
+			logger.warn("Unsolicited client brand UUID lookup response #{} recieved! (Brand UUID: {})", requestId, clientId);
+		}
+	}
+
+	public static void evict(EaglercraftUUID clientId) {
+		evictedUUIDs.put(clientId, Long.valueOf(EagRuntime.steadyTimeMillis()));
+		WaitingLookup lk = waitingUUIDs.remove(clientId);
+		if(lk != null) {
+			waitingIDs.remove(lk.reqID);
+		}
+	}
+
+	private static class WaitingLookup {
+
+		private final int reqID;
+		private final EaglercraftUUID uuid;
+		private final long timestamp;
+		private final AbstractClientPlayer player;
+
+		public WaitingLookup(int reqID, EaglercraftUUID uuid, long timestamp, AbstractClientPlayer player) {
+			this.reqID = reqID;
+			this.uuid = uuid;
+			this.timestamp = timestamp;
+			this.player = player;
+		}
+
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/Display.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/Display.java
index 360723e..ced585c 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/Display.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/Display.java
@@ -20,6 +20,8 @@ import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
 public class Display {
 
 	private static long lastSwap = 0l;
+	private static long lastDPIUpdate = -250l;
+	private static float cacheDPI = 1.0f;
 
 	public static int getWidth() {
 		return PlatformInput.getWindowWidth();
@@ -29,6 +31,22 @@ public class Display {
 		return PlatformInput.getWindowHeight();
 	}
 
+	public static int getVisualViewportX() {
+		return PlatformInput.getVisualViewportX();
+	}
+
+	public static int getVisualViewportY() {
+		return PlatformInput.getVisualViewportY();
+	}
+
+	public static int getVisualViewportW() {
+		return PlatformInput.getVisualViewportW();
+	}
+
+	public static int getVisualViewportH() {
+		return PlatformInput.getVisualViewportH();
+	}
+
 	public static boolean isActive() {
 		return PlatformInput.getWindowFocused();
 	}
@@ -61,24 +79,32 @@ public class Display {
 		boolean limitFPS = limitFramerate > 0 && limitFramerate < 1000;
 		
 		if(limitFPS) {
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			long frameMillis = (1000l / limitFramerate) - (millis - lastSwap);
 			if(frameMillis > 0l) {
 				EagUtils.sleep(frameMillis);
 			}
 		}
 		
-		lastSwap = System.currentTimeMillis();
+		lastSwap = EagRuntime.steadyTimeMillis();
 	}
 
 	public static boolean contextLost() {
 		return PlatformInput.contextLost();
 	}
-	
+
 	public static boolean wasResized() {
 		return PlatformInput.wasResized();
 	}
 
+	public static boolean wasVisualViewportResized() {
+		return PlatformInput.wasVisualViewportResized();
+	}
+
+	public static boolean supportsFullscreen() {
+		return PlatformInput.supportsFullscreen();
+	}
+
 	public static boolean isFullscreen() {
 		return PlatformInput.isFullscreen();
 	}
@@ -87,4 +113,13 @@ public class Display {
 		PlatformInput.toggleFullscreen();
 	}
 
+	public static float getDPI() {
+		long millis = EagRuntime.steadyTimeMillis();
+		if(millis - lastDPIUpdate > 250l) {
+			lastDPIUpdate = millis;
+			cacheDPI = PlatformInput.getDPI();
+		}
+		return cacheDPI;
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EagRuntime.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EagRuntime.java
index e8f490a..cf64084 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EagRuntime.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EagRuntime.java
@@ -3,17 +3,16 @@ package net.lax1dude.eaglercraft.v1_8;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringReader;
+import java.io.InputStreamReader;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
 import java.nio.charset.StandardCharsets;
-import java.text.DateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
 import java.util.function.Consumer;
 
+import net.lax1dude.eaglercraft.v1_8.internal.EaglerMissingResourceException;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformANGLE;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformAgent;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformOS;
@@ -26,6 +25,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
+import net.lax1dude.eaglercraft.v1_8.recording.ScreenRecordingController;
 import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
 
 /**
@@ -70,6 +70,8 @@ public class EagRuntime {
 		UpdateService.initialize();
 		EaglerXBungeeVersion.initialize();
 		EaglercraftGPU.warmUpCache();
+		ScreenRecordingController.initialize();
+		PlatformRuntime.postCreate();
 	}
 
 	public static void destroy() {
@@ -119,11 +121,23 @@ public class EagRuntime {
 	public static void freeFloatBuffer(FloatBuffer byteBuffer) {
 		PlatformRuntime.freeFloatBuffer(byteBuffer);
 	}
-	
+
+	public static boolean getResourceExists(String path) {
+		return PlatformAssets.getResourceExists(path);
+	}
+
 	public static byte[] getResourceBytes(String path) {
 		return PlatformAssets.getResourceBytes(path);
 	}
-	
+
+	public static byte[] getRequiredResourceBytes(String path) {
+		byte[] ret = PlatformAssets.getResourceBytes(path);
+		if(ret == null) {
+			throw new EaglerMissingResourceException("Could not load required resource from EPK: " + path);
+		}
+		return ret;
+	}
+
 	public static InputStream getResourceStream(String path) {
 		byte[] b = PlatformAssets.getResourceBytes(path);
 		if(b != null) {
@@ -132,24 +146,41 @@ public class EagRuntime {
 			return null;
 		}
 	}
-	
+
+	public static InputStream getRequiredResourceStream(String path) {
+		byte[] ret = PlatformAssets.getResourceBytes(path);
+		if(ret == null) {
+			throw new EaglerMissingResourceException("Could not load required resource from EPK: " + path);
+		}
+		return new EaglerInputStream(ret);
+	}
+
 	public static String getResourceString(String path) {
 		byte[] bytes = PlatformAssets.getResourceBytes(path);
 		return bytes != null ? new String(bytes, StandardCharsets.UTF_8) : null;
 	}
-	
+
+	public static String getRequiredResourceString(String path) {
+		byte[] ret = PlatformAssets.getResourceBytes(path);
+		if(ret == null) {
+			throw new EaglerMissingResourceException("Could not load required resource from EPK: " + path);
+		}
+		return new String(ret, StandardCharsets.UTF_8);
+	}
+
 	public static List<String> getResourceLines(String path) {
 		byte[] bytes = PlatformAssets.getResourceBytes(path);
 		if(bytes != null) {
-			List<String> ret = new ArrayList();
+			List<String> ret = new ArrayList<>();
 			try {
-				BufferedReader rd = new BufferedReader(new StringReader(path));
+				BufferedReader rd = new BufferedReader(new InputStreamReader(new EaglerInputStream(bytes), StandardCharsets.UTF_8));
 				String s;
 				while((s = rd.readLine()) != null) {
 					ret.add(s);
 				}
 			}catch(IOException ex) {
 				// ??
+				return null;
 			}
 			return ret;
 		}else {
@@ -157,6 +188,14 @@ public class EagRuntime {
 		}
 	}
 
+	public static List<String> getRequiredResourceLines(String path) {
+		List<String> ret = getResourceLines(path);
+		if(ret == null) {
+			throw new EaglerMissingResourceException("Could not load required resource from EPK: " + path);
+		}
+		return ret;
+	}
+
 	public static void debugPrintStackTraceToSTDERR(Throwable t) {
 		debugPrintStackTraceToSTDERR0("", t);
 		Throwable c = t.getCause();
@@ -180,7 +219,7 @@ public class EagRuntime {
 	}
 	
 	public static String[] getStackTraceElements(Throwable t) {
-		List<String> lst = new ArrayList();
+		List<String> lst = new ArrayList<>();
 		PlatformRuntime.getStackTrace(t, (s) -> {
 			lst.add(s);
 		});
@@ -222,17 +261,23 @@ public class EagRuntime {
 		PlatformRuntime.exit();
 	}
 
+	/**
+	 * Note to skids: This doesn't do anything in javascript runtime!
+	 */
 	public static long maxMemory() {
 		return PlatformRuntime.maxMemory();
 	}
 
 	/**
-	 * Note to skids: This doesn't do anything in TeaVM runtime!
+	 * Note to skids: This doesn't do anything in javascript runtime!
 	 */
 	public static long totalMemory() {
 		return PlatformRuntime.totalMemory();
 	}
 
+	/**
+	 * Note to skids: This doesn't do anything in javascript runtime!
+	 */
 	public static long freeMemory() {
 		return PlatformRuntime.freeMemory();
 	}
@@ -289,18 +334,6 @@ public class EagRuntime {
 		return PlatformRuntime.getClientConfigAdapter();
 	}
 
-	public static String getRecText() {
-		return PlatformRuntime.getRecText();
-	}
-
-	public static void toggleRec() {
-		PlatformRuntime.toggleRec();
-	}
-
-	public static boolean recSupported() {
-		return PlatformRuntime.recSupported();
-	}
-
 	public static void openCreditsPopup(String text) {
 		PlatformApplication.openCreditsPopup(text);
 	}
@@ -317,16 +350,24 @@ public class EagRuntime {
 		PlatformApplication.showDebugConsole();
 	}
 
-	public static Calendar getLocaleCalendar() {
-		return Calendar.getInstance(); //TODO: fix teavm calendar's time zone offset
-	}
-
-	public static <T extends DateFormat> T fixDateFormat(T input) {
-		input.setCalendar(getLocaleCalendar());
-		return input;
+	public static void setDisplayBootMenuNextRefresh(boolean en) {
+		PlatformRuntime.setDisplayBootMenuNextRefresh(en);
 	}
 
 	public static void setMCServerWindowGlobal(String url) {
 		PlatformApplication.setMCServerWindowGlobal(url);
 	}
+
+	public static long steadyTimeMillis() {
+		return PlatformRuntime.steadyTimeMillis();
+	}
+
+	public static long nanoTime() {
+		return PlatformRuntime.nanoTime();
+	}
+
+	public static void immediateContinue() {
+		PlatformRuntime.immediateContinue();
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EagUtils.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EagUtils.java
index 45ddc4a..de65609 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EagUtils.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EagUtils.java
@@ -1,5 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -85,4 +86,12 @@ public class EagUtils {
 		}
 	}
 
+	public static EaglercraftUUID makeClientBrandUUID(String name) {
+		return EaglercraftUUID.nameUUIDFromBytes(("EaglercraftXClient:" + name).getBytes(StandardCharsets.UTF_8));
+	}
+
+	public static EaglercraftUUID makeClientBrandUUIDLegacy(String name) {
+		return EaglercraftUUID.nameUUIDFromBytes(("EaglercraftXClientOld:" + name).getBytes(StandardCharsets.UTF_8));
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerOutputStream.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerOutputStream.java
index 46dc77b..64dab6d 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerOutputStream.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerOutputStream.java
@@ -74,6 +74,11 @@ public class EaglerOutputStream extends OutputStream {
 		return count;
 	}
 
+	public void skipBytes(int num) {
+		ensureCapacity(count + num);
+		count += num;
+	}
+
 	public void close() throws IOException {
 	}
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerXBungeeVersion.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerXBungeeVersion.java
index 2c56388..1f6f08d 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerXBungeeVersion.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerXBungeeVersion.java
@@ -28,10 +28,7 @@ public class EaglerXBungeeVersion {
 	private static String pluginFilename = null;
 
 	public static void initialize() {
-		String pluginVersionJson = EagRuntime.getResourceString("plugin_version.json");
-		if(pluginVersionJson == null) {
-			throw new RuntimeException("File \"plugin_version.json\" is missing in the epk!");
-		}
+		String pluginVersionJson = EagRuntime.getRequiredResourceString("plugin_version.json");
 		JSONObject json = new JSONObject(pluginVersionJson);
 		pluginName = json.getString("pluginName");
 		pluginVersion = json.getString("pluginVersion");
@@ -76,11 +73,7 @@ public class EaglerXBungeeVersion {
 	}
 
 	public static byte[] getPluginDownload() {
-		byte[] ret = EagRuntime.getResourceBytes(pluginFileEPK);
-		if(ret == null) {
-			throw new RuntimeException("File \"" + pluginFileEPK + "\" is missing in the epk!");
-		}
-		return ret;
+		return EagRuntime.getRequiredResourceBytes(pluginFileEPK);
 	}
 
 	public static void startPluginDownload() {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java
index 12763f9..0ff0017 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java
@@ -130,10 +130,10 @@ public class EaglercraftSoundManager {
 				settings.getSoundLevel(SoundCategory.RECORDS), settings.getSoundLevel(SoundCategory.WEATHER),
 				settings.getSoundLevel(SoundCategory.BLOCKS), settings.getSoundLevel(SoundCategory.MOBS),
 				settings.getSoundLevel(SoundCategory.ANIMALS), settings.getSoundLevel(SoundCategory.PLAYERS),
-				settings.getSoundLevel(SoundCategory.AMBIENT), settings.getSoundLevel(SoundCategory.VOICE)
+				settings.getSoundLevel(SoundCategory.AMBIENT)
 		};
-		activeSounds = new LinkedList();
-		queuedSounds = new LinkedList();
+		activeSounds = new LinkedList<>();
+		queuedSounds = new LinkedList<>();
 	}
 
 	public void unloadSoundSystem() {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftUUID.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftUUID.java
index 6963df9..2130625 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftUUID.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftUUID.java
@@ -21,6 +21,8 @@ public class EaglercraftUUID implements Comparable<EaglercraftUUID> {
 
 	public final long msb;
 	public final long lsb;
+	private int hash = 0;
+	private boolean hasHash;
 
 	public EaglercraftUUID(long msb, long lsb) {
 		this.msb = msb;
@@ -125,13 +127,21 @@ public class EaglercraftUUID implements Comparable<EaglercraftUUID> {
 
 	@Override
 	public int hashCode() {
-		long hilo = msb ^ lsb;
-		return ((int) (hilo >> 32)) ^ (int) hilo;
+		if(hash == 0 && !hasHash) {
+			long hilo = msb ^ lsb;
+			hash = ((int) (hilo >> 32)) ^ (int) hilo;
+			hasHash = true;
+		}
+		return hash;
 	}
 
 	@Override
 	public boolean equals(Object o) {
-		return (o instanceof EaglercraftUUID) && ((EaglercraftUUID) o).lsb == lsb && ((EaglercraftUUID) o).msb == msb;
+		if(!(o instanceof EaglercraftUUID)) return false;
+		EaglercraftUUID oo = (EaglercraftUUID)o;
+		return (hasHash && oo.hasHash)
+				? (hash == oo.hash && msb == oo.msb && lsb == oo.lsb)
+				: (msb == oo.msb && lsb == oo.lsb);
 	}
 
 	public long getMostSignificantBits() {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java
index 95fd85f..18125da 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java
@@ -10,7 +10,7 @@ public class EaglercraftVersion {
 	/// Customize these to fit your fork:
 	
 	public static final String projectForkName = "EaglercraftX";
-	public static final String projectForkVersion = "u36";
+	public static final String projectForkVersion = "u37";
 	public static final String projectForkVendor = "lax1dude";
 	
 	public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8";
@@ -20,7 +20,7 @@ public class EaglercraftVersion {
 	public static final String projectOriginName = "EaglercraftX";
 	public static final String projectOriginAuthor = "lax1dude";
 	public static final String projectOriginRevision = "1.8";
-	public static final String projectOriginVersion = "u36";
+	public static final String projectOriginVersion = "u37";
 	
 	public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; // rest in peace
 	
@@ -31,7 +31,7 @@ public class EaglercraftVersion {
 	public static final boolean enableUpdateService = true;
 
 	public static final String updateBundlePackageName = "net.lax1dude.eaglercraft.v1_8.client";
-	public static final int updateBundlePackageVersionInt = 36;
+	public static final int updateBundlePackageVersionInt = 37;
 
 	public static final String updateLatestLocalStorageKey = "latestUpdate_" + updateBundlePackageName;
 
@@ -40,6 +40,13 @@ public class EaglercraftVersion {
 	
 	
 	
+	// Client brand identification system configuration
+	
+	public static final EaglercraftUUID clientBrandUUID = EagUtils.makeClientBrandUUID(projectForkName);
+
+	public static final EaglercraftUUID legacyClientUUIDInSharedWorld = EagUtils.makeClientBrandUUIDLegacy(projectOriginName);
+	
+	
 	// Miscellaneous variables:
 
 	public static final String mainMenuStringA = "Minecraft 1.8.8";
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/Filesystem.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/Filesystem.java
new file mode 100755
index 0000000..6918699
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/Filesystem.java
@@ -0,0 +1,158 @@
+package net.lax1dude.eaglercraft.v1_8;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem;
+import net.lax1dude.eaglercraft.v1_8.internal.RamdiskFilesystemImpl;
+import net.lax1dude.eaglercraft.v1_8.internal.VFSFilenameIterator;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class Filesystem {
+
+	private static final Logger logger = LogManager.getLogger("PlatformFilesystem");
+
+	private static final Map<String,FilesystemHandle> openFilesystems = new HashMap<>();
+
+	public static IEaglerFilesystem getHandleFor(String dbName) {
+		FilesystemHandle handle = openFilesystems.get(dbName);
+		if(handle != null) {
+			++handle.refCount;
+			return new FilesystemHandleWrapper(handle);
+		}
+		IEaglerFilesystem handleImpl = null;
+		if(!EagRuntime.getConfiguration().isRamdiskMode()) {
+			handleImpl = PlatformFilesystem.initializePersist(dbName);
+		}
+		if(handleImpl == null) {
+			handleImpl = new RamdiskFilesystemImpl(dbName);
+		}
+		if(handleImpl.isRamdisk()) {
+			logger.warn("Using RAMDisk filesystem for database \"{}\", data will not be saved to local storage!", dbName);
+		}
+		handle = new FilesystemHandle(handleImpl);
+		openFilesystems.put(dbName, handle);
+		return new FilesystemHandleWrapper(handle);
+	}
+
+	public static void closeAllHandles() {
+		for(FilesystemHandle handle : openFilesystems.values()) {
+			handle.refCount = 0;
+			handle.handle.closeHandle();
+		}
+		openFilesystems.clear();
+	}
+
+	private static class FilesystemHandle {
+
+		private final IEaglerFilesystem handle;
+		private int refCount;
+		
+		private FilesystemHandle(IEaglerFilesystem handle) {
+			this.handle = handle;
+			this.refCount = 1;
+		}
+
+	}
+
+	private static class FilesystemHandleWrapper implements IEaglerFilesystem {
+
+		private final FilesystemHandle handle;
+		private final IEaglerFilesystem handleImpl;
+		private boolean closed;
+
+		private FilesystemHandleWrapper(FilesystemHandle handle) {
+			this.handle = handle;
+			this.handleImpl = handle.handle;
+			this.closed = false;
+		}
+
+		@Override
+		public String getFilesystemName() {
+			return handleImpl.getFilesystemName();
+		}
+
+		@Override
+		public String getInternalDBName() {
+			return handleImpl.getInternalDBName();
+		}
+
+		@Override
+		public boolean isRamdisk() {
+			return handleImpl.isRamdisk();
+		}
+
+		@Override
+		public boolean eaglerDelete(String pathName) {
+			return handleImpl.eaglerDelete(pathName);
+		}
+
+		@Override
+		public ByteBuffer eaglerRead(String pathName) {
+			return handleImpl.eaglerRead(pathName);
+		}
+
+		@Override
+		public void eaglerWrite(String pathName, ByteBuffer data) {
+			handleImpl.eaglerWrite(pathName, data);
+		}
+
+		@Override
+		public boolean eaglerExists(String pathName) {
+			return handleImpl.eaglerExists(pathName);
+		}
+
+		@Override
+		public boolean eaglerMove(String pathNameOld, String pathNameNew) {
+			return handleImpl.eaglerMove(pathNameOld, pathNameNew);
+		}
+
+		@Override
+		public int eaglerCopy(String pathNameOld, String pathNameNew) {
+			return handleImpl.eaglerCopy(pathNameOld, pathNameNew);
+		}
+
+		@Override
+		public int eaglerSize(String pathName) {
+			return handleImpl.eaglerSize(pathName);
+		}
+
+		@Override
+		public void eaglerIterate(String pathName, VFSFilenameIterator itr, boolean recursive) {
+			handleImpl.eaglerIterate(pathName, itr, recursive);
+		}
+
+		@Override
+		public void closeHandle() {
+			if(!closed && handle.refCount > 0) {
+				closed = true;
+				--handle.refCount;
+				if(handle.refCount <= 0) {
+					logger.info("Releasing filesystem handle for: \"{}\"", handleImpl.getFilesystemName());
+					handleImpl.closeHandle();
+					openFilesystems.remove(handleImpl.getFilesystemName());
+				}
+			}
+		}
+
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/Gamepad.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/Gamepad.java
new file mode 100755
index 0000000..68cc6f2
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/Gamepad.java
@@ -0,0 +1,115 @@
+package net.lax1dude.eaglercraft.v1_8;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.internal.GamepadConstants;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class Gamepad {
+
+	private static final boolean[] buttonsLastState = new boolean[24];
+	private static final List<VirtualButtonEvent> buttonEvents = new LinkedList<>();
+	private static VirtualButtonEvent currentVEvent = null;
+
+	private static class VirtualButtonEvent {
+
+		private final int button;
+		private final boolean state;
+
+		public VirtualButtonEvent(int button, boolean state) {
+			this.button = button;
+			this.state = state;
+		}
+
+	}
+
+	public static int getValidDeviceCount() {
+		return PlatformInput.gamepadGetValidDeviceCount();
+	}
+
+	public static String getDeviceName(int deviceId) {
+		return PlatformInput.gamepadGetDeviceName(deviceId);
+	}
+
+	public static void setSelectedDevice(int deviceId) {
+		PlatformInput.gamepadSetSelectedDevice(deviceId);
+	}
+
+	public static void update() {
+		PlatformInput.gamepadUpdate();
+		if(isValid()) {
+			for(int i = 0; i < buttonsLastState.length; ++i) {
+				boolean b = PlatformInput.gamepadGetButtonState(i);
+				if(b != buttonsLastState[i]) {
+					buttonsLastState[i] = b;
+					buttonEvents.add(new VirtualButtonEvent(i, b));
+					if(buttonEvents.size() > 64) {
+						buttonEvents.remove(0);
+					}
+				}
+			}
+		}else {
+			for(int i = 0; i < buttonsLastState.length; ++i) {
+				buttonsLastState[i] = false;
+			}
+		}
+	}
+
+	public static boolean next() {
+		currentVEvent = null;
+		return !buttonEvents.isEmpty() && (currentVEvent = buttonEvents.remove(0)) != null;
+	}
+
+	public static int getEventButton() {
+		return currentVEvent != null ? currentVEvent.button : -1;
+	}
+
+	public static boolean getEventButtonState() {
+		return currentVEvent != null ? currentVEvent.state : false;
+	}
+
+	public static boolean isValid() {
+		return PlatformInput.gamepadIsValid();
+	}
+
+	public static String getName() {
+		return PlatformInput.gamepadGetName();
+	}
+
+	public static boolean getButtonState(int button) {
+		return PlatformInput.gamepadGetButtonState(button);
+	}
+
+	public static String getButtonName(int button) {
+		return GamepadConstants.getButtonName(button);
+	}
+
+	public static float getAxis(int axis) {
+		return PlatformInput.gamepadGetAxis(axis);
+	}
+
+	public static String getAxisName(int button) {
+		return GamepadConstants.getAxisName(button);
+	}
+
+	public static void clearEventBuffer() {
+		buttonEvents.clear();
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/HashKey.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/HashKey.java
new file mode 100755
index 0000000..fdb56fb
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/HashKey.java
@@ -0,0 +1,54 @@
+package net.lax1dude.eaglercraft.v1_8;
+
+import java.util.Arrays;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class HashKey {
+
+	public final byte[] key;
+	public final int hash;
+
+	public HashKey(byte[] key, int hashCode) {
+		this.key = key;
+		this.hash = hashCode;
+	}
+
+	public HashKey(byte[] key) {
+		this.key = key;
+		this.hash = Arrays.hashCode(key);
+	}
+
+	public Object clone() {
+		return new HashKey(key, hash);
+	}
+
+	@Override
+	public int hashCode() {
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null || !(obj instanceof HashKey))
+			return false;
+		HashKey other = (HashKey) obj;
+		return hash == other.hash && Arrays.equals(key, other.key);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/IOUtils.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/IOUtils.java
index d9a2fb4..3d76cb9 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/IOUtils.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/IOUtils.java
@@ -32,7 +32,7 @@ public class IOUtils {
 			return Arrays.asList(
 					new String(((EaglerInputStream) parInputStream).getAsArray(), charset).split("(\\r\\n|\\n|\\r)"));
 		}else {
-			List<String> ret = new ArrayList();
+			List<String> ret = new ArrayList<>();
 			try(InputStream is = parInputStream) {
 				BufferedReader rd = new BufferedReader(new InputStreamReader(is, charset));
 				String s;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/Keyboard.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/Keyboard.java
index 87876f1..9dd0657 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/Keyboard.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/Keyboard.java
@@ -1,5 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8;
 
+import net.lax1dude.eaglercraft.v1_8.internal.EnumFireKeyboardEvent;
 import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
 
@@ -60,4 +61,8 @@ public class Keyboard {
 		return PlatformInput.keyboardIsRepeatEvent();
 	}
 
+	public static void fireEvent(EnumFireKeyboardEvent eventType, int eagKey, char keyChar) {
+		PlatformInput.keyboardFireEvent(eventType, eagKey, keyChar);
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/Mouse.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/Mouse.java
index abc9311..427caba 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/Mouse.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/Mouse.java
@@ -1,6 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8;
 
 import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumFireMouseEvent;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
 
 /**
@@ -92,6 +93,22 @@ public class Mouse {
 		return PlatformInput.isMouseGrabbed();
 	}
 
+	public static boolean isMouseGrabSupported() {
+		return PlatformInput.mouseGrabSupported();
+	}
+
+	public static void fireMoveEvent(EnumFireMouseEvent eventType, int posX, int posY) {
+		PlatformInput.mouseFireMoveEvent(eventType, posX, posY);
+	}
+
+	public static void fireButtonEvent(EnumFireMouseEvent eventType, int posX, int posY, int button) {
+		PlatformInput.mouseFireButtonEvent(eventType, posX, posY, button);
+	}
+
+	public static void fireWheelEvent(EnumFireMouseEvent eventType, int posX, int posY, float wheel) {
+		PlatformInput.mouseFireWheelEvent(eventType, posX, posY, wheel);
+	}
+
 	private static int customCursorCounter = 0;
 	private static EnumCursorType currentCursorType = EnumCursorType.DEFAULT;
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/PauseMenuCustomizeState.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/PauseMenuCustomizeState.java
new file mode 100755
index 0000000..e0c67d3
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/PauseMenuCustomizeState.java
@@ -0,0 +1,257 @@
+package net.lax1dude.eaglercraft.v1_8;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
+import net.lax1dude.eaglercraft.v1_8.profile.EaglerSkinTexture;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketCustomizePauseMenuV4EAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.util.PacketImageData;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.util.ResourceLocation;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PauseMenuCustomizeState {
+
+	private static final Logger logger = LogManager.getLogger("PauseMenuCustomizeState");
+
+	public static ResourceLocation icon_title_L;
+	public static float icon_title_L_aspect = 1.0f;
+	public static ResourceLocation icon_title_R;
+	public static float icon_title_R_aspect = 1.0f;
+	public static ResourceLocation icon_backToGame_L;
+	public static float icon_backToGame_L_aspect = 1.0f;
+	public static ResourceLocation icon_backToGame_R;
+	public static float icon_backToGame_R_aspect = 1.0f;
+	public static ResourceLocation icon_achievements_L;
+	public static float icon_achievements_L_aspect = 1.0f;
+	public static ResourceLocation icon_achievements_R;
+	public static float icon_achievements_R_aspect = 1.0f;
+	public static ResourceLocation icon_statistics_L;
+	public static float icon_statistics_L_aspect = 1.0f;
+	public static ResourceLocation icon_statistics_R;
+	public static float icon_statistics_R_aspect = 1.0f;
+	public static ResourceLocation icon_serverInfo_L;
+	public static float icon_serverInfo_L_aspect = 1.0f;
+	public static ResourceLocation icon_serverInfo_R;
+	public static float icon_serverInfo_R_aspect = 1.0f;
+	public static ResourceLocation icon_options_L;
+	public static float icon_options_L_aspect = 1.0f;
+	public static ResourceLocation icon_options_R;
+	public static float icon_options_R_aspect = 1.0f;
+	public static ResourceLocation icon_discord_L;
+	public static float icon_discord_L_aspect = 1.0f;
+	public static ResourceLocation icon_discord_R;
+	public static float icon_discord_R_aspect = 1.0f;
+	public static ResourceLocation icon_disconnect_L;
+	public static float icon_disconnect_L_aspect = 1.0f;
+	public static ResourceLocation icon_disconnect_R;
+	public static float icon_disconnect_R_aspect = 1.0f;
+	public static ResourceLocation icon_background_pause;
+	public static float icon_background_pause_aspect = 1.0f;
+	public static ResourceLocation icon_background_all;
+	public static float icon_background_all_aspect = 1.0f;
+	public static ResourceLocation icon_watermark_pause;
+	public static float icon_watermark_pause_aspect = 1.0f;
+	public static ResourceLocation icon_watermark_all;
+	public static float icon_watermark_all_aspect = 1.0f;
+
+	public static final int SERVER_INFO_MODE_NONE = SPacketCustomizePauseMenuV4EAG.SERVER_INFO_MODE_NONE;
+	public static final int SERVER_INFO_MODE_EXTERNAL_URL = SPacketCustomizePauseMenuV4EAG.SERVER_INFO_MODE_EXTERNAL_URL;
+	public static final int SERVER_INFO_MODE_SHOW_EMBED_OVER_HTTP = SPacketCustomizePauseMenuV4EAG.SERVER_INFO_MODE_SHOW_EMBED_OVER_HTTP;
+	public static final int SERVER_INFO_MODE_SHOW_EMBED_OVER_WS = SPacketCustomizePauseMenuV4EAG.SERVER_INFO_MODE_SHOW_EMBED_OVER_WS;
+
+	public static final int SERVER_INFO_EMBED_PERMS_JAVASCRIPT = SPacketCustomizePauseMenuV4EAG.SERVER_INFO_EMBED_PERMS_JAVASCRIPT;
+	public static final int SERVER_INFO_EMBED_PERMS_MESSAGE_API = SPacketCustomizePauseMenuV4EAG.SERVER_INFO_EMBED_PERMS_MESSAGE_API;
+	public static final int SERVER_INFO_EMBED_PERMS_STRICT_CSP = SPacketCustomizePauseMenuV4EAG.SERVER_INFO_EMBED_PERMS_STRICT_CSP;
+
+	public static final int DISCORD_MODE_NONE = SPacketCustomizePauseMenuV4EAG.DISCORD_MODE_NONE;
+	public static final int DISCORD_MODE_INVITE_URL = SPacketCustomizePauseMenuV4EAG.DISCORD_MODE_INVITE_URL;
+
+	public static int serverInfoMode;
+	public static int serverInfoEmbedPerms = SERVER_INFO_EMBED_PERMS_STRICT_CSP;
+	public static String serverInfoEmbedTitle;
+	public static String serverInfoButtonText;
+	public static String serverInfoURL;
+	public static byte[] serverInfoHash;
+
+	public static int discordButtonMode;
+	public static String discordButtonText;
+	public static String discordInviteURL;
+
+	private static final List<PauseMenuSprite> toFree = new ArrayList<>();
+
+	private static int textureId = 0;
+
+	private static class PauseMenuSprite {
+		
+		private final ResourceLocation loc;
+		private final EaglerSkinTexture tex;
+		
+		public PauseMenuSprite(EaglerSkinTexture tex) {
+			this.loc = newLoc();
+			this.tex = tex;
+		}
+		
+	}
+
+	public static void loadPacket(SPacketCustomizePauseMenuV4EAG packet) {
+		reset();
+		
+		serverInfoMode = packet.serverInfoMode;
+		switch(packet.serverInfoMode) {
+		case SERVER_INFO_MODE_NONE:
+		default:
+			serverInfoButtonText = null;
+			serverInfoURL = null;
+			serverInfoHash = null;
+			break;
+		case SERVER_INFO_MODE_EXTERNAL_URL:
+			serverInfoButtonText = packet.serverInfoButtonText;
+			serverInfoURL = packet.serverInfoURL;
+			break;
+		case SERVER_INFO_MODE_SHOW_EMBED_OVER_HTTP:
+			serverInfoButtonText = packet.serverInfoButtonText;
+			serverInfoEmbedPerms = packet.serverInfoEmbedPerms;
+			serverInfoURL = packet.serverInfoURL;
+			serverInfoEmbedTitle = packet.serverInfoEmbedTitle;
+			break;
+		case SERVER_INFO_MODE_SHOW_EMBED_OVER_WS:
+			serverInfoButtonText = packet.serverInfoButtonText;
+			serverInfoEmbedPerms = packet.serverInfoEmbedPerms;
+			serverInfoHash = packet.serverInfoHash;
+			serverInfoEmbedTitle = packet.serverInfoEmbedTitle;
+			break;
+		}
+		
+		discordButtonMode = packet.discordButtonMode;
+		switch(packet.discordButtonMode) {
+		case DISCORD_MODE_NONE:
+		default:
+			discordButtonText = null;
+			serverInfoURL = null;
+			serverInfoHash = null;
+			break;
+		case DISCORD_MODE_INVITE_URL:
+			discordButtonText = packet.discordButtonText;
+			discordInviteURL = packet.discordInviteURL;
+			break;
+		}
+		
+		if(packet.imageMappings != null) {
+			Map<Integer, PauseMenuSprite> spriteCache = new HashMap<>();
+			icon_title_L = cacheLoadHelperFunction("icon_title_L", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_title_L_aspect = a);
+			icon_title_R = cacheLoadHelperFunction("icon_title_R", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_title_R_aspect = a);
+			icon_backToGame_L = cacheLoadHelperFunction("icon_backToGame_L", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_backToGame_L_aspect = a);
+			icon_backToGame_R = cacheLoadHelperFunction("icon_backToGame_R", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_backToGame_R_aspect = a);
+			icon_achievements_L = cacheLoadHelperFunction("icon_achievements_L", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_achievements_L_aspect = a);
+			icon_achievements_R = cacheLoadHelperFunction("icon_achievements_R", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_achievements_R_aspect = a);
+			icon_statistics_L = cacheLoadHelperFunction("icon_statistics_L", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_statistics_L_aspect = a);
+			icon_statistics_R = cacheLoadHelperFunction("icon_statistics_R", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_statistics_R_aspect = a);
+			icon_serverInfo_L = cacheLoadHelperFunction("icon_serverInfo_L", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_serverInfo_L_aspect = a);
+			icon_serverInfo_R = cacheLoadHelperFunction("icon_serverInfo_R", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_serverInfo_R_aspect = a);
+			icon_options_L = cacheLoadHelperFunction("icon_options_L", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_options_L_aspect = a);
+			icon_options_R = cacheLoadHelperFunction("icon_options_R", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_options_R_aspect = a);
+			icon_discord_L = cacheLoadHelperFunction("icon_discord_L", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_discord_L_aspect = a);
+			icon_discord_R = cacheLoadHelperFunction("icon_discord_R", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_discord_R_aspect = a);
+			icon_disconnect_L = cacheLoadHelperFunction("icon_disconnect_L", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_disconnect_L_aspect = a);
+			icon_disconnect_R = cacheLoadHelperFunction("icon_disconnect_R", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_disconnect_R_aspect = a);
+			icon_background_pause = cacheLoadHelperFunction("icon_background_pause", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_background_pause_aspect = a);
+			icon_background_all = cacheLoadHelperFunction("icon_background_all", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_background_all_aspect = a);
+			icon_watermark_pause = cacheLoadHelperFunction("icon_watermark_pause", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_watermark_pause_aspect = a);
+			icon_watermark_all = cacheLoadHelperFunction("icon_watermark_all", packet.imageMappings, spriteCache, packet.imageData, (a) -> icon_watermark_all_aspect = a);
+		}
+	}
+
+	private static ResourceLocation cacheLoadHelperFunction(String name, Map<String, Integer> lookup,
+			Map<Integer, PauseMenuSprite> spriteCache,
+			List<PacketImageData> sourceData, Consumer<Float> aspectCB) {
+		Integer i = lookup.get(name);
+		if(i == null) {
+			return null;
+		}
+		PauseMenuSprite ret = spriteCache.get(i);
+		if(ret != null) {
+			if(name.startsWith("icon_background_") && ImageData.isNPOTStatic(ret.tex.getWidth(), ret.tex.getHeight())) {
+				logger.warn("An NPOT (non-power-of-two) texture was used for \"{}\", this texture's width and height must be powers of two for this texture to display properly on all hardware");
+			}
+			aspectCB.accept((float)ret.tex.getWidth() / ret.tex.getHeight());
+			return ret.loc;
+		}
+		int ii = i.intValue();
+		if(ii < 0 || ii >= sourceData.size()) {
+			return null;
+		}
+		PacketImageData data = sourceData.get(ii);
+		ret = new PauseMenuSprite(new EaglerSkinTexture(ImageData.swapRB(data.rgba), data.width, data.height));
+		Minecraft.getMinecraft().getTextureManager().loadTexture(ret.loc, ret.tex);
+		spriteCache.put(i, ret);
+		toFree.add(ret);
+		aspectCB.accept((float)data.width / data.height);
+		return ret.loc;
+	}
+
+	private static ResourceLocation newLoc() {
+		return new ResourceLocation("eagler:gui/server/custom_pause_menu/tex_" + textureId++);
+	}
+
+	public static void reset() {
+		icon_title_L = icon_title_R = null;
+		icon_backToGame_L = icon_backToGame_R = null;
+		icon_achievements_L = icon_achievements_R = null;
+		icon_statistics_L = icon_statistics_R = null;
+		icon_serverInfo_L = icon_serverInfo_R = null;
+		icon_options_L = icon_options_R = null;
+		icon_discord_L = icon_discord_R = null;
+		icon_disconnect_L = icon_disconnect_R = null;
+		icon_background_pause = icon_background_all = null;
+		icon_watermark_pause = icon_watermark_all = null;
+		icon_title_L_aspect = icon_title_R_aspect = 1.0f;
+		icon_backToGame_L_aspect = icon_backToGame_R_aspect = 1.0f;
+		icon_achievements_L_aspect = icon_achievements_R_aspect = 1.0f;
+		icon_statistics_L_aspect = icon_statistics_R_aspect = 1.0f;
+		icon_serverInfo_L_aspect = icon_serverInfo_R_aspect = 1.0f;
+		icon_options_L_aspect = icon_options_R_aspect = 1.0f;
+		icon_discord_L_aspect = icon_discord_R_aspect = 1.0f;
+		icon_disconnect_L_aspect = icon_disconnect_R_aspect = 1.0f;
+		icon_background_pause_aspect = icon_background_all_aspect = 1.0f;
+		icon_watermark_pause_aspect = icon_watermark_all_aspect = 1.0f;
+		serverInfoMode = 0;
+		serverInfoEmbedPerms = SERVER_INFO_EMBED_PERMS_STRICT_CSP;
+		serverInfoButtonText = null;
+		serverInfoURL = null;
+		serverInfoHash = null;
+		serverInfoEmbedTitle = null;
+		discordButtonMode = 0;
+		discordButtonText = null;
+		discordInviteURL = null;
+		if(!toFree.isEmpty()) {
+			TextureManager mgr = Minecraft.getMinecraft().getTextureManager();
+			for(PauseMenuSprite rc : toFree) {
+				mgr.deleteTexture(rc.loc);
+			}
+			toFree.clear();
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/PointerInputAbstraction.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/PointerInputAbstraction.java
new file mode 100755
index 0000000..5f82346
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/PointerInputAbstraction.java
@@ -0,0 +1,227 @@
+package net.lax1dude.eaglercraft.v1_8;
+
+import net.lax1dude.eaglercraft.v1_8.touch_gui.TouchControls;
+import net.minecraft.client.Minecraft;
+
+/**
+ * Copyright (c) 2024 lax1dude, ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PointerInputAbstraction {
+
+	protected static Minecraft mc;
+	protected static int oldMX = -1;
+	protected static int oldMY = -1;
+	protected static int oldTX = -1;
+	protected static int oldTY = -1;
+	protected static int dragStartX = -1;
+	protected static int dragStartY = -1;
+	protected static int dragStepStartX = -1;
+	protected static int dragStepStartY = -1;
+	protected static int dragUID = -1;
+
+	protected static int cursorX = -1;
+	protected static int cursorY = -1;
+	protected static int cursorDX = 0;
+	protected static int cursorDY = 0;
+	protected static boolean touchingScreen = false;
+	protected static boolean touchingScreenNotButton = false;
+	protected static boolean draggingNotTouching = false;
+	protected static boolean touchMode = false;
+
+	public static void init(Minecraft mcIn) {
+		mc = mcIn;
+		oldMX = -1;
+		oldMY = -1;
+		oldTX = -1;
+		oldTY = -1;
+		dragStartX = -1;
+		dragStartY = -1;
+		dragStepStartX = -1;
+		dragStepStartY = -1;
+		dragUID = -1;
+		cursorX = -1;
+		cursorY = -1;
+		cursorDX = 0;
+		cursorDY = 0;
+		touchingScreen = false;
+		touchingScreenNotButton = false;
+		draggingNotTouching = false;
+		touchMode = !mcIn.mouseGrabSupported;
+	}
+
+	public static void runGameLoop() {
+		if(touchMode) {
+			runTouchUpdate();
+		}else {
+			oldTX = -1;
+			oldTY = -1;
+			cursorX = oldMX = Mouse.getX();
+			cursorY = oldMY = Mouse.getY();
+			cursorDX += Mouse.getDX();
+			cursorDY += Mouse.getDY();
+		}
+	}
+
+	private static void runTouchUpdate() {
+		int tc = Touch.touchPointCount();
+		if (tc > 0) {
+			TouchControls.update(true);
+			touchingScreen = true;
+			for(int i = 0; i < tc; ++i) {
+				int uid = Touch.touchPointUID(i);
+				if(TouchControls.touchControls.containsKey(uid)) {
+					continue;
+				}
+				int tx = Touch.touchPointX(i);
+				int ty = Touch.touchPointY(i);
+				if(TouchControls.overlappingControl(tx, ty) != null) {
+					continue;
+				}
+				if(mc.currentScreen == null && mc.ingameGUI.isTouchOverlapEagler(uid, tx, ty)) {
+					continue;
+				}
+				cursorX = oldTX = tx;
+				cursorY = oldTY = ty;
+				oldMX = Mouse.getX();
+				oldMY = Mouse.getY();
+				touchingScreenNotButton = true;
+				runTouchDeltaUpdate(uid);
+				return;
+			}
+			touchingScreenNotButton = false;
+		} else {
+			TouchControls.update(false);
+			touchingScreen = false;
+			touchingScreenNotButton = false;
+			dragStepStartX = -1;
+			dragStepStartY = -1;
+			dragStartX = -1;
+			dragStartY = -1;
+			dragUID = -1;
+			final int tmp = Mouse.getX();
+			final int tmp2 = Mouse.getY();
+			if(oldTX == -1 || oldTY == -1) {
+				cursorX = oldMX = tmp;
+				cursorY = oldMY = tmp2;
+				cursorDX += Mouse.getDX();
+				cursorDY += Mouse.getDY();
+				return;
+			}
+			if (oldMX == -1 || oldMY == -1) {
+				oldMX = tmp;
+				oldMY = tmp2;
+			}
+			if (oldMX == tmp && oldMY == tmp2) {
+				cursorX = oldTX;
+				cursorY = oldTY;
+			}else {
+				cursorX = oldMX = tmp;
+				cursorY = oldMY = tmp2;
+				cursorDX += Mouse.getDX();
+				cursorDY += Mouse.getDY();
+			}
+		}
+	}
+
+	private static void runTouchDeltaUpdate(int uid) {
+		if(uid != dragUID) {
+			dragStartX = oldTX;
+			dragStartY = oldTY;
+			dragStepStartX = -1;
+			dragStepStartY = -1;
+			dragUID = uid;
+			draggingNotTouching = false;
+			return;
+		}
+		if(dragStepStartX != -1) {
+			cursorDX += oldTX - dragStepStartX;
+		}
+		dragStepStartX = oldTX;
+		if(dragStepStartY != -1) {
+			cursorDY += oldTY - dragStepStartY;
+		}
+		dragStepStartY = oldTY;
+		if(dragStartX != -1 && dragStartY != -1) {
+			int dx = oldTX - dragStartX;
+			int dy = oldTY - dragStartY;
+			int len = dx * dx + dy * dy;
+			int dm = Math.max((int)(6 * Display.getDPI()), 2);
+			if(len > dm * dm) {
+				draggingNotTouching = true;
+			}
+		}
+	}
+
+	public static boolean isTouchMode() {
+		return touchMode;
+	}
+
+	public static boolean isTouchingScreen() {
+		return touchingScreen;
+	}
+
+	public static boolean isTouchingScreenNotButton() {
+		return touchingScreenNotButton;
+	}
+
+	public static boolean isDraggingNotTouching() {
+		return draggingNotTouching;
+	}
+
+	public static void enterTouchModeHook() {
+		if(!touchMode) {
+			touchMode = true;
+			if(mc.mouseGrabSupported) {
+				mc.mouseHelper.ungrabMouseCursor();
+			}
+		}
+	}
+
+	public static void enterMouseModeHook() {
+		if(touchMode) {
+			touchMode = false;
+			touchingScreen = false;
+			touchingScreenNotButton = false;
+			if(mc.inGameHasFocus && mc.mouseGrabSupported) {
+				mc.mouseHelper.grabMouseCursor();
+			}
+		}
+	}
+
+	public static int getVCursorX() {
+		return cursorX;
+	}
+
+	public static int getVCursorY() {
+		return cursorY;
+	}
+
+	public static int getVCursorDX() {
+		int tmp = cursorDX;
+		cursorDX = 0;
+		return tmp;
+	}
+
+	public static int getVCursorDY() {
+		int tmp = cursorDY;
+		cursorDY = 0;
+		return tmp;
+	}
+
+	public static boolean getVCursorButtonDown(int bt) {
+		return (touchingScreenNotButton && bt == 0) || Mouse.isButtonDown(bt);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/Touch.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/Touch.java
new file mode 100755
index 0000000..f82bd53
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/Touch.java
@@ -0,0 +1,134 @@
+package net.lax1dude.eaglercraft.v1_8;
+
+import net.lax1dude.eaglercraft.v1_8.internal.EnumTouchEvent;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class Touch {
+
+	public static boolean next() {
+		return PlatformInput.touchNext();
+	}
+
+	public static EnumTouchEvent getEventType() {
+		return PlatformInput.touchGetEventType();
+	}
+
+	public static int getEventTouchPointCount() {
+		return PlatformInput.touchGetEventTouchPointCount();
+	}
+
+	public static int getEventTouchX(int pointId) {
+		return PlatformInput.touchGetEventTouchX(pointId);
+	}
+
+	public static int getEventTouchY(int pointId) {
+		return PlatformInput.touchGetEventTouchY(pointId);
+	}
+
+	public static float getEventTouchRadiusX(int pointId) {
+		return PlatformInput.touchGetEventTouchRadiusX(pointId);
+	}
+
+	public static float getEventTouchRadiusY(int pointId) {
+		return PlatformInput.touchGetEventTouchRadiusY(pointId);
+	}
+
+	public static float getEventTouchRadiusMixed(int pointId) {
+		return PlatformInput.touchGetEventTouchRadiusMixed(pointId);
+	}
+
+	public static float getEventTouchForce(int pointId) {
+		return PlatformInput.touchGetEventTouchForce(pointId);
+	}
+
+	public static int getEventTouchPointUID(int pointId) {
+		return PlatformInput.touchGetEventTouchPointUID(pointId);
+	}
+
+	public static int touchPointCount() {
+		return PlatformInput.touchPointCount();
+	}
+
+	public static int touchPointX(int pointId) {
+		return PlatformInput.touchPointX(pointId);
+	}
+
+	public static int touchPointY(int pointId) {
+		return PlatformInput.touchPointY(pointId);
+	}
+
+	public static float touchPointRadiusX(int pointId) {
+		return PlatformInput.touchRadiusX(pointId);
+	}
+
+	public static float touchPointRadiusY(int pointId) {
+		return PlatformInput.touchRadiusY(pointId);
+	}
+
+	public static float touchPointRadiusMixed(int pointId) {
+		return PlatformInput.touchRadiusMixed(pointId);
+	}
+
+	public static float touchPointForce(int pointId) {
+		return PlatformInput.touchForce(pointId);
+	}
+
+	public static int touchPointUID(int pointId) {
+		return PlatformInput.touchPointUID(pointId);
+	}
+
+	public static void touchSetOpenKeyboardZone(int x, int y, int w, int h) {
+		PlatformInput.touchSetOpenKeyboardZone(x, y, w, h);
+	}
+
+	public static void closeDeviceKeyboard() {
+		PlatformInput.touchCloseDeviceKeyboard();
+	}
+
+	public static boolean isDeviceKeyboardOpenMAYBE() {
+		return PlatformInput.touchIsDeviceKeyboardOpenMAYBE();
+	}
+
+	public static String getPastedString() {
+		return PlatformInput.touchGetPastedString();
+	}
+
+	public static boolean checkPointTouching(int uid) {
+		int cnt = PlatformInput.touchPointCount();
+		if(cnt > 0) {
+			for(int i = 0; i < cnt; ++i) {
+				if(PlatformInput.touchPointUID(i) == uid) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public static int fetchPointIdx(int uid) {
+		int cnt = PlatformInput.touchPointCount();
+		if(cnt > 0) {
+			for(int i = 0; i < cnt; ++i) {
+				if(PlatformInput.touchPointUID(i) == uid) {
+					return i;
+				}
+			}
+		}
+		return -1;
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/boot_menu/GuiScreenEnterBootMenu.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/boot_menu/GuiScreenEnterBootMenu.java
new file mode 100755
index 0000000..eefb309
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/boot_menu/GuiScreenEnterBootMenu.java
@@ -0,0 +1,54 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenEnterBootMenu extends GuiScreen {
+
+	private final GuiScreen parent;
+
+	public GuiScreenEnterBootMenu(GuiScreen parent) {
+		this.parent = parent;
+	}
+
+	public void initGui() {
+		EagRuntime.setDisplayBootMenuNextRefresh(true);
+		this.buttonList.clear();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 96, I18n.format("gui.cancel")));
+	}
+
+	public void onGuiClosed() {
+		EagRuntime.setDisplayBootMenuNextRefresh(false);
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, I18n.format("enterBootMenu.title"), this.width / 2, 70, 11184810);
+		this.drawCenteredString(fontRendererObj, I18n.format("enterBootMenu.text0"), this.width / 2, 90, 16777215);
+		super.drawScreen(par1, par2, par3);
+	}
+
+	protected void actionPerformed(GuiButton par1GuiButton) {
+		if(par1GuiButton.id == 0) {
+			this.mc.displayGuiScreen(parent);
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/cache/EaglerLoadingCache.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/cache/EaglerLoadingCache.java
index 2645fdf..2358ce8 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/cache/EaglerLoadingCache.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/cache/EaglerLoadingCache.java
@@ -25,7 +25,7 @@ public class EaglerLoadingCache<K, V> {
 
 	public EaglerLoadingCache(EaglerCacheProvider<K, V> provider) {
 		this.provider = provider;
-		this.cacheMap = new HashMap();
+		this.cacheMap = new HashMap<>();
 	}
 
 	public V get(K key) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/GuiScreenInspectSessionToken.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/GuiScreenInspectSessionToken.java
new file mode 100755
index 0000000..7606777
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/GuiScreenInspectSessionToken.java
@@ -0,0 +1,84 @@
+package net.lax1dude.eaglercraft.v1_8.cookie;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import net.lax1dude.eaglercraft.v1_8.cookie.ServerCookieDataStore.ServerCookie;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenInspectSessionToken extends GuiScreen {
+
+	private final GuiScreen parent;
+	private final ServerCookie cookie;
+
+	public GuiScreenInspectSessionToken(GuiScreenRevokeSessionToken parent, ServerCookie cookie) {
+		this.parent = parent;
+		this.cookie = cookie;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 106, I18n.format("gui.done")));
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		String[][] toDraw = new String[][] {
+			{
+				I18n.format("inspectSessionToken.details.server"),
+				I18n.format("inspectSessionToken.details.expires"),
+				I18n.format("inspectSessionToken.details.length")
+			},
+			{
+				cookie.server.length() > 32 ? cookie.server.substring(0, 30) + "..." : cookie.server,
+				(new SimpleDateFormat("M/d/yyyy h:mm aa")).format(new Date(cookie.expires)),
+				Integer.toString(cookie.cookie.length)
+			}
+		};
+		int[] maxWidth = new int[2];
+		for(int i = 0; i < 2; ++i) {
+			String[] strs = toDraw[i];
+			int w = 0;
+			for(int j = 0; j < strs.length; ++j) {
+				int k = fontRendererObj.getStringWidth(strs[j]);
+				if(k > w) {
+					w = k;
+				}
+			}
+			maxWidth[i] = w + 10;
+		}
+		int totalWidth = maxWidth[0] + maxWidth[1];
+		this.drawCenteredString(fontRendererObj, I18n.format("inspectSessionToken.title"), this.width / 2, 70, 16777215);
+		this.drawString(fontRendererObj, toDraw[0][0], (this.width - totalWidth) / 2, 90, 11184810);
+		this.drawString(fontRendererObj, toDraw[0][1], (this.width - totalWidth) / 2, 104, 11184810);
+		this.drawString(fontRendererObj, toDraw[0][2], (this.width - totalWidth) / 2, 118, 11184810);
+		this.drawString(fontRendererObj, toDraw[1][0], (this.width - totalWidth) / 2 + maxWidth[0], 90, 11184810);
+		this.drawString(fontRendererObj, toDraw[1][1], (this.width - totalWidth) / 2 + maxWidth[0], 104, 11184810);
+		this.drawString(fontRendererObj, toDraw[1][2], (this.width - totalWidth) / 2 + maxWidth[0], 118, 11184810);
+		super.drawScreen(par1, par2, par3);
+	}
+
+	protected void actionPerformed(GuiButton par1GuiButton) {
+		if(par1GuiButton.id == 0) {
+			this.mc.displayGuiScreen(parent);
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/GuiScreenRevokeSessionToken.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/GuiScreenRevokeSessionToken.java
new file mode 100755
index 0000000..ae4c099
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/GuiScreenRevokeSessionToken.java
@@ -0,0 +1,146 @@
+package net.lax1dude.eaglercraft.v1_8.cookie;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import com.google.common.collect.Lists;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiSlot;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenRevokeSessionToken extends GuiScreen {
+	protected GuiScreen parentScreen;
+	private GuiScreenRevokeSessionToken.List list;
+	private GuiButton inspectButton;
+	private GuiButton revokeButton;
+
+	public GuiScreenRevokeSessionToken(GuiScreen parent) {
+		this.parentScreen = parent;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(this.inspectButton = new GuiButton(10, this.width / 2 - 154, this.height - 38, 100, 20, I18n.format("revokeSessionToken.inspect")));
+		this.buttonList.add(this.revokeButton = new GuiButton(9, this.width / 2 - 50, this.height - 38, 100, 20, I18n.format("revokeSessionToken.revoke")));
+		this.buttonList.add(new GuiButton(6, this.width / 2 + 54, this.height - 38, 100, 20, I18n.format("gui.done")));
+		this.list = new GuiScreenRevokeSessionToken.List(this.mc);
+		this.list.registerScrollButtons(7, 8);
+		updateButtons();
+	}
+
+	public void handleMouseInput() throws IOException {
+		super.handleMouseInput();
+		this.list.handleMouseInput();
+	}
+
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.list.handleTouchInput();
+	}
+
+	protected void actionPerformed(GuiButton parGuiButton) {
+		if (parGuiButton.enabled) {
+			switch (parGuiButton.id) {
+			case 6:
+				this.mc.displayGuiScreen(this.parentScreen);
+				break;
+			case 9:
+				String s1 = list.getSelectedItem();
+				if(s1 != null) {
+					ServerCookieDataStore.ServerCookie cookie = ServerCookieDataStore.loadCookie(s1);
+					if(cookie != null) {
+						this.mc.displayGuiScreen(new GuiScreenSendRevokeRequest(this, cookie));
+					}else {
+						this.initGui();
+					}
+				}
+				break;
+			case 10:
+				String s2 = list.getSelectedItem();
+				if(s2 != null) {
+					ServerCookieDataStore.ServerCookie cookie = ServerCookieDataStore.loadCookie(s2);
+					if(cookie != null) {
+						this.mc.displayGuiScreen(new GuiScreenInspectSessionToken(this, cookie));
+					}else {
+						this.initGui();
+					}
+				}
+				break;
+			default:
+				this.list.actionPerformed(parGuiButton);
+			}
+
+		}
+	}
+
+	protected void updateButtons() {
+		inspectButton.enabled = revokeButton.enabled = list.getSelectedItem() != null;
+	}
+
+	public void drawScreen(int i, int j, float f) {
+		this.list.drawScreen(i, j, f);
+		this.drawCenteredString(this.fontRendererObj, I18n.format("revokeSessionToken.title"), this.width / 2, 16, 16777215);
+		this.drawCenteredString(this.fontRendererObj, I18n.format("revokeSessionToken.note.0"), this.width / 2, this.height - 66, 8421504);
+		this.drawCenteredString(this.fontRendererObj, I18n.format("revokeSessionToken.note.1"), this.width / 2, this.height - 56, 8421504);
+		super.drawScreen(i, j, f);
+	}
+
+	class List extends GuiSlot {
+		private final java.util.List<String> cookieNames = Lists.newArrayList();
+
+		public List(Minecraft mcIn) {
+			super(mcIn, GuiScreenRevokeSessionToken.this.width, GuiScreenRevokeSessionToken.this.height, 32, GuiScreenRevokeSessionToken.this.height - 75 + 4, 18);
+			ServerCookieDataStore.flush();
+			cookieNames.addAll(ServerCookieDataStore.getRevokableServers());
+			Collections.sort(cookieNames);
+		}
+
+		protected int getSize() {
+			return this.cookieNames.size();
+		}
+
+		protected void elementClicked(int i, boolean var2, int var3, int var4) {
+			selectedElement = i;
+			GuiScreenRevokeSessionToken.this.updateButtons();
+		}
+
+		protected boolean isSelected(int i) {
+			return selectedElement == i;
+		}
+
+		protected String getSelectedItem() {
+			return selectedElement == -1 ? null : cookieNames.get(selectedElement);
+		}
+
+		protected int getContentHeight() {
+			return this.getSize() * 18;
+		}
+
+		protected void drawBackground() {
+			GuiScreenRevokeSessionToken.this.drawDefaultBackground();
+		}
+
+		protected void drawSlot(int i, int var2, int j, int var4, int var5, int var6) {
+			GuiScreenRevokeSessionToken.this.drawCenteredString(GuiScreenRevokeSessionToken.this.fontRendererObj,
+					this.cookieNames.get(i), this.width / 2, j + 1, 16777215);
+		}
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/GuiScreenSendRevokeRequest.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/GuiScreenSendRevokeRequest.java
new file mode 100755
index 0000000..3c6dfdb
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/GuiScreenSendRevokeRequest.java
@@ -0,0 +1,177 @@
+package net.lax1dude.eaglercraft.v1_8.cookie;
+
+import org.json.JSONObject;
+
+import net.lax1dude.eaglercraft.v1_8.cookie.ServerCookieDataStore.ServerCookie;
+import net.lax1dude.eaglercraft.v1_8.internal.IServerQuery;
+import net.lax1dude.eaglercraft.v1_8.internal.QueryResponse;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
+import net.lax1dude.eaglercraft.v1_8.socket.ServerQueryDispatch;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenSendRevokeRequest extends GuiScreen {
+
+	private static final Logger logger = LogManager.getLogger("SessionRevokeRequest");
+
+	private GuiScreen parent;
+	private ServerCookie cookie;
+	private String title;
+	private String message;
+	private int timer = 0;
+	private boolean cancelRequested = false;
+	private IServerQuery query = null;
+	private boolean hasSentPacket = false;
+
+	public GuiScreenSendRevokeRequest(GuiScreen parent, ServerCookie cookie) {
+		this.parent = parent;
+		this.cookie = cookie;
+		this.title = I18n.format("revokeSendingScreen.title");
+		this.message = I18n.format("revokeSendingScreen.message.opening", cookie.server);
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 96, I18n.format("gui.cancel")));
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, title, this.width / 2, 70, 11184810);
+		this.drawCenteredString(fontRendererObj, message, this.width / 2, 90, 16777215);
+		super.drawScreen(par1, par2, par3);
+	}
+	
+	public void updateScreen() {
+		++timer;
+		if (timer > 1) {
+			if(query == null) {
+				logger.info("Attempting to revoke session tokens for: {}", cookie.server);
+				query = ServerQueryDispatch.sendServerQuery(cookie.server, "revoke_session_token");
+				if(query == null) {
+					this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeFailure.title", "revokeFailure.desc.connectionError", parent));
+					return;
+				}
+			}else {
+				query.update();
+				QueryResponse resp = query.getResponse();
+				if(resp != null) {
+					if(resp.responseType.equalsIgnoreCase("revoke_session_token") && (hasSentPacket ? resp.isResponseJSON() : resp.isResponseString())) {
+						if(!hasSentPacket) {
+							String str = resp.getResponseString();
+							if("ready".equalsIgnoreCase(str)) {
+								hasSentPacket = true;
+								message = I18n.format("revokeSendingScreen.message.sending");
+								query.send(cookie.cookie);
+								return;
+							}else {
+								this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeFailure.title", "revokeFailure.desc.clientError", parent));
+								return;
+							}
+						}else {
+							JSONObject json = resp.getResponseJSON();
+							String stat = json.optString("status");
+							if("ok".equalsIgnoreCase(stat)) {
+								if(hasSentPacket) {
+									query.close();
+									this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeSuccess.title", "revokeSuccess.desc", parent));
+									ServerCookieDataStore.clearCookie(cookie.server);
+									return;
+								}else {
+									query.close();
+									this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeFailure.title", "revokeFailure.desc.clientError", parent));
+									return;
+								}
+							}else if("error".equalsIgnoreCase(stat)) {
+								int code = json.optInt("code", -1);
+								if(code == -1) {
+									query.close();
+									this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeFailure.title", "revokeFailure.desc.clientError", parent));
+									return;
+								}else {
+									String key;
+									switch(code) {
+									case 1:
+										key = "revokeFailure.desc.notSupported";
+										break;
+									case 2:
+										key = "revokeFailure.desc.notAllowed";
+										break;
+									case 3:
+										key = "revokeFailure.desc.notFound";
+										break;
+									case 4:
+										key = "revokeFailure.desc.serverError";
+										break;
+									default:
+										key = "revokeFailure.desc.genericCode";
+										break;
+									}
+									logger.error("Recieved error code {}! ({})", code, key);
+									query.close();
+									this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeFailure.title", key, parent));
+									if(json.optBoolean("delete", false)) {
+										ServerCookieDataStore.clearCookie(cookie.server);
+									}
+									return;
+								}
+							}else {
+								logger.error("Recieved unknown status \"{}\"!", stat);
+								query.close();
+								this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeFailure.title", "revokeFailure.desc.clientError", parent));
+								return;
+							}
+						}
+					}else {
+						query.close();
+						this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeFailure.title", "revokeFailure.desc.clientError", parent));
+						return;
+					}
+				}
+				if(query.isClosed()) {
+					if(!hasSentPacket || query.responsesAvailable() == 0) {
+						this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeFailure.title", "revokeFailure.desc.connectionError", parent));
+						return;
+					}
+				}else {
+					if(timer > 400) {
+						query.close();
+						this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeFailure.title", "revokeFailure.desc.connectionError", parent));
+						return;
+					}
+				}
+				if(cancelRequested) {
+					query.close();
+					this.mc.displayGuiScreen(new GuiScreenGenericErrorMessage("revokeFailure.title", "revokeFailure.desc.cancelled", parent));
+					return;
+				}
+			}
+		}
+	}
+
+	protected void actionPerformed(GuiButton par1GuiButton) {
+		if(par1GuiButton.id == 0) {
+			cancelRequested = true;
+			par1GuiButton.enabled = false;
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/HardwareFingerprint.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/HardwareFingerprint.java
new file mode 100755
index 0000000..fffbac9
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/HardwareFingerprint.java
@@ -0,0 +1,294 @@
+package net.lax1dude.eaglercraft.v1_8.cookie;
+
+import net.lax1dude.eaglercraft.v1_8.internal.IFramebufferGL;
+import net.lax1dude.eaglercraft.v1_8.internal.IProgramGL;
+import net.lax1dude.eaglercraft.v1_8.internal.IShaderGL;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformAssets;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.opengl.DrawUtils;
+import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
+import net.lax1dude.eaglercraft.v1_8.opengl.GLSLHeader;
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
+import net.lax1dude.eaglercraft.v1_8.opengl.VSHInputLayoutParser;
+import net.minecraft.client.renderer.texture.TextureUtil;
+
+import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
+import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
+import static net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ExtGLEnums.*;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import net.lax1dude.eaglercraft.v1_8.Base64;
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+import net.lax1dude.eaglercraft.v1_8.crypto.GeneralDigest;
+import net.lax1dude.eaglercraft.v1_8.crypto.SHA256Digest;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class HardwareFingerprint {
+	
+	// This is used for generating encryption keys for storing cookies,
+	// its supposed to make session hijacking more difficult for skids
+
+	private static final String fingerprintIMG = "/9j/4AAQSkZJRgABAQEBLAEsAAD//gAKZnVjayBvZmb/4gKwSUNDX1BST0ZJTEUAAQEAAAKgbGNtcwRAAABtbnRyUkdCIFhZWiAH6AAGABAAAgArACNhY3NwTVNGVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLWxjbXMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1kZXNjAAABIAAAAEBjcHJ0AAABYAAAADZ3dHB0AAABmAAAABRjaGFkAAABrAAAACxyWFlaAAAB2AAAABRiWFlaAAAB7AAAABRnWFlaAAACAAAAABRyVFJDAAACFAAAACBnVFJDAAACFAAAACBiVFJDAAACFAAAACBjaHJtAAACNAAAACRkbW5kAAACWAAAACRkbWRkAAACfAAAACRtbHVjAAAAAAAAAAEAAAAMZW5VUwAAACQAAAAcAEcASQBNAFAAIABiAHUAaQBsAHQALQBpAG4AIABzAFIARwBCbWx1YwAAAAAAAAABAAAADGVuVVMAAAAaAAAAHABQAHUAYgBsAGkAYwAgAEQAbwBtAGEAaQBuAABYWVogAAAAAAAA9tYAAQAAAADTLXNmMzIAAAAAAAEMQgAABd7///MlAAAHkwAA/ZD///uh///9ogAAA9wAAMBuWFlaIAAAAAAAAG+gAAA49QAAA5BYWVogAAAAAAAAJJ8AAA+EAAC2xFhZWiAAAAAAAABilwAAt4cAABjZcGFyYQAAAAAAAwAAAAJmZgAA8qcAAA1ZAAAT0AAACltjaHJtAAAAAAADAAAAAKPXAABUfAAATM0AAJmaAAAmZwAAD1xtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAAgAAAAcAEcASQBNAFBtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAAgAAAAcAHMAUgBHAEL/2wBDAAoHBwkHBgoJCAkLCwoMDxkQDw4ODx4WFxIZJCAmJSMgIyIoLTkwKCo2KyIjMkQyNjs9QEBAJjBGS0U+Sjk/QD3/2wBDAQsLCw8NDx0QEB09KSMpPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT3/wgARCACAAIADAREAAhEBAxEB/8QAGwAAAgMBAQEAAAAAAAAAAAAAAQIABAUDBgf/xAAYAQEBAQEBAAAAAAAAAAAAAAAAAQIDBP/aAAwDAQACEAMQAAABx95IwaIRghDRCFCElZ+KQhpghGDRCFCQNEzsUjUQjBDRChCENQJn4pDXfNuSvBBUJYK52Q5ahIZ+KSxLtc9jAcbO8OpA0YENodZpdJWszsUm1z3alHnuBZurO+SA5+PVPTQ7zv0zd1MLpnGzSem49OQIPMeslCpA82ueVj05fcuWdtPCBPW8elGzlRIMFCElOPZoJe0+dx2PR8+mdYoSAFQgFHq3ZsWWa+fxZ01+O6lKgqiWhxRhBQpv6mlXgdS1Loct8kAtcjiWBRxQANHWd+vEw5M67HQghXGO4AEFLms+hrxFhrW49KliDhGAABAALes79eI1CbnHpVshzAQhCEIAmpa3nJCbPHpwsgBRBQBGICrlzd1PN1DW5bSBSgAcxElOpQLo3OtX/8QAJxAAAQQBBAEEAgMAAAAAAAAAAQACAxEQBBITICEUIjAxMkEjNFD/2gAIAQEAAQUC/wBNkZevThcDVwtXC1cAXAuAoxOCMbh2iZyPqsX8HG16lhMXTSMqHAZP6jpI/Y2DVcxCCYA9s8JgfiBtaUq+zm7hHAyLATFqo+TTIeSRUbirVq1uW5bluW4K0FCE/wAilCLmkcirV4tWrVq0HprlD9Y039iQ9JXmMtO5qLqV+MbqWmfuZ+gC4we3UPPnL27mxGkTQaOhWjdhp2Na7cre0h99HsTQT20n5JxtzPzkHksX0rV/BpT7gQcyYpEZvtHbjE8x5PlmT8ELP4ItOGuw3zD3vo32r9f/xAAeEQACAQUAAwAAAAAAAAAAAAAAEQEQIDAxUAIhQP/aAAgBAwEBPwHpoQhCEIQr4qsvjSD2TbEk3Rqr5kb+CN59D7s2RrN//8QAIhEAAQMEAgIDAAAAAAAAAAAAAQACEhARIDEDMBNAIUFQ/9oACAECAQE/Af0ybKSkVIqRU1NSUgrjIm1HuiF5SmulgSAg4UBQN8H050XMiuHA3c5P44fK4zcVBvU7o5odteFqAtg5hBuEZu2mNtUejdfXeAna9B2u/ZRHeEfe33jA77BT/8QAJxAAAQIFAwMFAQAAAAAAAAAAAQARAhAhMDEgQVESImEDUGJxgZH/2gAIAQEABj8C9zosme6yVlUMsamVLVQnzDzoMXNh0zVn0xYKY42M4R+2GK7RoPIrMC6RKD7uvOHTRPZYVUL6umTnW+5TbrurpcZVbHhQ/d6hvngByuuEvyJwnxcPzib8CJNZw3PRg4gf+y//xAAkEAEAAgIBBAIDAQEAAAAAAAABABEQITFBUWFxIIGR8PFQsf/aAAgBAQABPyH/AE39Nd4GbulPd+54X8z9jhK/zHpMWqj8wa1/Xyrenl9QAoUGKcXgwMuFQdx/6oldyOPg7hqsdI6zYXz0qBrFwl/2wF1CXvFKdw5bLfcMh3g29ywwt8SBWWRJaV6wnKc4WhppgIBy6nZwoJ054y0vnrKnqeSB7xXNhc9kKwrXjOMOkdOJK/AKwo5htQdfcXWNvbK1juVGBXYldhV7sLWYuBPTEDZLisKuxC0CfyWOOGAgysrkwFkGMqaGo2zzBjudcb4i71HwzXfZBgRiblS/toGM8GGMeJo64uE47XQR03hBILpNyObZvHXHSAXdENsE8YJu33jKM7M4l4Dg64eIABpTeIibDl65XlB8BcSoy5cOMM3bz+49wcAJq8v6VfJNx1OEvC6uauwL3tBj/9oADAMBAAIAAwAAABD9mRbSTt1t0bIAF+n8iJQX9mluqdyUVE09DAPykEK/iOdbRe8nvNsaLtpZ+CB9RFxmQADt+ChzpmW03P7QNkikzbp/AkyUoZrmRKm2JYrYU5LbJaLJU0pbLQ1Z+klOwjL/xAAeEQEAAgIDAQEBAAAAAAAAAAABABEQICEwMUFAUP/aAAgBAwEBPxD+mJlZWUlZXPaI7C3AXglaVKwhErQcXHALa/CWQVGMSsioYcS2oiQo8i3HDip81qVq5qHpHuWsT1unGHsceIW4ZyS+twtw9jK63R7GeZ+fsDj/xAAfEQEAAgIDAAMBAAAAAAAAAAABABEQISAwMUFQYXH/2gAIAQIBAT8Q+zGL8IrT+IHANyqXP2DYwu8hizh6kW6cKQOBbrC2QNYWr+Mvk1UTQxTWEGpQy7UGAVGyAKOPcKEUahh04uevG+gwW1DlXIxbNHDrIYsJs4dhipUlkoZXWYFE8MJeK6TgdhtqX4cul7PdxbyaXZ4x/8QAJRABAAICAgEEAwADAAAAAAAAAQARITFBUWEQcZGhgbHhwdHw/9oACAEBAAE/EBhCDCEGEGXBhCD6DCEIMIQYQYMGDBhB9CEGDCEGEIMIMNQYegwYTVAtL0TKZ4UEAFjdsNePmS1wj2jHgfiL6Z72lLL9xIJSLqhLcAc5fqG4MuDBiZquXoQIDCA4lXuZ8F9S/iZGJdSw8QggXzHMFjupfG/2OA2aA56fMIMJcZp3wf1+oMd63WI/LNqeSMC9yq1vqaTBxMWXS4ykS/CRRTcE4ekf3GNn/BHMGDmcKrS7yiomtzOywRtvMuubjKtmDTGl52MIthPKAjqXYTiPbtv22fEGZmkB7sxbQUuaKqADe03UvVR52BbYQGDFJOU325g2S35jtRa8wEObK4akp9T3RcfVj+G4QKyH0TwImLaIPZEBLwSagO5YbMQnnXmOKy4WW2ntLn+4sOXwn6ZgTlgVmYxYTuWbLuCByahNMWaIhBT1Oj5i5xfvASx7Z+p0AGTmFsIASbaLfMOXbcJXKHuVcWYsxgBXiFgqY8kuWM0suh49AhbwQiUp8wirdaTATjBHIf1CRqVeuf8AD5Jhihwm2wzQsuHUULmLm10cxwUDiWBGZUdzpxD2g2zyRYDxCZNGOo4gMaE+4pKuLVFMBpzoBddwA5izZ+osHLwRzzFqEIllOf8AcpK2Mrr0VI9MVANBlvzEGSUt6QOUF36AT00Udeg/S3jQx9qH5isgUZobxwlkCVPJi+o4bdR+pcCEhdwgdRYnprC1givIW1+R8So0Sq6vcCVL/wAi+DUo5ihYkuLWiOSkjcMSyxC0AlodEEfALlhHUubF/STqcT//2Q==";
+
+	private static final String shaderPrecision = "precision lowp int;\nprecision mediump float;\nprecision mediump sampler2D;\n";
+
+	private static byte[] fingerprint = null;
+
+	public static final Logger logger = LogManager.getLogger("HardwareFingerprint");
+
+	public static byte[] getFingerprint() {
+		if(fingerprint == null) {
+			try {
+				fingerprint = generateFingerprint();
+			}catch(Throwable t) {
+				fingerprint = new byte[0];
+			}
+			if(fingerprint.length == 0) {
+				logger.error("Failed to calculate hardware fingerprint, server cookies will not be encrypted!");
+			}
+		}
+		return fingerprint;
+	}
+
+	private static byte[] generateFingerprint() {
+		ImageData img = PlatformAssets.loadImageFile(Base64.decodeBase64(fingerprintIMG), "image/jpeg");
+		if(img == null) {
+			logger.error("Input image data is corrupt!");
+			return new byte[0];
+		}
+		
+		int[][] mipmapLevels = TextureUtil.generateMipmapData(7, 128,
+				new int[][] { img.pixels, null, null, null, null, null, null, null });
+		
+		int helperTexture = GlStateManager.generateTexture();
+		GlStateManager.bindTexture(helperTexture);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		TextureUtil.allocateTextureImpl(helperTexture, 7, 128, 128);
+		TextureUtil.uploadTextureMipmap(mipmapLevels, 128, 128, 0, 0, false, false);
+		if(checkAnisotropicFilteringSupport()) {
+			_wglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY, 16.0f);
+		}
+		
+		IShaderGL vert;
+		List<VSHInputLayoutParser.ShaderInput> vertLayout;
+		if(DrawUtils.vshLocal != null) {
+			vert = DrawUtils.vshLocal;
+			vertLayout = DrawUtils.vshLocalLayout;
+		}else {
+			String vshLocalSrc = EagRuntime.getRequiredResourceString("/assets/eagler/glsl/local.vsh");
+			vertLayout = VSHInputLayoutParser.getShaderInputs(vshLocalSrc);
+			vert = _wglCreateShader(GL_VERTEX_SHADER);
+			_wglShaderSource(vert, GLSLHeader.getVertexHeaderCompat(vshLocalSrc, DrawUtils.vertexShaderPrecision));
+			_wglCompileShader(vert);
+			if(_wglGetShaderi(vert, GL_COMPILE_STATUS) != GL_TRUE) {
+				_wglDeleteShader(vert);
+				GlStateManager.deleteTexture(helperTexture);
+				return new byte[0];
+			}
+		}
+		
+		IShaderGL frag = _wglCreateShader(GL_FRAGMENT_SHADER);
+		_wglShaderSource(frag, GLSLHeader.getFragmentHeaderCompat(EagRuntime.getRequiredResourceString("/assets/eagler/glsl/hw_fingerprint.fsh"), shaderPrecision));
+		_wglCompileShader(frag);
+		if(_wglGetShaderi(frag, GL_COMPILE_STATUS) != GL_TRUE) {
+			_wglDeleteShader(vert);
+			_wglDeleteShader(frag);
+			GlStateManager.deleteTexture(helperTexture);
+			return new byte[0];
+		}
+		
+		IProgramGL program = _wglCreateProgram();
+		
+		_wglAttachShader(program, vert);
+		_wglAttachShader(program, frag);
+
+		if(EaglercraftGPU.checkOpenGLESVersion() == 200) {
+			VSHInputLayoutParser.applyLayout(program, vertLayout);
+		}
+
+		_wglLinkProgram(program);
+		_wglDetachShader(program, vert);
+		_wglDetachShader(program, frag);
+		if(DrawUtils.vshLocal == null) {
+			_wglDeleteShader(vert);
+		}
+		_wglDeleteShader(frag);
+		
+		if(_wglGetProgrami(program, GL_LINK_STATUS) != GL_TRUE) {
+			_wglDeleteProgram(program);
+			GlStateManager.deleteTexture(helperTexture);
+			return new byte[0];
+		}
+		
+		EaglercraftGPU.bindGLShaderProgram(program);
+		_wglUniform1i(_wglGetUniformLocation(program, "u_inputTexture"), 0);
+		
+		float fovy = 90.0f;
+		float aspect = 1.0f;
+		float zNear = 0.01f;
+		float zFar = 100.0f;
+		FloatBuffer matrixUploadBuffer = EagRuntime.allocateFloatBuffer(16);
+		float toRad = 0.0174532925f;
+		float cotangent = (float) Math.cos(fovy * toRad * 0.5f) / (float) Math.sin(fovy * toRad * 0.5f);
+		
+		matrixUploadBuffer.put(cotangent / aspect);
+		matrixUploadBuffer.put(0.0f);
+		matrixUploadBuffer.put(0.0f);
+		matrixUploadBuffer.put(0.0f);
+		matrixUploadBuffer.put(0.0f);
+		matrixUploadBuffer.put(cotangent);
+		matrixUploadBuffer.put(0.0f);
+		matrixUploadBuffer.put(0.0f);
+		matrixUploadBuffer.put(0.0f);
+		matrixUploadBuffer.put(0.0f);
+		matrixUploadBuffer.put((zFar + zNear) / (zFar - zNear));
+		matrixUploadBuffer.put(2.0f * zFar * zNear / (zFar - zNear));
+		matrixUploadBuffer.put(0.0f);
+		matrixUploadBuffer.put(0.0f);
+		matrixUploadBuffer.put(-1.0f);
+		matrixUploadBuffer.put(0.0f);
+		
+		matrixUploadBuffer.flip();
+		_wglUniformMatrix4fv(_wglGetUniformLocation(program, "u_textureMatrix"), false, matrixUploadBuffer);
+		EagRuntime.freeFloatBuffer(matrixUploadBuffer);
+		
+		int[] oldViewport = new int[4];
+		EaglercraftGPU.glGetInteger(GL_VIEWPORT, oldViewport);
+		IFramebufferGL framebuffer = _wglCreateFramebuffer();
+		int renderTexture = GlStateManager.generateTexture();
+		GlStateManager.bindTexture(renderTexture);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+		
+		int dataLength;
+		int type;
+		if(EaglercraftGPU.checkHDRFramebufferSupport(32)) {
+			dataLength = 256 * 256 * 4 * 4;
+			type = GL_FLOAT;
+			EaglercraftGPU.createFramebufferHDR32FTexture(GL_TEXTURE_2D, 0, 256, 256, GL_RGBA, false);
+		}else if(EaglercraftGPU.checkHDRFramebufferSupport(16)) {
+			dataLength = 256 * 256 * 4 * 2;
+			type = _GL_HALF_FLOAT;
+			EaglercraftGPU.createFramebufferHDR16FTexture(GL_TEXTURE_2D, 0, 256, 256, GL_RGBA, false);
+		}else {
+			dataLength = 256 * 256 * 4;
+			type = GL_UNSIGNED_BYTE;
+			EaglercraftGPU.glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, (ByteBuffer)null);
+		}
+		
+		_wglBindFramebuffer(_GL_FRAMEBUFFER, framebuffer);
+		_wglFramebufferTexture2D(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, EaglercraftGPU.getNativeTexture(renderTexture), 0);
+		_wglDrawBuffers(_GL_COLOR_ATTACHMENT0);
+		
+		GlStateManager.viewport(0, 0, 256, 256);
+		GlStateManager.disableBlend();
+		GlStateManager.bindTexture(helperTexture);
+		
+		DrawUtils.drawStandardQuad2D();
+		
+		_wglDeleteProgram(program);
+		GlStateManager.deleteTexture(helperTexture);
+		
+		ByteBuffer readBuffer = EagRuntime.allocateByteBuffer(dataLength);
+		EaglercraftGPU.glReadPixels(0, 0, 256, 256, GL_RGBA, type, readBuffer);
+		
+		_wglBindFramebuffer(_GL_FRAMEBUFFER, null);
+		_wglDeleteFramebuffer(framebuffer);
+		GlStateManager.deleteTexture(renderTexture);
+		GlStateManager.viewport(oldViewport[0], oldViewport[1], oldViewport[2], oldViewport[3]);
+		
+		SHA256Digest digest = new SHA256Digest();
+		byte[] copyBuffer = new byte[1024];
+		
+		byte[] b = ("eag" + EaglercraftGPU.glGetString(GL_VENDOR) + "; eag " + EaglercraftGPU.glGetString(GL_RENDERER)).getBytes(StandardCharsets.UTF_8);
+		digest.update(b, 0, b.length);
+		
+		digestInts(digest, _wglGetInteger(0x8869), _wglGetInteger(0x8DFB), _wglGetInteger(0x8B4C), _wglGetInteger(0x8DFC), copyBuffer);
+		digestInts(digest, _wglGetInteger(0x8DFD), _wglGetInteger(0x8872), _wglGetInteger(0x84E8), 69, copyBuffer);
+		digestInts(digest, _wglGetInteger(0x0D33), _wglGetInteger(0x851C), _wglGetInteger(0x8B4D), 69, copyBuffer);
+		
+		if(EaglercraftGPU.checkOpenGLESVersion() >= 300) {
+			digestInts(digest, _wglGetInteger(0x8B4A), _wglGetInteger(0x8A2B), _wglGetInteger(0x9122), _wglGetInteger(0x8B4B), copyBuffer);
+			digestInts(digest, _wglGetInteger(0x8C8A), _wglGetInteger(0x8C8B), _wglGetInteger(0x8C80), _wglGetInteger(0x8B49), copyBuffer);
+			digestInts(digest, _wglGetInteger(0x8A2D), _wglGetInteger(0x9125), _wglGetInteger(0x8904), _wglGetInteger(0x8905), copyBuffer);
+			digestInts(digest, _wglGetInteger(0x8824), _wglGetInteger(0x8073), _wglGetInteger(0x88FF), _wglGetInteger(0x84FD), copyBuffer);
+			digestInts(digest, _wglGetInteger(0x8CDF), _wglGetInteger(0x8A2F), _wglGetInteger(0x8A30), _wglGetInteger(0x8A34), copyBuffer);
+			digestInts(digest, _wglGetInteger(0x8A2E),  _wglGetInteger(0x8A31), _wglGetInteger(0x8A33), _wglGetInteger(0x8D57), copyBuffer);
+		}
+		
+		try {
+			List<String> exts = Lists.newArrayList(getAllExtensions());
+			Collections.sort(exts);
+			EaglercraftRandom rand = new EaglercraftRandom(6942069420l + exts.size() * 69l + b.length);
+			for (int i = exts.size() - 1; i > 0; --i) {
+				int j = rand.nextInt(i + 1);
+				Collections.swap(exts, i, j);
+			}
+			b = String.join(":>", exts).getBytes(StandardCharsets.UTF_8);
+			digest.update(b, 0, b.length);
+		}catch(Throwable t) {
+		}
+		
+		int i;
+		while(readBuffer.hasRemaining()) {
+			i = Math.min(readBuffer.remaining(), copyBuffer.length);
+			readBuffer.get(copyBuffer, 0, i);
+			digest.update(copyBuffer, 0, i);
+		}
+		
+		EagRuntime.freeByteBuffer(readBuffer);
+		
+		byte[] hashOut = new byte[32];
+		digest.doFinal(hashOut, 0);
+		
+		return hashOut;
+	}
+
+	private static void digestInts(GeneralDigest digest, int i1, int i2, int i3, int i4, byte[] tmpBuffer) {
+		tmpBuffer[0] = (byte)(i1 >>> 24);
+		tmpBuffer[1] = (byte)(i1 >>> 16);
+		tmpBuffer[2] = (byte)(i1 >>> 8);
+		tmpBuffer[3] = (byte)(i1 & 0xFF);
+		tmpBuffer[4] = (byte)(i2 >>> 24);
+		tmpBuffer[5] = (byte)(i2 >>> 16);
+		tmpBuffer[6] = (byte)(i2 >>> 8);
+		tmpBuffer[7] = (byte)(i2 & 0xFF);
+		tmpBuffer[8] = (byte)(i3 >>> 24);
+		tmpBuffer[9] = (byte)(i3 >>> 16);
+		tmpBuffer[10] = (byte)(i3 >>> 8);
+		tmpBuffer[11] = (byte)(i3 & 0xFF);
+		tmpBuffer[12] = (byte)(i4 >>> 24);
+		tmpBuffer[13] = (byte)(i4 >>> 16);
+		tmpBuffer[14] = (byte)(i4 >>> 8);
+		tmpBuffer[15] = (byte)(i4 & 0xFF);
+		digest.update(tmpBuffer, 0, 16);
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/ServerCookieDataStore.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/ServerCookieDataStore.java
new file mode 100755
index 0000000..eff0d63
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/cookie/ServerCookieDataStore.java
@@ -0,0 +1,396 @@
+package net.lax1dude.eaglercraft.v1_8.cookie;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
+import net.lax1dude.eaglercraft.v1_8.crypto.AESLightEngine;
+import net.lax1dude.eaglercraft.v1_8.crypto.SHA1Digest;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ServerCookieDataStore {
+
+	private static final Logger logger = LogManager.getLogger("ServerCookieDataStore");
+
+	private static final Map<String,ServerCookie> dataStore = new HashMap<>();
+
+	public static final String localStorageKey = "c";
+
+	public static class ServerCookie {
+
+		public final String server;
+		public final byte[] cookie;
+		public final long expires;
+		public final boolean revokeQuerySupported;
+		public final boolean saveCookieToDisk;
+
+		public ServerCookie(String server, byte[] cookie, long expires, boolean revokeQuerySupported, boolean saveCookieToDisk) {
+			this.server = server;
+			this.cookie = cookie;
+			this.expires = expires;
+			this.revokeQuerySupported = revokeQuerySupported;
+			this.saveCookieToDisk = saveCookieToDisk;
+		}
+
+	}
+
+	public static void load() {
+		if(EagRuntime.getConfiguration().isEnableServerCookies()) {
+			loadData(HardwareFingerprint.getFingerprint());
+		}
+	}
+
+	public static ServerCookie loadCookie(String server) {
+		if(!EagRuntime.getConfiguration().isEnableServerCookies()) {
+			return null;
+		}
+		server = normalize(server);
+		ServerCookie cookie = dataStore.get(server);
+		if(cookie == null) {
+			return null;
+		}
+		long timestamp = System.currentTimeMillis();
+		if(timestamp > cookie.expires) {
+			dataStore.remove(server);
+			saveData(HardwareFingerprint.getFingerprint());
+			return null;
+		}
+		return cookie;
+	}
+
+	public static void saveCookie(String server, long expires, byte[] data, boolean revokeQuerySupported, boolean saveCookieToDisk) {
+		if(!EagRuntime.getConfiguration().isEnableServerCookies()) {
+			return;
+		}
+		server = normalize(server);
+		if(expires > 604800l) {
+			clearCookie(server);
+			logger.error("Server \"{}\" tried to set a cookie for {} days! (The max is 7 days)", server, (expires / 604800l));
+			return;
+		}
+		if(data.length > 255) {
+			clearCookie(server);
+			logger.error("Server \"{}\" tried to set a {} byte cookie! (The max length is 255 bytes)", server, data.length);
+			return;
+		}
+		if(expires < 0l || data.length == 0) {
+			clearCookie(server);
+			return;
+		}
+		long expiresRelative = System.currentTimeMillis() + expires * 1000l;
+		dataStore.put(server, new ServerCookie(server, data, expiresRelative, revokeQuerySupported, saveCookieToDisk));
+		saveData(HardwareFingerprint.getFingerprint());
+	}
+
+	public static void clearCookie(String server) {
+		if(!EagRuntime.getConfiguration().isEnableServerCookies()) {
+			return;
+		}
+		if(dataStore.remove(normalize(server)) != null) {
+			saveData(HardwareFingerprint.getFingerprint());
+		}
+	}
+
+	public static void clearCookiesLow() {
+		dataStore.clear();
+	}
+
+	private static String normalize(String server) {
+		int j = server.indexOf('/');
+		if(j != -1) {
+			int i = server.indexOf("://");
+			if(i != -1) {
+				j = server.indexOf('/', i + 3);
+				if(j == -1) {
+					return server.toLowerCase();
+				}else {
+					return server.substring(0, j).toLowerCase() + server.substring(j);
+				}
+			}else {
+				return server.substring(0, j).toLowerCase() + server.substring(j);
+			}
+		}else {
+			return server.toLowerCase();
+		}
+	}
+
+	public static Set<String> getAllServers() {
+		return dataStore.keySet();
+	}
+
+	public static List<String> getRevokableServers() {
+		List<String> ret = new ArrayList<>(dataStore.size());
+		for(ServerCookie c : dataStore.values()) {
+			if(c.revokeQuerySupported) {
+				ret.add(c.server);
+			}
+		}
+		return ret;
+	}
+
+	public static int size() {
+		return dataStore.size();
+	}
+
+	public static int numRevokable() {
+		int i = 0;
+		for(ServerCookie c : dataStore.values()) {
+			if(c.revokeQuerySupported) {
+				++i;
+			}
+		}
+		return i;
+	}
+
+	public static void flush() {
+		Iterator<ServerCookie> itr = dataStore.values().iterator();
+		boolean changed = false;
+		while(itr.hasNext()) {
+			long timestamp = System.currentTimeMillis();
+			ServerCookie cookie = itr.next();
+			if(timestamp > cookie.expires) {
+				itr.remove();
+				changed = true;
+			}
+		}
+		if(changed) {
+			saveData(HardwareFingerprint.getFingerprint());
+		}
+	}
+
+	private static void loadData(byte[] key) {
+		dataStore.clear();
+		byte[] cookiesTag = PlatformApplication.getLocalStorage(localStorageKey, false);
+		if(cookiesTag == null) {
+			return;
+		}
+		if(cookiesTag.length <= 25) {
+			PlatformApplication.setLocalStorage(localStorageKey, null, false);
+			return;
+		}
+		try {
+			byte[] decrypted;
+			int decryptedLen;
+			switch(cookiesTag[0]) {
+			case 2:
+				if(key == null || key.length == 0) {
+					throw new IOException("Data is encrypted!");
+				}
+				decrypted = new byte[cookiesTag.length - 5];
+				decryptedLen = (cookiesTag[1] << 24) | (cookiesTag[2] << 16) | (cookiesTag[3] << 8) | (cookiesTag[4] & 0xFF);
+				if(decryptedLen < 25) {
+					throw new IOException("too short!");
+				}
+				AESLightEngine aes = new AESLightEngine();
+				aes.init(false, key);
+				int bs = aes.getBlockSize();
+				if(decrypted.length % bs != 0) {
+					throw new IOException("length not aligned to block size!");
+				}
+				byte[] cbcHelper = new byte[] { (byte) 29, (byte) 163, (byte) 4, (byte) 20, (byte) 207, (byte) 26,
+						(byte) 140, (byte) 55, (byte) 246, (byte) 250, (byte) 141, (byte) 183, (byte) 153, (byte) 154,
+						(byte) 59, (byte) 4 };
+				for(int i = 0; i < decryptedLen; i += bs) {
+					processBlockDecryptHelper(aes, cookiesTag, 5 + i, decrypted, i, bs, Math.min(decryptedLen - i, bs), cbcHelper);
+				}
+				if(decrypted[0] != (byte)0x69) {
+					throw new IOException("Data is corrupt!");
+				}
+				break;
+			case 1:
+				if(key != null && key.length > 0) {
+					throw new IOException("Data isn't encrypted!");
+				}
+				decrypted = cookiesTag;
+				decryptedLen = cookiesTag.length;
+				break;
+			default:
+				throw new IOException("Unknown type!");
+			}
+			SHA1Digest digest = new SHA1Digest();
+			digest.update(decrypted, 25, decryptedLen - 25);
+			byte[] digestOut = new byte[20];
+			digest.doFinal(digestOut, 0);
+			for(int i = 0; i < 20; ++i) {
+				if(digestOut[i] != decrypted[5 + i]) {
+					throw new IOException("Invalid checksum!");
+				}
+			}
+			int decompressedLen = (decrypted[1] << 24) | (decrypted[2] << 16) | (decrypted[3] << 8) | (decrypted[4] & 0xFF);
+			byte[] decompressed = new byte[decompressedLen];
+			try (InputStream zstream = EaglerZLIB.newInflaterInputStream(new EaglerInputStream(decrypted, 25, decryptedLen - 25))) {
+				int i = 0, j;
+				while(i < decompressedLen && (j = zstream.read(decompressed, i, decompressedLen - i)) != -1) {
+					i += j;
+				}
+				if(i != decompressedLen) {
+					throw new IOException("Length does not match!");
+				}
+			}
+			DataInputStream dis = new DataInputStream(new EaglerInputStream(decompressed));
+			int readCount = dis.readInt();
+			long time = System.currentTimeMillis();
+			for(int i = 0; i < readCount; ++i) {
+				byte flags = dis.readByte();
+				long expires = dis.readLong();
+				int len = dis.readUnsignedShort();
+				String server = dis.readUTF();
+				if(len == 0) {
+					continue;
+				}
+				if(expires < time) {
+					dis.skipBytes(len);
+					continue;
+				}
+				byte[] cookieData = new byte[len];
+				dis.readFully(cookieData);
+				server = normalize(server);
+				dataStore.put(server, new ServerCookie(server, cookieData, expires, (flags & 1) != 0, (flags & 2) != 0));
+			}
+			if(dis.available() > 0) {
+				throw new IOException("Extra bytes remaining!");
+			}
+		}catch (IOException e) {
+			dataStore.clear();
+			PlatformApplication.setLocalStorage(localStorageKey, null, false);
+			return;
+		}
+	}
+
+	private static void saveData(byte[] key) {
+		Iterator<ServerCookie> itr = dataStore.values().iterator();
+		List<ServerCookie> toSave = new ArrayList<>(dataStore.size());
+		while(itr.hasNext()) {
+			long timestamp = System.currentTimeMillis();
+			ServerCookie cookie = itr.next();
+			if(timestamp > cookie.expires || cookie.cookie.length > 255 || cookie.cookie.length == 0) {
+				itr.remove();
+			}else if(cookie.saveCookieToDisk) {
+				toSave.add(cookie);
+			}
+		}
+		if(toSave.size() == 0) {
+			PlatformApplication.setLocalStorage(localStorageKey, null, false);
+		}else {
+			EaglerOutputStream bao = new EaglerOutputStream(1024);
+			bao.skipBytes(25);
+			int totalUncompressedLen;
+			try(DataOutputStream zstream = new DataOutputStream(EaglerZLIB.newDeflaterOutputStream(bao))) {
+				zstream.writeInt(dataStore.size());
+				for(Entry<String,ServerCookie> etr : dataStore.entrySet()) {
+					ServerCookie cookie = etr.getValue();
+					zstream.writeByte((cookie.revokeQuerySupported ? 1 : 0) | (cookie.saveCookieToDisk ? 2 : 0));
+					zstream.writeLong(cookie.expires);
+					zstream.writeShort(cookie.cookie.length);
+					zstream.writeUTF(etr.getKey());
+					zstream.write(cookie.cookie);
+				}
+				totalUncompressedLen = zstream.size();
+			} catch (IOException e) {
+				logger.error("Failed to write cookies to local storage!");
+				return;
+			}
+			byte[] toEncrypt = bao.toByteArray();
+			SHA1Digest hash = new SHA1Digest();
+			hash.update(toEncrypt, 25, toEncrypt.length - 25);
+			hash.doFinal(toEncrypt, 5);
+			toEncrypt[1] = (byte)(totalUncompressedLen >>> 24);
+			toEncrypt[2] = (byte)(totalUncompressedLen >>> 16);
+			toEncrypt[3] = (byte)(totalUncompressedLen >>> 8);
+			toEncrypt[4] = (byte)(totalUncompressedLen & 0xFF);
+			if(key != null && key.length > 0) {
+				toEncrypt[0] = (byte)0x69;
+				AESLightEngine aes = new AESLightEngine();
+				aes.init(true, key);
+				int bs = aes.getBlockSize();
+				int blockCount = (toEncrypt.length % bs) != 0 ? (toEncrypt.length / bs + 1) : (toEncrypt.length / bs);
+				byte[] encrypted = new byte[blockCount * bs + 5];
+				encrypted[0] = (byte)2;
+				encrypted[1] = (byte)(toEncrypt.length >>> 24);
+				encrypted[2] = (byte)(toEncrypt.length >>> 16);
+				encrypted[3] = (byte)(toEncrypt.length >>> 8);
+				encrypted[4] = (byte)(toEncrypt.length & 0xFF);
+				byte[] cbcHelper = new byte[] { (byte) 29, (byte) 163, (byte) 4, (byte) 20, (byte) 207, (byte) 26,
+						(byte) 140, (byte) 55, (byte) 246, (byte) 250, (byte) 141, (byte) 183, (byte) 153, (byte) 154,
+						(byte) 59, (byte) 4 };
+				for(int i = 0; i < toEncrypt.length; i += bs) {
+					processBlockEncryptHelper(aes, toEncrypt, i, encrypted, 5 + i, bs, cbcHelper);
+				}
+				PlatformApplication.setLocalStorage(localStorageKey, encrypted, false);
+			}else {
+				toEncrypt[0] = (byte)1;
+				PlatformApplication.setLocalStorage(localStorageKey, toEncrypt, false);
+			}
+		}
+	}
+
+	private static void processBlockEncryptHelper(AESLightEngine aes, byte[] in, int inOff, byte[] out, int outOff,
+			int len, byte[] cbcHelper) {
+		int clampedBlockLength = Math.min(in.length - inOff, len);
+		if(clampedBlockLength == len) {
+			for(int i = 0; i < len; ++i) {
+				in[i + inOff] ^= cbcHelper[i];
+			}
+			aes.processBlock(in, inOff, out, outOff);
+			System.arraycopy(out, outOff, cbcHelper, 0, len);
+		}else {
+			byte[] paddedBlock = new byte[len];
+			System.arraycopy(in, inOff, paddedBlock, 0, clampedBlockLength);
+			byte padValue = (byte)(len - clampedBlockLength);
+			for(byte i = 0; i < padValue; ++i) {
+				paddedBlock[clampedBlockLength + i] = padValue;
+			}
+			for(int i = 0; i < len; ++i) {
+				paddedBlock[i] ^= cbcHelper[i];
+			}
+			aes.processBlock(paddedBlock, 0, out, outOff);
+		}
+	}
+
+	private static void processBlockDecryptHelper(AESLightEngine aes, byte[] in, int inOff, byte[] out, int outOff,
+			int paddedLen, int unpaddedLen, byte[] cbcHelper) throws IOException {
+		aes.processBlock(in, inOff, out, outOff);
+		for(int i = 0; i < paddedLen; ++i) {
+			out[i + outOff] ^= cbcHelper[i];
+		}
+		if(unpaddedLen == paddedLen) {
+			System.arraycopy(in, inOff, cbcHelper, 0, paddedLen);
+		}else {
+			byte padValue = (byte)(paddedLen - unpaddedLen);
+			for(byte i = 0; i < padValue; ++i) {
+				if(out[outOff + unpaddedLen + i] != padValue) {
+					throw new IOException("Invalid padding!");
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/crypto/AESLightEngine.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/crypto/AESLightEngine.java
new file mode 100755
index 0000000..d5f5ee7
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/crypto/AESLightEngine.java
@@ -0,0 +1,527 @@
+/*
+ * Copyright (c) 2000-2021 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
+ * and associated documentation files (the "Software"), to deal in the Software without restriction, 
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
+
+package net.lax1dude.eaglercraft.v1_8.crypto;
+
+/**
+ * an implementation of the AES (Rijndael), from FIPS-197.
+ * <p>
+ * For further details see: <a href="https://csrc.nist.gov/encryption/aes/">https://csrc.nist.gov/encryption/aes/</a>.
+ *
+ * This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at
+ * <a href="https://fp.gladman.plus.com/cryptography_technology/rijndael/">https://fp.gladman.plus.com/cryptography_technology/rijndael/</a>
+ *
+ * There are three levels of tradeoff of speed vs memory
+ * Because java has no preprocessor, they are written as three separate classes from which to choose
+ *
+ * The fastest uses 8Kbytes of static tables to precompute round calculations, 4 256 word tables for encryption
+ * and 4 for decryption.
+ *
+ * The middle performance version uses only one 256 word table for each, for a total of 2Kbytes,
+ * adding 12 rotate operations per round to compute the values contained in the other tables from
+ * the contents of the first
+ *
+ * The slowest version uses no static tables at all and computes the values
+ * in each round.
+ * <p>
+ * This file contains the slowest performance version with no static tables
+ * for round precomputation, but it has the smallest foot print.
+ *
+ */
+public class AESLightEngine {
+	// The S box
+	private static final byte[] S = { (byte) 99, (byte) 124, (byte) 119, (byte) 123, (byte) 242, (byte) 107, (byte) 111,
+			(byte) 197, (byte) 48, (byte) 1, (byte) 103, (byte) 43, (byte) 254, (byte) 215, (byte) 171, (byte) 118,
+			(byte) 202, (byte) 130, (byte) 201, (byte) 125, (byte) 250, (byte) 89, (byte) 71, (byte) 240, (byte) 173,
+			(byte) 212, (byte) 162, (byte) 175, (byte) 156, (byte) 164, (byte) 114, (byte) 192, (byte) 183, (byte) 253,
+			(byte) 147, (byte) 38, (byte) 54, (byte) 63, (byte) 247, (byte) 204, (byte) 52, (byte) 165, (byte) 229,
+			(byte) 241, (byte) 113, (byte) 216, (byte) 49, (byte) 21, (byte) 4, (byte) 199, (byte) 35, (byte) 195,
+			(byte) 24, (byte) 150, (byte) 5, (byte) 154, (byte) 7, (byte) 18, (byte) 128, (byte) 226, (byte) 235,
+			(byte) 39, (byte) 178, (byte) 117, (byte) 9, (byte) 131, (byte) 44, (byte) 26, (byte) 27, (byte) 110,
+			(byte) 90, (byte) 160, (byte) 82, (byte) 59, (byte) 214, (byte) 179, (byte) 41, (byte) 227, (byte) 47,
+			(byte) 132, (byte) 83, (byte) 209, (byte) 0, (byte) 237, (byte) 32, (byte) 252, (byte) 177, (byte) 91,
+			(byte) 106, (byte) 203, (byte) 190, (byte) 57, (byte) 74, (byte) 76, (byte) 88, (byte) 207, (byte) 208,
+			(byte) 239, (byte) 170, (byte) 251, (byte) 67, (byte) 77, (byte) 51, (byte) 133, (byte) 69, (byte) 249,
+			(byte) 2, (byte) 127, (byte) 80, (byte) 60, (byte) 159, (byte) 168, (byte) 81, (byte) 163, (byte) 64,
+			(byte) 143, (byte) 146, (byte) 157, (byte) 56, (byte) 245, (byte) 188, (byte) 182, (byte) 218, (byte) 33,
+			(byte) 16, (byte) 255, (byte) 243, (byte) 210, (byte) 205, (byte) 12, (byte) 19, (byte) 236, (byte) 95,
+			(byte) 151, (byte) 68, (byte) 23, (byte) 196, (byte) 167, (byte) 126, (byte) 61, (byte) 100, (byte) 93,
+			(byte) 25, (byte) 115, (byte) 96, (byte) 129, (byte) 79, (byte) 220, (byte) 34, (byte) 42, (byte) 144,
+			(byte) 136, (byte) 70, (byte) 238, (byte) 184, (byte) 20, (byte) 222, (byte) 94, (byte) 11, (byte) 219,
+			(byte) 224, (byte) 50, (byte) 58, (byte) 10, (byte) 73, (byte) 6, (byte) 36, (byte) 92, (byte) 194,
+			(byte) 211, (byte) 172, (byte) 98, (byte) 145, (byte) 149, (byte) 228, (byte) 121, (byte) 231, (byte) 200,
+			(byte) 55, (byte) 109, (byte) 141, (byte) 213, (byte) 78, (byte) 169, (byte) 108, (byte) 86, (byte) 244,
+			(byte) 234, (byte) 101, (byte) 122, (byte) 174, (byte) 8, (byte) 186, (byte) 120, (byte) 37, (byte) 46,
+			(byte) 28, (byte) 166, (byte) 180, (byte) 198, (byte) 232, (byte) 221, (byte) 116, (byte) 31, (byte) 75,
+			(byte) 189, (byte) 139, (byte) 138, (byte) 112, (byte) 62, (byte) 181, (byte) 102, (byte) 72, (byte) 3,
+			(byte) 246, (byte) 14, (byte) 97, (byte) 53, (byte) 87, (byte) 185, (byte) 134, (byte) 193, (byte) 29,
+			(byte) 158, (byte) 225, (byte) 248, (byte) 152, (byte) 17, (byte) 105, (byte) 217, (byte) 142, (byte) 148,
+			(byte) 155, (byte) 30, (byte) 135, (byte) 233, (byte) 206, (byte) 85, (byte) 40, (byte) 223, (byte) 140,
+			(byte) 161, (byte) 137, (byte) 13, (byte) 191, (byte) 230, (byte) 66, (byte) 104, (byte) 65, (byte) 153,
+			(byte) 45, (byte) 15, (byte) 176, (byte) 84, (byte) 187, (byte) 22, };
+
+	// The inverse S-box
+	private static final byte[] Si = { (byte) 82, (byte) 9, (byte) 106, (byte) 213, (byte) 48, (byte) 54, (byte) 165,
+			(byte) 56, (byte) 191, (byte) 64, (byte) 163, (byte) 158, (byte) 129, (byte) 243, (byte) 215, (byte) 251,
+			(byte) 124, (byte) 227, (byte) 57, (byte) 130, (byte) 155, (byte) 47, (byte) 255, (byte) 135, (byte) 52,
+			(byte) 142, (byte) 67, (byte) 68, (byte) 196, (byte) 222, (byte) 233, (byte) 203, (byte) 84, (byte) 123,
+			(byte) 148, (byte) 50, (byte) 166, (byte) 194, (byte) 35, (byte) 61, (byte) 238, (byte) 76, (byte) 149,
+			(byte) 11, (byte) 66, (byte) 250, (byte) 195, (byte) 78, (byte) 8, (byte) 46, (byte) 161, (byte) 102,
+			(byte) 40, (byte) 217, (byte) 36, (byte) 178, (byte) 118, (byte) 91, (byte) 162, (byte) 73, (byte) 109,
+			(byte) 139, (byte) 209, (byte) 37, (byte) 114, (byte) 248, (byte) 246, (byte) 100, (byte) 134, (byte) 104,
+			(byte) 152, (byte) 22, (byte) 212, (byte) 164, (byte) 92, (byte) 204, (byte) 93, (byte) 101, (byte) 182,
+			(byte) 146, (byte) 108, (byte) 112, (byte) 72, (byte) 80, (byte) 253, (byte) 237, (byte) 185, (byte) 218,
+			(byte) 94, (byte) 21, (byte) 70, (byte) 87, (byte) 167, (byte) 141, (byte) 157, (byte) 132, (byte) 144,
+			(byte) 216, (byte) 171, (byte) 0, (byte) 140, (byte) 188, (byte) 211, (byte) 10, (byte) 247, (byte) 228,
+			(byte) 88, (byte) 5, (byte) 184, (byte) 179, (byte) 69, (byte) 6, (byte) 208, (byte) 44, (byte) 30,
+			(byte) 143, (byte) 202, (byte) 63, (byte) 15, (byte) 2, (byte) 193, (byte) 175, (byte) 189, (byte) 3,
+			(byte) 1, (byte) 19, (byte) 138, (byte) 107, (byte) 58, (byte) 145, (byte) 17, (byte) 65, (byte) 79,
+			(byte) 103, (byte) 220, (byte) 234, (byte) 151, (byte) 242, (byte) 207, (byte) 206, (byte) 240, (byte) 180,
+			(byte) 230, (byte) 115, (byte) 150, (byte) 172, (byte) 116, (byte) 34, (byte) 231, (byte) 173, (byte) 53,
+			(byte) 133, (byte) 226, (byte) 249, (byte) 55, (byte) 232, (byte) 28, (byte) 117, (byte) 223, (byte) 110,
+			(byte) 71, (byte) 241, (byte) 26, (byte) 113, (byte) 29, (byte) 41, (byte) 197, (byte) 137, (byte) 111,
+			(byte) 183, (byte) 98, (byte) 14, (byte) 170, (byte) 24, (byte) 190, (byte) 27, (byte) 252, (byte) 86,
+			(byte) 62, (byte) 75, (byte) 198, (byte) 210, (byte) 121, (byte) 32, (byte) 154, (byte) 219, (byte) 192,
+			(byte) 254, (byte) 120, (byte) 205, (byte) 90, (byte) 244, (byte) 31, (byte) 221, (byte) 168, (byte) 51,
+			(byte) 136, (byte) 7, (byte) 199, (byte) 49, (byte) 177, (byte) 18, (byte) 16, (byte) 89, (byte) 39,
+			(byte) 128, (byte) 236, (byte) 95, (byte) 96, (byte) 81, (byte) 127, (byte) 169, (byte) 25, (byte) 181,
+			(byte) 74, (byte) 13, (byte) 45, (byte) 229, (byte) 122, (byte) 159, (byte) 147, (byte) 201, (byte) 156,
+			(byte) 239, (byte) 160, (byte) 224, (byte) 59, (byte) 77, (byte) 174, (byte) 42, (byte) 245, (byte) 176,
+			(byte) 200, (byte) 235, (byte) 187, (byte) 60, (byte) 131, (byte) 83, (byte) 153, (byte) 97, (byte) 23,
+			(byte) 43, (byte) 4, (byte) 126, (byte) 186, (byte) 119, (byte) 214, (byte) 38, (byte) 225, (byte) 105,
+			(byte) 20, (byte) 99, (byte) 85, (byte) 33, (byte) 12, (byte) 125, };
+
+	// vector used in calculating key schedule (powers of x in GF(256))
+	private static final int[] rcon = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab,
+			0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91 };
+
+	private static int shift(int r, int shift) {
+		return (r >>> shift) | (r << -shift);
+	}
+
+	/* multiply four bytes in GF(2^8) by 'x' {02} in parallel */
+
+	private static final int m1 = 0x80808080;
+	private static final int m2 = 0x7f7f7f7f;
+	private static final int m3 = 0x0000001b;
+	private static final int m4 = 0xC0C0C0C0;
+	private static final int m5 = 0x3f3f3f3f;
+
+	private static int FFmulX(int x) {
+		return (((x & m2) << 1) ^ (((x & m1) >>> 7) * m3));
+	}
+
+	private static int FFmulX2(int x) {
+		int t0 = (x & m5) << 2;
+		int t1 = (x & m4);
+		t1 ^= (t1 >>> 1);
+		return t0 ^ (t1 >>> 2) ^ (t1 >>> 5);
+	}
+
+	/* 
+		The following defines provide alternative definitions of FFmulX that might
+		give improved performance if a fast 32-bit multiply is not available.
+
+		private int FFmulX(int x) { int u = x & m1; u |= (u >> 1); return ((x & m2) << 1) ^ ((u >>> 3) | (u >>> 6)); } 
+		private static final int  m4 = 0x1b1b1b1b;
+		private int FFmulX(int x) { int u = x & m1; return ((x & m2) << 1) ^ ((u - (u >>> 7)) & m4); } 
+
+	 */
+
+	private static int mcol(int x) {
+		int t0, t1;
+		t0 = shift(x, 8);
+		t1 = x ^ t0;
+		return shift(t1, 16) ^ t0 ^ FFmulX(t1);
+	}
+
+	private static int inv_mcol(int x) {
+		int t0, t1;
+		t0 = x;
+		t1 = t0 ^ shift(t0, 8);
+		t0 ^= FFmulX(t1);
+		t1 ^= FFmulX2(t0);
+		t0 ^= t1 ^ shift(t1, 16);
+		return t0;
+	}
+
+	private static int subWord(int x) {
+		return (S[x & 255] & 255 | ((S[(x >> 8) & 255] & 255) << 8) | ((S[(x >> 16) & 255] & 255) << 16)
+				| S[(x >> 24) & 255] << 24);
+	}
+
+	private static int littleEndianToInt(byte[] bs, int off) {
+		int n = bs[off] & 0xff;
+		n |= (bs[++off] & 0xff) << 8;
+		n |= (bs[++off] & 0xff) << 16;
+		n |= bs[++off] << 24;
+		return n;
+	}
+
+	public static void intToLittleEndian(int n, byte[] bs, int off) {
+		bs[off] = (byte) (n);
+		bs[++off] = (byte) (n >>> 8);
+		bs[++off] = (byte) (n >>> 16);
+		bs[++off] = (byte) (n >>> 24);
+	}
+
+	/**
+	 * Calculate the necessary round keys
+	 * The number of calculations depends on key size and block size
+	 * AES specified a fixed block size of 128 bits and key sizes 128/192/256 bits
+	 * This code is written assuming those are the only possible values
+	 */
+	private int[][] generateWorkingKey(byte[] key, boolean forEncryption) {
+		int keyLen = key.length;
+		if (keyLen < 16 || keyLen > 32 || (keyLen & 7) != 0) {
+			throw new IllegalArgumentException("Key length not 128/192/256 bits.");
+		}
+
+		int KC = keyLen >>> 2;
+		ROUNDS = KC + 6; // This is not always true for the generalized Rijndael that allows larger block
+							// sizes
+		int[][] W = new int[ROUNDS + 1][4]; // 4 words in a block
+
+		switch (KC) {
+		case 4: {
+			int col0 = littleEndianToInt(key, 0);
+			W[0][0] = col0;
+			int col1 = littleEndianToInt(key, 4);
+			W[0][1] = col1;
+			int col2 = littleEndianToInt(key, 8);
+			W[0][2] = col2;
+			int col3 = littleEndianToInt(key, 12);
+			W[0][3] = col3;
+
+			for (int i = 1; i <= 10; ++i) {
+				int colx = subWord(shift(col3, 8)) ^ rcon[i - 1];
+				col0 ^= colx;
+				W[i][0] = col0;
+				col1 ^= col0;
+				W[i][1] = col1;
+				col2 ^= col1;
+				W[i][2] = col2;
+				col3 ^= col2;
+				W[i][3] = col3;
+			}
+
+			break;
+		}
+		case 6: {
+			int col0 = littleEndianToInt(key, 0);
+			W[0][0] = col0;
+			int col1 = littleEndianToInt(key, 4);
+			W[0][1] = col1;
+			int col2 = littleEndianToInt(key, 8);
+			W[0][2] = col2;
+			int col3 = littleEndianToInt(key, 12);
+			W[0][3] = col3;
+
+			int col4 = littleEndianToInt(key, 16);
+			int col5 = littleEndianToInt(key, 20);
+
+			int i = 1, rcon = 1, colx;
+			for (;;) {
+				W[i][0] = col4;
+				W[i][1] = col5;
+				colx = subWord(shift(col5, 8)) ^ rcon;
+				rcon <<= 1;
+				col0 ^= colx;
+				W[i][2] = col0;
+				col1 ^= col0;
+				W[i][3] = col1;
+
+				col2 ^= col1;
+				W[i + 1][0] = col2;
+				col3 ^= col2;
+				W[i + 1][1] = col3;
+				col4 ^= col3;
+				W[i + 1][2] = col4;
+				col5 ^= col4;
+				W[i + 1][3] = col5;
+
+				colx = subWord(shift(col5, 8)) ^ rcon;
+				rcon <<= 1;
+				col0 ^= colx;
+				W[i + 2][0] = col0;
+				col1 ^= col0;
+				W[i + 2][1] = col1;
+				col2 ^= col1;
+				W[i + 2][2] = col2;
+				col3 ^= col2;
+				W[i + 2][3] = col3;
+
+				if ((i += 3) >= 13) {
+					break;
+				}
+
+				col4 ^= col3;
+				col5 ^= col4;
+			}
+
+			break;
+		}
+		case 8: {
+			int col0 = littleEndianToInt(key, 0);
+			W[0][0] = col0;
+			int col1 = littleEndianToInt(key, 4);
+			W[0][1] = col1;
+			int col2 = littleEndianToInt(key, 8);
+			W[0][2] = col2;
+			int col3 = littleEndianToInt(key, 12);
+			W[0][3] = col3;
+
+			int col4 = littleEndianToInt(key, 16);
+			W[1][0] = col4;
+			int col5 = littleEndianToInt(key, 20);
+			W[1][1] = col5;
+			int col6 = littleEndianToInt(key, 24);
+			W[1][2] = col6;
+			int col7 = littleEndianToInt(key, 28);
+			W[1][3] = col7;
+
+			int i = 2, rcon = 1, colx;
+			for (;;) {
+				colx = subWord(shift(col7, 8)) ^ rcon;
+				rcon <<= 1;
+				col0 ^= colx;
+				W[i][0] = col0;
+				col1 ^= col0;
+				W[i][1] = col1;
+				col2 ^= col1;
+				W[i][2] = col2;
+				col3 ^= col2;
+				W[i][3] = col3;
+				++i;
+
+				if (i >= 15) {
+					break;
+				}
+
+				colx = subWord(col3);
+				col4 ^= colx;
+				W[i][0] = col4;
+				col5 ^= col4;
+				W[i][1] = col5;
+				col6 ^= col5;
+				W[i][2] = col6;
+				col7 ^= col6;
+				W[i][3] = col7;
+				++i;
+			}
+
+			break;
+		}
+		default: {
+			throw new IllegalStateException("Should never get here");
+		}
+		}
+
+		if (!forEncryption) {
+			for (int j = 1; j < ROUNDS; j++) {
+				for (int i = 0; i < 4; i++) {
+					W[j][i] = inv_mcol(W[j][i]);
+				}
+			}
+		}
+
+		return W;
+	}
+
+	private int ROUNDS;
+	private int[][] WorkingKey = null;
+	private boolean forEncryption;
+
+	private static final int BLOCK_SIZE = 16;
+
+	/**
+	 * default constructor - 128 bit block size.
+	 */
+	public AESLightEngine() {
+		
+	}
+
+	/**
+	 * initialise an AES cipher.
+	 *
+	 * @param forEncryption whether or not we are for encryption.
+	 * @param params the parameters required to set up the cipher.
+	 * @exception IllegalArgumentException if the params argument is
+	 * inappropriate.
+	 */
+	public void init(boolean forEncryption, byte[] key) {
+		WorkingKey = generateWorkingKey(key, forEncryption);
+		this.forEncryption = forEncryption;
+		return;
+	}
+
+	public String getAlgorithmName() {
+		return "AES";
+	}
+
+	public int getBlockSize() {
+		return BLOCK_SIZE;
+	}
+
+	public int processBlock(byte[] in, int inOff, byte[] out, int outOff) {
+		if (WorkingKey == null) {
+			throw new IllegalStateException("AES engine not initialised");
+		}
+
+		if (inOff > (in.length - BLOCK_SIZE)) {
+			throw new IndexOutOfBoundsException("input buffer too short");
+		}
+
+		if (outOff > (out.length - BLOCK_SIZE)) {
+			throw new IndexOutOfBoundsException("output buffer too short");
+		}
+
+		if (forEncryption) {
+			encryptBlock(in, inOff, out, outOff, WorkingKey);
+		} else {
+			decryptBlock(in, inOff, out, outOff, WorkingKey);
+		}
+
+		return BLOCK_SIZE;
+	}
+
+	public void reset() {
+	}
+
+	private void encryptBlock(byte[] in, int inOff, byte[] out, int outOff, int[][] KW) {
+		int C0 = littleEndianToInt(in, inOff + 0);
+		int C1 = littleEndianToInt(in, inOff + 4);
+		int C2 = littleEndianToInt(in, inOff + 8);
+		int C3 = littleEndianToInt(in, inOff + 12);
+
+		int t0 = C0 ^ KW[0][0];
+		int t1 = C1 ^ KW[0][1];
+		int t2 = C2 ^ KW[0][2];
+
+		int r = 1, r0, r1, r2, r3 = C3 ^ KW[0][3];
+		while (r < ROUNDS - 1) {
+			r0 = mcol((S[t0 & 255] & 255) ^ ((S[(t1 >> 8) & 255] & 255) << 8) ^ ((S[(t2 >> 16) & 255] & 255) << 16)
+					^ (S[(r3 >> 24) & 255] << 24)) ^ KW[r][0];
+			r1 = mcol((S[t1 & 255] & 255) ^ ((S[(t2 >> 8) & 255] & 255) << 8) ^ ((S[(r3 >> 16) & 255] & 255) << 16)
+					^ (S[(t0 >> 24) & 255] << 24)) ^ KW[r][1];
+			r2 = mcol((S[t2 & 255] & 255) ^ ((S[(r3 >> 8) & 255] & 255) << 8) ^ ((S[(t0 >> 16) & 255] & 255) << 16)
+					^ (S[(t1 >> 24) & 255] << 24)) ^ KW[r][2];
+			r3 = mcol((S[r3 & 255] & 255) ^ ((S[(t0 >> 8) & 255] & 255) << 8) ^ ((S[(t1 >> 16) & 255] & 255) << 16)
+					^ (S[(t2 >> 24) & 255] << 24)) ^ KW[r++][3];
+			t0 = mcol((S[r0 & 255] & 255) ^ ((S[(r1 >> 8) & 255] & 255) << 8) ^ ((S[(r2 >> 16) & 255] & 255) << 16)
+					^ (S[(r3 >> 24) & 255] << 24)) ^ KW[r][0];
+			t1 = mcol((S[r1 & 255] & 255) ^ ((S[(r2 >> 8) & 255] & 255) << 8) ^ ((S[(r3 >> 16) & 255] & 255) << 16)
+					^ (S[(r0 >> 24) & 255] << 24)) ^ KW[r][1];
+			t2 = mcol((S[r2 & 255] & 255) ^ ((S[(r3 >> 8) & 255] & 255) << 8) ^ ((S[(r0 >> 16) & 255] & 255) << 16)
+					^ (S[(r1 >> 24) & 255] << 24)) ^ KW[r][2];
+			r3 = mcol((S[r3 & 255] & 255) ^ ((S[(r0 >> 8) & 255] & 255) << 8) ^ ((S[(r1 >> 16) & 255] & 255) << 16)
+					^ (S[(r2 >> 24) & 255] << 24)) ^ KW[r++][3];
+		}
+
+		r0 = mcol((S[t0 & 255] & 255) ^ ((S[(t1 >> 8) & 255] & 255) << 8) ^ ((S[(t2 >> 16) & 255] & 255) << 16)
+				^ (S[(r3 >> 24) & 255] << 24)) ^ KW[r][0];
+		r1 = mcol((S[t1 & 255] & 255) ^ ((S[(t2 >> 8) & 255] & 255) << 8) ^ ((S[(r3 >> 16) & 255] & 255) << 16)
+				^ (S[(t0 >> 24) & 255] << 24)) ^ KW[r][1];
+		r2 = mcol((S[t2 & 255] & 255) ^ ((S[(r3 >> 8) & 255] & 255) << 8) ^ ((S[(t0 >> 16) & 255] & 255) << 16)
+				^ (S[(t1 >> 24) & 255] << 24)) ^ KW[r][2];
+		r3 = mcol((S[r3 & 255] & 255) ^ ((S[(t0 >> 8) & 255] & 255) << 8) ^ ((S[(t1 >> 16) & 255] & 255) << 16)
+				^ (S[(t2 >> 24) & 255] << 24)) ^ KW[r++][3];
+
+		// the final round is a simple function of S
+
+		C0 = (S[r0 & 255] & 255) ^ ((S[(r1 >> 8) & 255] & 255) << 8) ^ ((S[(r2 >> 16) & 255] & 255) << 16)
+				^ (S[(r3 >> 24) & 255] << 24) ^ KW[r][0];
+		C1 = (S[r1 & 255] & 255) ^ ((S[(r2 >> 8) & 255] & 255) << 8) ^ ((S[(r3 >> 16) & 255] & 255) << 16)
+				^ (S[(r0 >> 24) & 255] << 24) ^ KW[r][1];
+		C2 = (S[r2 & 255] & 255) ^ ((S[(r3 >> 8) & 255] & 255) << 8) ^ ((S[(r0 >> 16) & 255] & 255) << 16)
+				^ (S[(r1 >> 24) & 255] << 24) ^ KW[r][2];
+		C3 = (S[r3 & 255] & 255) ^ ((S[(r0 >> 8) & 255] & 255) << 8) ^ ((S[(r1 >> 16) & 255] & 255) << 16)
+				^ (S[(r2 >> 24) & 255] << 24) ^ KW[r][3];
+
+		intToLittleEndian(C0, out, outOff + 0);
+		intToLittleEndian(C1, out, outOff + 4);
+		intToLittleEndian(C2, out, outOff + 8);
+		intToLittleEndian(C3, out, outOff + 12);
+	}
+
+	private void decryptBlock(byte[] in, int inOff, byte[] out, int outOff, int[][] KW) {
+		int C0 = littleEndianToInt(in, inOff + 0);
+		int C1 = littleEndianToInt(in, inOff + 4);
+		int C2 = littleEndianToInt(in, inOff + 8);
+		int C3 = littleEndianToInt(in, inOff + 12);
+
+		int t0 = C0 ^ KW[ROUNDS][0];
+		int t1 = C1 ^ KW[ROUNDS][1];
+		int t2 = C2 ^ KW[ROUNDS][2];
+
+		int r = ROUNDS - 1, r0, r1, r2, r3 = C3 ^ KW[ROUNDS][3];
+		while (r > 1) {
+			r0 = inv_mcol((Si[t0 & 255] & 255) ^ ((Si[(r3 >> 8) & 255] & 255) << 8)
+					^ ((Si[(t2 >> 16) & 255] & 255) << 16) ^ (Si[(t1 >> 24) & 255] << 24)) ^ KW[r][0];
+			r1 = inv_mcol((Si[t1 & 255] & 255) ^ ((Si[(t0 >> 8) & 255] & 255) << 8)
+					^ ((Si[(r3 >> 16) & 255] & 255) << 16) ^ (Si[(t2 >> 24) & 255] << 24)) ^ KW[r][1];
+			r2 = inv_mcol((Si[t2 & 255] & 255) ^ ((Si[(t1 >> 8) & 255] & 255) << 8)
+					^ ((Si[(t0 >> 16) & 255] & 255) << 16) ^ (Si[(r3 >> 24) & 255] << 24)) ^ KW[r][2];
+			r3 = inv_mcol((Si[r3 & 255] & 255) ^ ((Si[(t2 >> 8) & 255] & 255) << 8)
+					^ ((Si[(t1 >> 16) & 255] & 255) << 16) ^ (Si[(t0 >> 24) & 255] << 24)) ^ KW[r--][3];
+			t0 = inv_mcol((Si[r0 & 255] & 255) ^ ((Si[(r3 >> 8) & 255] & 255) << 8)
+					^ ((Si[(r2 >> 16) & 255] & 255) << 16) ^ (Si[(r1 >> 24) & 255] << 24)) ^ KW[r][0];
+			t1 = inv_mcol((Si[r1 & 255] & 255) ^ ((Si[(r0 >> 8) & 255] & 255) << 8)
+					^ ((Si[(r3 >> 16) & 255] & 255) << 16) ^ (Si[(r2 >> 24) & 255] << 24)) ^ KW[r][1];
+			t2 = inv_mcol((Si[r2 & 255] & 255) ^ ((Si[(r1 >> 8) & 255] & 255) << 8)
+					^ ((Si[(r0 >> 16) & 255] & 255) << 16) ^ (Si[(r3 >> 24) & 255] << 24)) ^ KW[r][2];
+			r3 = inv_mcol((Si[r3 & 255] & 255) ^ ((Si[(r2 >> 8) & 255] & 255) << 8)
+					^ ((Si[(r1 >> 16) & 255] & 255) << 16) ^ (Si[(r0 >> 24) & 255] << 24)) ^ KW[r--][3];
+		}
+
+		r0 = inv_mcol((Si[t0 & 255] & 255) ^ ((Si[(r3 >> 8) & 255] & 255) << 8) ^ ((Si[(t2 >> 16) & 255] & 255) << 16)
+				^ (Si[(t1 >> 24) & 255] << 24)) ^ KW[r][0];
+		r1 = inv_mcol((Si[t1 & 255] & 255) ^ ((Si[(t0 >> 8) & 255] & 255) << 8) ^ ((Si[(r3 >> 16) & 255] & 255) << 16)
+				^ (Si[(t2 >> 24) & 255] << 24)) ^ KW[r][1];
+		r2 = inv_mcol((Si[t2 & 255] & 255) ^ ((Si[(t1 >> 8) & 255] & 255) << 8) ^ ((Si[(t0 >> 16) & 255] & 255) << 16)
+				^ (Si[(r3 >> 24) & 255] << 24)) ^ KW[r][2];
+		r3 = inv_mcol((Si[r3 & 255] & 255) ^ ((Si[(t2 >> 8) & 255] & 255) << 8) ^ ((Si[(t1 >> 16) & 255] & 255) << 16)
+				^ (Si[(t0 >> 24) & 255] << 24)) ^ KW[r][3];
+
+		// the final round's table is a simple function of Si
+
+		C0 = (Si[r0 & 255] & 255) ^ ((Si[(r3 >> 8) & 255] & 255) << 8) ^ ((Si[(r2 >> 16) & 255] & 255) << 16)
+				^ (Si[(r1 >> 24) & 255] << 24) ^ KW[0][0];
+		C1 = (Si[r1 & 255] & 255) ^ ((Si[(r0 >> 8) & 255] & 255) << 8) ^ ((Si[(r3 >> 16) & 255] & 255) << 16)
+				^ (Si[(r2 >> 24) & 255] << 24) ^ KW[0][1];
+		C2 = (Si[r2 & 255] & 255) ^ ((Si[(r1 >> 8) & 255] & 255) << 8) ^ ((Si[(r0 >> 16) & 255] & 255) << 16)
+				^ (Si[(r3 >> 24) & 255] << 24) ^ KW[0][2];
+		C3 = (Si[r3 & 255] & 255) ^ ((Si[(r2 >> 8) & 255] & 255) << 8) ^ ((Si[(r1 >> 16) & 255] & 255) << 16)
+				^ (Si[(r0 >> 24) & 255] << 24) ^ KW[0][3];
+
+		intToLittleEndian(C0, out, outOff + 0);
+		intToLittleEndian(C1, out, outOff + 4);
+		intToLittleEndian(C2, out, outOff + 8);
+		intToLittleEndian(C3, out, outOff + 12);
+	}
+
+	private int bitsOfSecurity() {
+		if (WorkingKey == null) {
+			return 256;
+		}
+		return (WorkingKey.length - 7) << 5;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/futures/ListenableFutureTask.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/futures/ListenableFutureTask.java
index 6ec9887..f25a72b 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/futures/ListenableFutureTask.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/futures/ListenableFutureTask.java
@@ -22,7 +22,7 @@ import java.util.concurrent.Executor;
  */
 public class ListenableFutureTask<V> extends FutureTask<V> implements ListenableFuture<V> {
 	
-	private final List<Runnable> listeners = new ArrayList();
+	private final List<Runnable> listeners = new ArrayList<>();
 
 	public ListenableFutureTask(Callable<V> callable) {
 		super(callable);
@@ -54,7 +54,7 @@ public class ListenableFutureTask<V> extends FutureTask<V> implements Listenable
 	}
 
 	public static <V> ListenableFutureTask<V> create(Callable<V> callableToSchedule) {
-		return new ListenableFutureTask(callableToSchedule);
+		return new ListenableFutureTask<>(callableToSchedule);
 	}
 	
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/AbstractWebSocketClient.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/AbstractWebSocketClient.java
new file mode 100755
index 0000000..7508d8c
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/AbstractWebSocketClient.java
@@ -0,0 +1,227 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class AbstractWebSocketClient implements IWebSocketClient {
+
+	protected volatile int availableStringFrames = 0;
+	protected volatile int availableBinaryFrames = 0;
+	protected final List<IWebSocketFrame> recievedPacketBuffer = new LinkedList<>();
+	protected String currentURI;
+
+	protected AbstractWebSocketClient(String currentURI) {
+		this.currentURI = currentURI;
+	}
+
+	protected void addRecievedFrame(IWebSocketFrame frame) {
+		boolean str = frame.isString();
+		synchronized(recievedPacketBuffer) {
+			recievedPacketBuffer.add(frame);
+			if(str) {
+				++availableStringFrames;
+			}else {
+				++availableBinaryFrames;
+			}
+		}
+	}
+
+	@Override
+	public int availableFrames() {
+		synchronized(recievedPacketBuffer) {
+			return availableStringFrames + availableBinaryFrames;
+		}
+	}
+
+	@Override
+	public IWebSocketFrame getNextFrame() {
+		synchronized(recievedPacketBuffer) {
+			if(!recievedPacketBuffer.isEmpty()) {
+				IWebSocketFrame frame = recievedPacketBuffer.remove(0);
+				if(frame.isString()) {
+					--availableStringFrames;
+				}else {
+					--availableBinaryFrames;
+				}
+				return frame;
+			}else {
+				return null;
+			}
+		}
+	}
+
+	@Override
+	public List<IWebSocketFrame> getNextFrames() {
+		synchronized(recievedPacketBuffer) {
+			if(!recievedPacketBuffer.isEmpty()) {
+				List<IWebSocketFrame> ret = new ArrayList<>(recievedPacketBuffer);
+				recievedPacketBuffer.clear();
+				availableStringFrames = 0;
+				availableBinaryFrames = 0;
+				return ret;
+			}else {
+				return null;
+			}
+		}
+	}
+
+	@Override
+	public void clearFrames() {
+		synchronized(recievedPacketBuffer) {
+			recievedPacketBuffer.clear();
+		}
+	}
+
+	@Override
+	public int availableStringFrames() {
+		synchronized(recievedPacketBuffer) {
+			return availableStringFrames;
+		}
+	}
+
+	@Override
+	public IWebSocketFrame getNextStringFrame() {
+		synchronized(recievedPacketBuffer) {
+			if(availableStringFrames > 0) {
+				Iterator<IWebSocketFrame> itr = recievedPacketBuffer.iterator();
+				while(itr.hasNext()) {
+					IWebSocketFrame r = itr.next();
+					if(r.isString()) {
+						itr.remove();
+						--availableStringFrames;
+						return r;
+					}
+				}
+				availableStringFrames = 0;
+				return null;
+			}else {
+				return null;
+			}
+		}
+	}
+
+	@Override
+	public List<IWebSocketFrame> getNextStringFrames() {
+		synchronized(recievedPacketBuffer) {
+			if(availableStringFrames > 0) {
+				List<IWebSocketFrame> ret = new ArrayList<>(availableStringFrames);
+				Iterator<IWebSocketFrame> itr = recievedPacketBuffer.iterator();
+				while(itr.hasNext()) {
+					IWebSocketFrame r = itr.next();
+					if(r.isString()) {
+						itr.remove();
+						ret.add(r);
+					}
+				}
+				availableStringFrames = 0;
+				return ret;
+			}else {
+				return null;
+			}
+		}
+	}
+
+	@Override
+	public void clearStringFrames() {
+		synchronized(recievedPacketBuffer) {
+			if(availableStringFrames > 0) {
+				Iterator<IWebSocketFrame> itr = recievedPacketBuffer.iterator();
+				while(itr.hasNext()) {
+					IWebSocketFrame r = itr.next();
+					if(r.isString()) {
+						itr.remove();
+					}
+				}
+				availableStringFrames = 0;
+			}
+		}
+	}
+
+	@Override
+	public int availableBinaryFrames() {
+		synchronized(recievedPacketBuffer) {
+			return availableBinaryFrames;
+		}
+	}
+
+	@Override
+	public IWebSocketFrame getNextBinaryFrame() {
+		synchronized(recievedPacketBuffer) {
+			if(availableBinaryFrames > 0) {
+				Iterator<IWebSocketFrame> itr = recievedPacketBuffer.iterator();
+				while(itr.hasNext()) {
+					IWebSocketFrame r = itr.next();
+					if(!r.isString()) {
+						itr.remove();
+						--availableBinaryFrames;
+						return r;
+					}
+				}
+				availableBinaryFrames = 0;
+				return null;
+			}else {
+				return null;
+			}
+		}
+	}
+
+	@Override
+	public List<IWebSocketFrame> getNextBinaryFrames() {
+		synchronized(recievedPacketBuffer) {
+			if(availableBinaryFrames > 0) {
+				List<IWebSocketFrame> ret = new ArrayList<>(availableBinaryFrames);
+				Iterator<IWebSocketFrame> itr = recievedPacketBuffer.iterator();
+				while(itr.hasNext()) {
+					IWebSocketFrame r = itr.next();
+					if(!r.isString()) {
+						itr.remove();
+						ret.add(r);
+					}
+				}
+				availableBinaryFrames = 0;
+				return ret;
+			}else {
+				return null;
+			}
+		}
+	}
+
+	@Override
+	public void clearBinaryFrames() {
+		synchronized(recievedPacketBuffer) {
+			if(availableBinaryFrames > 0) {
+				Iterator<IWebSocketFrame> itr = recievedPacketBuffer.iterator();
+				while(itr.hasNext()) {
+					IWebSocketFrame r = itr.next();
+					if(!r.isString()) {
+						itr.remove();
+					}
+				}
+				availableBinaryFrames = 0;
+			}
+		}
+	}
+
+	@Override
+	public String getCurrentURI() {
+		return currentURI;
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformBufferFunctions.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EaglerMissingResourceException.java
similarity index 61%
rename from src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformBufferFunctions.java
rename to src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EaglerMissingResourceException.java
index 4d119b2..8e99e2b 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformBufferFunctions.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EaglerMissingResourceException.java
@@ -1,10 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.internal;
 
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
-
 /**
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -18,17 +15,21 @@ import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class PlatformBufferFunctions {
-	
-	public static void put(ByteBuffer newBuffer, ByteBuffer flip) {
-		newBuffer.put(flip);
+public class EaglerMissingResourceException extends RuntimeException {
+
+	public EaglerMissingResourceException() {
 	}
 
-	public static void put(IntBuffer intBuffer, int index, int[] data) {
-		int p = intBuffer.position();
-		intBuffer.position(index);
-		intBuffer.put(data);
-		intBuffer.position(p);
+	public EaglerMissingResourceException(String message, Throwable cause) {
+		super(message, cause);
 	}
-	
+
+	public EaglerMissingResourceException(String message) {
+		super(message);
+	}
+
+	public EaglerMissingResourceException(Throwable cause) {
+		super(cause);
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumFireKeyboardEvent.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumFireKeyboardEvent.java
new file mode 100755
index 0000000..d583d91
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumFireKeyboardEvent.java
@@ -0,0 +1,20 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumFireKeyboardEvent {
+	KEY_DOWN, KEY_UP, KEY_REPEAT;
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumFireMouseEvent.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumFireMouseEvent.java
new file mode 100755
index 0000000..78ffde7
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumFireMouseEvent.java
@@ -0,0 +1,20 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumFireMouseEvent {
+	MOUSE_DOWN, MOUSE_UP, MOUSE_MOVE, MOUSE_WHEEL;
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformANGLE.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformANGLE.java
index c415365..84e127d 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformANGLE.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformANGLE.java
@@ -18,6 +18,7 @@ package net.lax1dude.eaglercraft.v1_8.internal;
 public enum EnumPlatformANGLE {
 
 	DEFAULT(225281 /* GLFW_ANGLE_PLATFORM_TYPE_NONE */, "default", "Default"),
+	D3D9(225284 /* GLFW_ANGLE_PLATFORM_TYPE_D3D9 */, "d3d9", "Direct3D9"),
 	D3D11(225285 /* GLFW_ANGLE_PLATFORM_TYPE_D3D11 */, "d3d11", "Direct3D11"),
 	OPENGL(225282 /* GLFW_ANGLE_PLATFORM_TYPE_OPENGL */, "opengl", "OpenGL"),
 	OPENGLES(225283 /* GLFW_ANGLE_PLATFORM_TYPE_OPENGLES */, "opengles", "OpenGL ES"),
@@ -41,6 +42,8 @@ public enum EnumPlatformANGLE {
 	public static EnumPlatformANGLE fromId(String id) {
 		if(id.equals("d3d11") || id.equals("d3d") || id.equals("dx11")) {
 			return D3D11;
+		}else if(id.equals("d3d9") || id.equals("dx9")) {
+			return D3D9;
 		}else if(id.equals("opengl")) {
 			return OPENGL;
 		}else if(id.equals("opengles")) {
@@ -58,6 +61,8 @@ public enum EnumPlatformANGLE {
 		str = str.toLowerCase();
 		if(str.contains("direct3d11") || str.contains("d3d11")) {
 			return D3D11;
+		}else if(str.contains("direct3d9") || str.contains("d3d9")) {
+			return D3D9;
 		}else if(str.contains("opengl es")) {
 			return OPENGLES;
 		}else if(str.contains("opengl")) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformAgent.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformAgent.java
index 4e71236..3590346 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformAgent.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformAgent.java
@@ -35,12 +35,15 @@ public enum EnumPlatformAgent {
 	}
 	
 	public static EnumPlatformAgent getFromUA(String ua) {
+		if(ua == null) {
+			return UNKNOWN;
+		}
 		ua = " " + ua.toLowerCase();
 		if(ua.contains(" edg/")) {
 			return EDGE;
 		}else if(ua.contains(" opr/")) {
 			return OPERA;
-		}else if(ua.contains(" chrome/")) {
+		}else if(ua.contains(" chrome/") || ua.contains(" chromium/")) {
 			return CHROME;
 		}else if(ua.contains(" firefox/")) {
 			return FIREFOX;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformOS.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformOS.java
index ceccf1a..6818396 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformOS.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumPlatformOS.java
@@ -42,6 +42,9 @@ public enum EnumPlatformOS {
 	}
 	
 	public static EnumPlatformOS getFromJVM(String osNameProperty) {
+		if(osNameProperty == null) {
+			return OTHER;
+		}
 		osNameProperty = osNameProperty.toLowerCase();
 		if(osNameProperty.contains("chrome")) {
 			return CHROMEBOOK_LINUX;
@@ -57,6 +60,9 @@ public enum EnumPlatformOS {
 	}
 	
 	public static EnumPlatformOS getFromUA(String ua) {
+		if(ua == null) {
+			return OTHER;
+		}
 		ua = " " + ua.toLowerCase();
 		if(ua.contains(" cros")) {
 			return CHROMEBOOK_LINUX;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumTouchEvent.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumTouchEvent.java
new file mode 100755
index 0000000..0f49fb2
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumTouchEvent.java
@@ -0,0 +1,43 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumTouchEvent {
+	TOUCHSTART(0), TOUCHMOVE(1), TOUCHEND(2);
+	
+	public final int id;
+	
+	private EnumTouchEvent(int id) {
+		this.id = id;
+	}
+	
+	public static EnumTouchEvent getById(int id) {
+		if(id >= 0 && id < lookup.length) {
+			return lookup[id];
+		}else {
+			return null;
+		}
+	}
+	
+	private static final EnumTouchEvent[] lookup = new EnumTouchEvent[3];
+	
+	static {
+		EnumTouchEvent[] v = values();
+		for(int i = 0; i < v.length; ++i) {
+			lookup[v[i].id] = v[i];
+		}
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumWebViewContentMode.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumWebViewContentMode.java
new file mode 100755
index 0000000..e6a9030
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/EnumWebViewContentMode.java
@@ -0,0 +1,20 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumWebViewContentMode {
+	URL_BASED, BLOB_BASED;
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GLObjectMap.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GLObjectMap.java
index f2a627b..f11ddeb 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GLObjectMap.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GLObjectMap.java
@@ -71,4 +71,11 @@ public class GLObjectMap<T> {
 		values = new Object[size];
 		System.arraycopy(oldValues, 0, values, 0, oldSize);
 	}
+
+	public void clear() {
+		if(allocatedObjects == 0) return;
+		values = new Object[size];
+		insertIndex = 0;
+		allocatedObjects = 0;
+	}
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GamepadConstants.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GamepadConstants.java
new file mode 100755
index 0000000..d9a9411
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GamepadConstants.java
@@ -0,0 +1,134 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GamepadConstants {
+
+	private static final String[] buttonNames = new String[24];
+	private static final String[] axisNames = new String[4];
+	private static final int[] eaglerButtonsToGLFW = new int[24];
+	private static final int[] glfwButtonsToEagler = new int[24];
+
+	public static final int GAMEPAD_NONE = -1;
+	public static final int GAMEPAD_A = 0;
+	public static final int GAMEPAD_B = 1;
+	public static final int GAMEPAD_X = 2;
+	public static final int GAMEPAD_Y = 3;
+	public static final int GAMEPAD_LEFT_BUTTON = 4;
+	public static final int GAMEPAD_RIGHT_BUTTON = 5;
+	public static final int GAMEPAD_LEFT_TRIGGER = 6;
+	public static final int GAMEPAD_RIGHT_TRIGGER = 7;
+	public static final int GAMEPAD_BACK = 8;
+	public static final int GAMEPAD_START = 9;
+	public static final int GAMEPAD_LEFT_STICK_BUTTON = 10;
+	public static final int GAMEPAD_RIGHT_STICK_BUTTON = 11;
+	public static final int GAMEPAD_DPAD_UP = 12;
+	public static final int GAMEPAD_DPAD_DOWN = 13;
+	public static final int GAMEPAD_DPAD_LEFT = 14;
+	public static final int GAMEPAD_DPAD_RIGHT = 15;
+	public static final int GAMEPAD_GUIDE = 16;
+
+	public static final int GAMEPAD_AXIS_NONE = -1;
+	public static final int GAMEPAD_AXIS_LEFT_STICK_X = 0;
+	public static final int GAMEPAD_AXIS_LEFT_STICK_Y = 1;
+	public static final int GAMEPAD_AXIS_RIGHT_STICK_X = 2;
+	public static final int GAMEPAD_AXIS_RIGHT_STICK_Y = 3;
+
+	private static final int GLFW_GAMEPAD_BUTTON_A = 0, GLFW_GAMEPAD_BUTTON_B = 1, GLFW_GAMEPAD_BUTTON_X = 2,
+			GLFW_GAMEPAD_BUTTON_Y = 3, GLFW_GAMEPAD_BUTTON_LEFT_BUMPER = 4, GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER = 5,
+			GLFW_GAMEPAD_BUTTON_BACK = 6, GLFW_GAMEPAD_BUTTON_START = 7, GLFW_GAMEPAD_BUTTON_GUIDE = 8,
+			GLFW_GAMEPAD_BUTTON_LEFT_THUMB = 9, GLFW_GAMEPAD_BUTTON_RIGHT_THUMB = 10, GLFW_GAMEPAD_BUTTON_DPAD_UP = 11,
+			GLFW_GAMEPAD_BUTTON_DPAD_RIGHT = 12, GLFW_GAMEPAD_BUTTON_DPAD_DOWN = 13, GLFW_GAMEPAD_BUTTON_DPAD_LEFT = 14;
+
+	private static void registerBtn(int eaglerBtn, int glfwBtn, String name) {
+		if(eaglerButtonsToGLFW[eaglerBtn] != 0) throw new IllegalArgumentException("Duplicate eaglerButtonsToGLFW entry: " + eaglerBtn + " -> " + glfwBtn);
+		if(glfwBtn != -1 && glfwButtonsToEagler[glfwBtn] != 0) throw new IllegalArgumentException("Duplicate glfwButtonsToEAGLER entry: " + glfwBtn + " -> " + eaglerBtn);
+		eaglerButtonsToGLFW[eaglerBtn] = glfwBtn;
+		if(glfwBtn != -1) glfwButtonsToEagler[glfwBtn] = eaglerBtn;
+		if(buttonNames[eaglerBtn] != null) throw new IllegalArgumentException("Duplicate buttonNames entry: " + eaglerBtn);
+		buttonNames[eaglerBtn] = name;
+	}
+
+	private static void registerAxis(int eaglerAxis, String name) {
+		if(axisNames[eaglerAxis] != null) throw new IllegalArgumentException("Duplicate axisNames entry: " + eaglerAxis);
+		axisNames[eaglerAxis] = name;
+	}
+
+	static {
+		registerBtn(GAMEPAD_A, GLFW_GAMEPAD_BUTTON_A, "A");
+		registerBtn(GAMEPAD_B, GLFW_GAMEPAD_BUTTON_B, "B");
+		registerBtn(GAMEPAD_X, GLFW_GAMEPAD_BUTTON_X, "X");
+		registerBtn(GAMEPAD_Y, GLFW_GAMEPAD_BUTTON_Y, "Y");
+		registerBtn(GAMEPAD_LEFT_BUTTON, GLFW_GAMEPAD_BUTTON_LEFT_BUMPER, "Left Button");
+		registerBtn(GAMEPAD_LEFT_TRIGGER, -1, "Left Trigger");
+		registerBtn(GAMEPAD_RIGHT_BUTTON, GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER, "Right Button");
+		registerBtn(GAMEPAD_RIGHT_TRIGGER, -1, "Right Trigger");
+		registerBtn(GAMEPAD_BACK, GLFW_GAMEPAD_BUTTON_BACK, "Back");
+		registerBtn(GAMEPAD_START, GLFW_GAMEPAD_BUTTON_START, "Start");
+		registerBtn(GAMEPAD_LEFT_STICK_BUTTON, GLFW_GAMEPAD_BUTTON_LEFT_THUMB, "L. Stick Button");
+		registerBtn(GAMEPAD_RIGHT_STICK_BUTTON, GLFW_GAMEPAD_BUTTON_RIGHT_THUMB, "R. Stick Button");
+		registerBtn(GAMEPAD_DPAD_UP, GLFW_GAMEPAD_BUTTON_DPAD_UP, "D-Pad Up");
+		registerBtn(GAMEPAD_DPAD_DOWN, GLFW_GAMEPAD_BUTTON_DPAD_DOWN, "D-Pad Down");
+		registerBtn(GAMEPAD_DPAD_LEFT, GLFW_GAMEPAD_BUTTON_DPAD_LEFT, "D-Pad Left");
+		registerBtn(GAMEPAD_DPAD_RIGHT, GLFW_GAMEPAD_BUTTON_DPAD_RIGHT, "D-Pad Right");
+		registerBtn(GAMEPAD_GUIDE, GLFW_GAMEPAD_BUTTON_GUIDE, "Guide");
+		registerAxis(GAMEPAD_AXIS_LEFT_STICK_X, "Left Stick X");
+		registerAxis(GAMEPAD_AXIS_LEFT_STICK_Y, "Left Stick Y");
+		registerAxis(GAMEPAD_AXIS_RIGHT_STICK_X, "Right Stick X");
+		registerAxis(GAMEPAD_AXIS_RIGHT_STICK_Y, "Right Stick Y");
+	}
+
+	public static int getEaglerButtonFromBrowser(int button) {
+		return button;
+	}
+
+	public static int getBrowserButtonFromEagler(int button) {
+		return button;
+	}
+
+	public static int getEaglerButtonFromGLFW(int button) {
+		if(button >= 0 && button < glfwButtonsToEagler.length) {
+			return glfwButtonsToEagler[button];
+		}else {
+			return -1;
+		}
+	}
+
+	public static int getGLFWButtonFromEagler(int button) {
+		if(button >= 0 && button < eaglerButtonsToGLFW.length) {
+			return eaglerButtonsToGLFW[button];
+		}else {
+			return -1;
+		}
+	}
+
+	public static String getButtonName(int button) {
+		if(button >= 0 && button < buttonNames.length) {
+			return buttonNames[button];
+		}else {
+			return "Button " + button;
+		}
+	}
+
+	public static String getAxisName(int button) {
+		if(button >= 0 && button < axisNames.length) {
+			return axisNames[button];
+		}else {
+			return "Axis " + button;
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java
index f5d9b62..3086747 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java
@@ -26,10 +26,12 @@ public interface IClientConfigAdapter {
 
 		public final String name;
 		public final String addr;
+		public final boolean hideAddress;
 
-		public DefaultServer(String name, String addr) {
+		public DefaultServer(String name, String addr, boolean hideAddress) {
 			this.name = name;
 			this.addr = addr;
+			this.hideAddress = hideAddress;
 		}
 
 	}
@@ -76,6 +78,24 @@ public interface IClientConfigAdapter {
 
 	boolean isEnableMinceraft();
 
+	boolean isEnableServerCookies();
+
+	boolean isAllowServerRedirects();
+
+	boolean isOpenDebugConsoleOnLaunch();
+
+	boolean isForceWebViewSupport();
+
+	boolean isEnableWebViewCSP();
+
+	boolean isAllowBootMenu();
+
+	boolean isForceProfanityFilter();
+
+	boolean isEaglerNoDelay();
+
+	boolean isRamdiskMode();
+
 	IClientConfigAdapterHooks getHooks();
 
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapterHooks.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapterHooks.java
index 6b26127..44fb70b 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapterHooks.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapterHooks.java
@@ -25,4 +25,6 @@ public interface IClientConfigAdapterHooks {
 
 	void callCrashReportHook(String crashReport, Consumer<String> customMessageCB);
 
+	void callScreenChangedHook(String screenName, int scaledWidth, int scaledHeight, int realWidth, int realHeight, int scaleFactor);
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IEaglerFilesystem.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IEaglerFilesystem.java
new file mode 100755
index 0000000..3c5f11c
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IEaglerFilesystem.java
@@ -0,0 +1,46 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface IEaglerFilesystem {
+
+	String getFilesystemName();
+
+	String getInternalDBName();
+
+	boolean isRamdisk();
+
+	boolean eaglerDelete(String pathName);
+
+	ByteBuffer eaglerRead(String pathName);
+
+	void eaglerWrite(String pathName, ByteBuffer data);
+
+	boolean eaglerExists(String pathName);
+
+	boolean eaglerMove(String pathNameOld, String pathNameNew);
+
+	int eaglerCopy(String pathNameOld, String pathNameNew);
+
+	int eaglerSize(String pathName);
+
+	void eaglerIterate(String pathName, VFSFilenameIterator itr, boolean recursive);
+
+	void closeHandle();
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IServerQuery.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IServerQuery.java
index a2620cb..6e9340d 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IServerQuery.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IServerQuery.java
@@ -2,6 +2,8 @@ package net.lax1dude.eaglercraft.v1_8.internal;
 
 import org.json.JSONObject;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+
 /**
  * Copyright (c) 2022 lax1dude. All Rights Reserved.
  * 
@@ -42,6 +44,8 @@ public interface IServerQuery {
 
 	}
 
+	void update();
+
 	void send(String str);
 
 	default void send(JSONObject json) {
@@ -73,8 +77,8 @@ public interface IServerQuery {
 	EnumServerRateLimit getRateLimit();
 
 	default boolean awaitResponseAvailable(long timeout) {
-		long start = System.currentTimeMillis();
-		while(isOpen() && responsesAvailable() <= 0 && (timeout <= 0l || System.currentTimeMillis() - start < timeout)) {
+		long start = EagRuntime.steadyTimeMillis();
+		while(isOpen() && responsesAvailable() <= 0 && (timeout <= 0l || EagRuntime.steadyTimeMillis() - start < timeout)) {
 			try {
 				Thread.sleep(0l, 250000);
 			} catch (InterruptedException e) {
@@ -88,8 +92,8 @@ public interface IServerQuery {
 	}
 	
 	default boolean awaitResponseBinaryAvailable(long timeout) {
-		long start = System.currentTimeMillis();
-		while(isOpen() && binaryResponsesAvailable() <= 0 && (timeout <= 0l || System.currentTimeMillis() - start < timeout)) {
+		long start = EagRuntime.steadyTimeMillis();
+		while(isOpen() && binaryResponsesAvailable() <= 0 && (timeout <= 0l || EagRuntime.steadyTimeMillis() - start < timeout)) {
 			try {
 				Thread.sleep(0l, 250000);
 			} catch (InterruptedException e) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IWebSocketClient.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IWebSocketClient.java
new file mode 100755
index 0000000..7646561
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IWebSocketClient.java
@@ -0,0 +1,62 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+import java.util.List;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface IWebSocketClient {
+
+	EnumEaglerConnectionState getState();
+
+	boolean connectBlocking(int timeoutMS);
+
+	boolean isOpen();
+
+	boolean isClosed();
+
+	void close();
+
+	int availableFrames();
+
+	IWebSocketFrame getNextFrame();
+
+	List<IWebSocketFrame> getNextFrames();
+
+	void clearFrames();
+
+	int availableStringFrames();
+
+	IWebSocketFrame getNextStringFrame();
+
+	List<IWebSocketFrame> getNextStringFrames();
+
+	void clearStringFrames();
+
+	int availableBinaryFrames();
+
+	IWebSocketFrame getNextBinaryFrame();
+
+	List<IWebSocketFrame> getNextBinaryFrames();
+
+	void clearBinaryFrames();
+
+	void send(String str);
+
+	void send(byte[] bytes);
+
+	String getCurrentURI();
+
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformBufferFunctions.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IWebSocketFrame.java
similarity index 61%
rename from src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformBufferFunctions.java
rename to src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IWebSocketFrame.java
index b2b425c..3378c01 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformBufferFunctions.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IWebSocketFrame.java
@@ -1,10 +1,9 @@
 package net.lax1dude.eaglercraft.v1_8.internal;
 
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
+import java.io.InputStream;
 
 /**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -18,17 +17,18 @@ import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class PlatformBufferFunctions {
+public interface IWebSocketFrame {
 
-	public static void put(ByteBuffer newBuffer, ByteBuffer flip) {
-		newBuffer.put(flip);
-	}
+	boolean isString();
+
+	String getString();
+
+	byte[] getByteArray();
+
+	InputStream getInputStream();
+
+	int getLength();
+
+	long getTimestamp();
 
-	public static void put(IntBuffer intBuffer, int index, int[] data) {
-		int p = intBuffer.position();
-		intBuffer.position(index);
-		intBuffer.put(data);
-		intBuffer.position(p);
-	}
-	
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/QueryResponse.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/QueryResponse.java
index b59da81..4f63acc 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/QueryResponse.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/QueryResponse.java
@@ -2,6 +2,8 @@ package net.lax1dude.eaglercraft.v1_8.internal;
 
 import org.json.JSONObject;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+
 /**
  * Copyright (c) 2022 lax1dude. All Rights Reserved.
  * 
@@ -37,7 +39,7 @@ public class QueryResponse {
 		this.serverBrand = obj.getString("brand");
 		this.serverName = obj.getString("name");
 		this.serverTime = obj.getLong("time");
-		this.clientTime = System.currentTimeMillis();
+		this.clientTime = EagRuntime.steadyTimeMillis();
 		this.serverCracked = obj.optBoolean("cracked", false);
 	}
 	
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/RamdiskFilesystemImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/RamdiskFilesystemImpl.java
new file mode 100755
index 0000000..8f7f7e6
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/RamdiskFilesystemImpl.java
@@ -0,0 +1,131 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RamdiskFilesystemImpl implements IEaglerFilesystem {
+
+	protected final String filesystemName;
+	protected final Map<String,byte[]> filesystemMap = new TreeMap<>();
+
+	public RamdiskFilesystemImpl(String filesystemName) {
+		this.filesystemName = filesystemName;
+	}
+
+	@Override
+	public String getFilesystemName() {
+		return filesystemName;
+	}
+
+	@Override
+	public String getInternalDBName() {
+		return "ramdisk:" + filesystemName;
+	}
+
+	@Override
+	public boolean isRamdisk() {
+		return true;
+	}
+
+	@Override
+	public boolean eaglerDelete(String pathName) {
+		return filesystemMap.remove(pathName) != null;
+	}
+
+	@Override
+	public ByteBuffer eaglerRead(String pathName) {
+		byte[] data = filesystemMap.get(pathName);
+		if(data != null) {
+			ByteBuffer buf = PlatformRuntime.castPrimitiveByteArray(data);
+			if(buf == null) {
+				buf = PlatformRuntime.allocateByteBuffer(data.length);
+				buf.put(data);
+				buf.flip();
+			}
+			return buf;
+		}else {
+			return null;
+		}
+	}
+
+	@Override
+	public void eaglerWrite(String pathName, ByteBuffer data) {
+		byte[] arr = PlatformRuntime.castNativeByteBuffer(data);
+		if(arr == null) {
+			arr = new byte[data.remaining()];
+			int i = data.position();
+			data.get(arr);
+			data.position(i);
+		}
+		filesystemMap.put(pathName, arr);
+	}
+
+	@Override
+	public boolean eaglerExists(String pathName) {
+		return filesystemMap.containsKey(pathName);
+	}
+
+	@Override
+	public boolean eaglerMove(String pathNameOld, String pathNameNew) {
+		byte[] dat = filesystemMap.remove(pathNameOld);
+		if(dat != null) {
+			filesystemMap.put(pathNameNew, dat);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public int eaglerCopy(String pathNameOld, String pathNameNew) {
+		byte[] dat = filesystemMap.get(pathNameOld);
+		if(dat != null) {
+			filesystemMap.put(pathNameNew, dat);
+			return dat.length;
+		}
+		return -1;
+	}
+
+	@Override
+	public int eaglerSize(String pathName) {
+		byte[] dat = filesystemMap.get(pathName);
+		return dat != null ? dat.length : -1;
+	}
+
+	@Override
+	public void eaglerIterate(String pathName, VFSFilenameIterator itr, boolean recursive) {
+		if(!recursive) {
+			eaglerIterate(pathName, new VFSFilenameIteratorNonRecursive(itr,
+					VFSFilenameIteratorNonRecursive.countSlashes(pathName) + 1), true);
+		}else {
+			boolean b = pathName.length() == 0;
+			for(String key : filesystemMap.keySet()) {
+				if(b || key.startsWith(pathName)) {
+					itr.next(key);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void closeHandle() {
+		filesystemMap.clear();
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/ScreenRecordParameters.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/ScreenRecordParameters.java
new file mode 100755
index 0000000..8ff90dc
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/ScreenRecordParameters.java
@@ -0,0 +1,37 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+import net.lax1dude.eaglercraft.v1_8.recording.EnumScreenRecordingCodec;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ScreenRecordParameters {
+
+	public final EnumScreenRecordingCodec codec;
+	public final int resolutionDivisior;
+	public final int videoBitsPerSecond;
+	public final int audioBitsPerSecond;
+	public final int captureFrameRate;
+
+	public ScreenRecordParameters(EnumScreenRecordingCodec codec, int resolutionDivisior, int videoBitsPerSecond,
+			int audioBitsPerSecond, int captureFrameRate) {
+		this.codec = codec;
+		this.resolutionDivisior = resolutionDivisior;
+		this.videoBitsPerSecond = videoBitsPerSecond;
+		this.audioBitsPerSecond = audioBitsPerSecond;
+		this.captureFrameRate = captureFrameRate;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/VFSFilenameIteratorNonRecursive.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/VFSFilenameIteratorNonRecursive.java
new file mode 100755
index 0000000..612bec8
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/VFSFilenameIteratorNonRecursive.java
@@ -0,0 +1,47 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class VFSFilenameIteratorNonRecursive implements VFSFilenameIterator {
+
+	private final VFSFilenameIterator child;
+	private final int pathCount;
+
+	public VFSFilenameIteratorNonRecursive(VFSFilenameIterator child, int pathCount) {
+		this.child = child;
+		this.pathCount = pathCount;
+	}
+
+	@Override
+	public void next(String entry) {
+		int i = countSlashes(entry);
+		if(i == pathCount) {
+			child.next(entry);
+		}
+	}
+
+	public static int countSlashes(String str) {
+		if(str.length() == 0) return -1;
+		int j = 0;
+		for(int i = 0, l = str.length(); i < l; ++i) {
+			if(str.charAt(i) == '/') {
+				++j;
+			}
+		}
+		return j;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/WebViewOptions.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/WebViewOptions.java
new file mode 100755
index 0000000..878c82c
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/WebViewOptions.java
@@ -0,0 +1,67 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class WebViewOptions {
+
+	public EnumWebViewContentMode contentMode = EnumWebViewContentMode.BLOB_BASED;
+	public String fallbackTitle = "WebView";
+	public boolean scriptEnabled = false;
+	public boolean strictCSPEnable = true;
+	public boolean serverMessageAPIEnabled = false;
+	public URI url = null;
+	public byte[] blob = null;
+	public EaglercraftUUID permissionsOriginUUID = null;
+
+	public WebViewOptions() {
+	}
+
+	public WebViewOptions(boolean script, boolean serverMessageAPIEnabled, boolean strictCSPEnable, URI url) {
+		this.contentMode = EnumWebViewContentMode.URL_BASED;
+		this.scriptEnabled = script;
+		this.strictCSPEnable = strictCSPEnable;
+		this.serverMessageAPIEnabled = serverMessageAPIEnabled;
+		this.url = url;
+		this.permissionsOriginUUID = getURLOriginUUID(url);
+	}
+
+	public WebViewOptions(boolean script, boolean serverMessageAPIEnabled, boolean strictCSPEnable, byte[] data, EaglercraftUUID permissionsOriginUUID) {
+		this.contentMode = EnumWebViewContentMode.BLOB_BASED;
+		this.scriptEnabled = script;
+		this.strictCSPEnable = strictCSPEnable;
+		this.serverMessageAPIEnabled = serverMessageAPIEnabled;
+		this.blob = data;
+		this.permissionsOriginUUID = permissionsOriginUUID;
+	}
+
+	public static EaglercraftUUID getURLOriginUUID(URI url) {
+		return EaglercraftUUID.nameUUIDFromBytes(("URLOrigin:" + url.toString()).getBytes(StandardCharsets.UTF_8));
+	}
+
+	public static EaglercraftUUID getEmbedOriginUUID(byte[] sha256) {
+		byte[] vigg = "BlobOrigin:".getBytes(StandardCharsets.UTF_8);
+		byte[] eagler = new byte[sha256.length + vigg.length];
+		System.arraycopy(vigg, 0, eagler, 0, vigg.length);
+		System.arraycopy(sha256, 0, eagler, vigg.length, sha256.length);
+		return EaglercraftUUID.nameUUIDFromBytes(eagler);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/Buffer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/Buffer.java
index d24238f..34f376a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/Buffer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/Buffer.java
@@ -41,14 +41,14 @@ public interface Buffer {
 
 	boolean hasRemaining();
 
-	boolean isReadOnly();
-
 	boolean hasArray();
 
 	Object array();
 
-	int arrayOffset();
-
 	boolean isDirect();
 
+	static IndexOutOfBoundsException makeIOOBE(int idx) {
+		return new IndexOutOfBoundsException("Index out of range: " + idx);
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/ByteBuffer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/ByteBuffer.java
index f5ceed8..8b4f843 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/ByteBuffer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/ByteBuffer.java
@@ -18,12 +18,8 @@ package net.lax1dude.eaglercraft.v1_8.internal.buffer;
  */
 public interface ByteBuffer extends Buffer {
 
-	ByteBuffer slice();
-
 	ByteBuffer duplicate();
 
-	ByteBuffer asReadOnlyBuffer();
-
 	byte get();
 
 	ByteBuffer put(byte b);
@@ -42,10 +38,6 @@ public interface ByteBuffer extends Buffer {
 
 	ByteBuffer put(byte[] src);
 
-	int arrayOffset();
-
-	ByteBuffer compact();
-
 	char getChar();
 
 	ByteBuffer putChar(char value);
@@ -54,7 +46,7 @@ public interface ByteBuffer extends Buffer {
 
 	ByteBuffer putChar(int index, char value);
 
-	public abstract short getShort();
+	short getShort();
 
 	ByteBuffer putShort(short value);
 
@@ -106,4 +98,6 @@ public interface ByteBuffer extends Buffer {
 
 	ByteBuffer position(int newPosition);
 
+	byte[] array();
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerBufferInputStream.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerBufferInputStream.java
index 9c3e9a7..29b74cd 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerBufferInputStream.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerBufferInputStream.java
@@ -3,7 +3,6 @@ package net.lax1dude.eaglercraft.v1_8.internal.buffer;
 import java.io.IOException;
 import java.io.InputStream;
 
-
 /**
  * Copyright (c) 2022 lax1dude. All Rights Reserved.
  * 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/FloatBuffer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/FloatBuffer.java
index 6bf6e84..6d9a937 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/FloatBuffer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/FloatBuffer.java
@@ -17,12 +17,8 @@ package net.lax1dude.eaglercraft.v1_8.internal.buffer;
  */
 public interface FloatBuffer extends Buffer {
 
-	FloatBuffer slice();
-
 	FloatBuffer duplicate();
 
-	FloatBuffer asReadOnlyBuffer();
-
 	float get();
 
 	FloatBuffer put(float b);
@@ -45,10 +41,6 @@ public interface FloatBuffer extends Buffer {
 
 	FloatBuffer put(float[] src);
 
-	int getArrayOffset();
-
-	FloatBuffer compact();
-
 	boolean isDirect();
 
 	FloatBuffer mark();
@@ -64,6 +56,8 @@ public interface FloatBuffer extends Buffer {
 	FloatBuffer limit(int newLimit);
 
 	FloatBuffer position(int newPosition);
-	
+
+	float[] array();
+
 }
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/IntBuffer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/IntBuffer.java
index 344984b..44e5967 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/IntBuffer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/IntBuffer.java
@@ -17,12 +17,8 @@ package net.lax1dude.eaglercraft.v1_8.internal.buffer;
  */
 public interface IntBuffer extends Buffer {
 
-	IntBuffer slice();
-
 	IntBuffer duplicate();
 
-	IntBuffer asReadOnlyBuffer();
-
 	int get();
 
 	IntBuffer put(int b);
@@ -45,10 +41,6 @@ public interface IntBuffer extends Buffer {
 
 	IntBuffer put(int[] src);
 
-	int getArrayOffset();
-
-	IntBuffer compact();
-
 	boolean isDirect();
 
 	IntBuffer mark();
@@ -64,6 +56,8 @@ public interface IntBuffer extends Buffer {
 	IntBuffer limit(int newLimit);
 
 	IntBuffer position(int newPosition);
-	
+
+	int[] array();
+
 }
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/ShortBuffer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/ShortBuffer.java
index c0fa05f..bb15882 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/ShortBuffer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/ShortBuffer.java
@@ -17,12 +17,8 @@ package net.lax1dude.eaglercraft.v1_8.internal.buffer;
  */
 public interface ShortBuffer extends Buffer {
 
-	ShortBuffer slice();
-
 	ShortBuffer duplicate();
 
-	ShortBuffer asReadOnlyBuffer();
-
 	short get();
 
 	ShortBuffer put(short b);
@@ -45,10 +41,6 @@ public interface ShortBuffer extends Buffer {
 
 	ShortBuffer put(short[] src);
 
-	int getArrayOffset();
-
-	ShortBuffer compact();
-
 	boolean isDirect();
 
 	ShortBuffer mark();
@@ -64,5 +56,7 @@ public interface ShortBuffer extends Buffer {
 	ShortBuffer limit(int newLimit);
 
 	ShortBuffer position(int newPosition);
-	
+
+	short[] array();
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFSFilenameIteratorImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFSFilenameIteratorImpl.java
index d590269..f2c14a0 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFSFilenameIteratorImpl.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFSFilenameIteratorImpl.java
@@ -1,5 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.internal.vfs2;
 
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.VFSFilenameIterator;
 
 /**
@@ -19,15 +20,17 @@ import net.lax1dude.eaglercraft.v1_8.internal.VFSFilenameIterator;
  */
 class VFSFilenameIteratorImpl implements VFSFilenameIterator {
 
+	protected IEaglerFilesystem fs;
 	protected VFSIterator2 itr;
 
-	VFSFilenameIteratorImpl(VFSIterator2 itr) {
+	VFSFilenameIteratorImpl(IEaglerFilesystem fs, VFSIterator2 itr) {
+		this.fs = fs;
 		this.itr = itr;
 	}
 
 	@Override
 	public void next(String entry) {
-		itr.next(new VFile2(entry));
+		itr.next(VFile2.create(fs, entry));
 	}
 
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFSListFilesIteratorImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFSListFilesIteratorImpl.java
index 70816d3..6a75b13 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFSListFilesIteratorImpl.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFSListFilesIteratorImpl.java
@@ -2,6 +2,7 @@ package net.lax1dude.eaglercraft.v1_8.internal.vfs2;
 
 import java.util.List;
 
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.VFSFilenameIterator;
 
 /**
@@ -21,15 +22,17 @@ import net.lax1dude.eaglercraft.v1_8.internal.VFSFilenameIterator;
  */
 class VFSListFilesIteratorImpl implements VFSFilenameIterator {
 
+	protected IEaglerFilesystem fs;
 	protected List<VFile2> list;
 
-	VFSListFilesIteratorImpl(List<VFile2> list) {
+	VFSListFilesIteratorImpl(IEaglerFilesystem fs, List<VFile2> list) {
+		this.fs = fs;
 		this.list = list;
 	}
 
 	@Override
 	public void next(String entry) {
-		list.add(new VFile2(entry));
+		list.add(VFile2.create(fs, entry));
 	}
 
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFile2.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFile2.java
index 8ba45c8..ecf6891 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFile2.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFile2.java
@@ -5,9 +5,10 @@ import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem;
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 
@@ -31,6 +32,12 @@ public class VFile2 {
 	public static final String pathSeperator = "/";
 	public static final String[] altPathSeperator = new String[] { "\\" };
 	
+	static IEaglerFilesystem primaryFilesystem = null;
+	
+	public static void setPrimaryFilesystem(IEaglerFilesystem fs) {
+		primaryFilesystem = fs;
+	}
+	
 	public static String normalizePath(String p) {
 		for(int i = 0; i < altPathSeperator.length; ++i) {
 			p = p.replace(altPathSeperator[i], pathSeperator);
@@ -53,9 +60,11 @@ public class VFile2 {
 	}
 	
 	protected String path;
+	protected IEaglerFilesystem myFilesystem;
+	protected Supplier<IEaglerFilesystem> myFilesystemProvider;
 	
 	public static String createPath(Object... p) {
-		ArrayList<String> r = new ArrayList();
+		ArrayList<String> r = new ArrayList<>();
 		for(int i = 0; i < p.length; ++i) {
 			if(p[i] == null) {
 				continue;
@@ -94,13 +103,45 @@ public class VFile2 {
 		}
 	}
 	
-	public VFile2(Object... p) {
-		this.path = createPath(p);
+	public static VFile2 create(IEaglerFilesystem fs, Object... path) {
+		return new VFile2(createPath(path), fs);
+	}
+	
+	public static VFile2 create(Supplier<IEaglerFilesystem> fs, Object... path) {
+		return new VFile2(createPath(path), fs);
+	}
+	
+	public VFile2(Object... path) {
+		this(createPath(path), primaryFilesystem);
+	}
+	
+	private VFile2(String path, IEaglerFilesystem fs) {
+		this.path = path;
+		this.myFilesystem = fs;
+	}
+	
+	private VFile2(String path, Supplier<IEaglerFilesystem> fs) {
+		this.path = path;
+		this.myFilesystemProvider = fs;
+	}
+	
+	protected IEaglerFilesystem getFS() {
+		if(myFilesystem == null) {
+			if(myFilesystemProvider != null) {
+				myFilesystem = myFilesystemProvider.get();
+			}else {
+				myFilesystem = primaryFilesystem;
+			}
+			if(myFilesystem == null) {
+				throw new IllegalStateException("The filesystem has not been initialized yet!");
+			}
+		}
+		return myFilesystem;
 	}
 	
 	public InputStream getInputStream() {
 		assertNotRelative();
-		return new VFileInputStream(PlatformFilesystem.eaglerRead(path));
+		return new VFileInputStream(getFS().eaglerRead(path));
 	}
 	
 	public OutputStream getOutputStream() {
@@ -121,7 +162,7 @@ public class VFile2 {
 	}
 	
 	public boolean canRead() {
-		return !isRelative() && PlatformFilesystem.eaglerExists(path);
+		return !isRelative() && getFS().eaglerExists(path);
 	}
 	
 	public String getPath() {
@@ -160,15 +201,15 @@ public class VFile2 {
 	}
 	
 	public boolean exists() {
-		return !isRelative() && PlatformFilesystem.eaglerExists(path);
+		return !isRelative() && getFS().eaglerExists(path);
 	}
 	
 	public boolean delete() {
-		return !isRelative() && PlatformFilesystem.eaglerDelete(path);
+		return !isRelative() && getFS().eaglerDelete(path);
 	}
 	
 	public boolean renameTo(String p) {
-		if(!isRelative() && PlatformFilesystem.eaglerMove(path, p)) {
+		if(!isRelative() && getFS().eaglerMove(path, p)) {
 			return true;
 		}
 		return false;
@@ -179,7 +220,7 @@ public class VFile2 {
 	}
 	
 	public int length() {
-		return isRelative() ? -1 : PlatformFilesystem.eaglerSize(path);
+		return isRelative() ? -1 : getFS().eaglerSize(path);
 	}
 	
 	public byte[] getAllBytes() {
@@ -187,7 +228,7 @@ public class VFile2 {
 		if(!exists()) {
 			return null;
 		}
-		ByteBuffer readBuffer = PlatformFilesystem.eaglerRead(path);
+		ByteBuffer readBuffer = getFS().eaglerRead(path);
 		byte[] copyBuffer = PlatformRuntime.castNativeByteBuffer(readBuffer);
 		if(copyBuffer != null) {
 			return copyBuffer;
@@ -225,14 +266,14 @@ public class VFile2 {
 		assertNotRelative();
 		ByteBuffer copyBuffer = PlatformRuntime.castPrimitiveByteArray(bytes);
 		if(copyBuffer != null) {
-			PlatformFilesystem.eaglerWrite(path, copyBuffer);
+			getFS().eaglerWrite(path, copyBuffer);
 			return;
 		}
 		copyBuffer = PlatformRuntime.allocateByteBuffer(bytes.length);
 		try {
 			copyBuffer.put(bytes);
 			copyBuffer.flip();
-			PlatformFilesystem.eaglerWrite(path, copyBuffer);
+			getFS().eaglerWrite(path, copyBuffer);
 		}finally {
 			PlatformRuntime.freeByteBuffer(copyBuffer);
 		}
@@ -240,24 +281,30 @@ public class VFile2 {
 
 	public void iterateFiles(VFSIterator2 itr, boolean recursive) {
 		assertNotRelative();
-		PlatformFilesystem.eaglerIterate(path, new VFSFilenameIteratorImpl(itr), recursive);
+		IEaglerFilesystem fs = getFS();
+		fs.eaglerIterate(path, new VFSFilenameIteratorImpl(fs, itr), recursive);
 	}
 
 	public List<String> listFilenames(boolean recursive) {
-		List<String> ret = new ArrayList();
-		PlatformFilesystem.eaglerIterate(path, new VFSListFilenamesIteratorImpl(ret), recursive);
+		List<String> ret = new ArrayList<>();
+		getFS().eaglerIterate(path, new VFSListFilenamesIteratorImpl(ret), recursive);
 		return ret;
 	}
 
 	public List<VFile2> listFiles(boolean recursive) {
-		List<VFile2> ret = new ArrayList();
-		PlatformFilesystem.eaglerIterate(path, new VFSListFilesIteratorImpl(ret), recursive);
+		List<VFile2> ret = new ArrayList<>();
+		IEaglerFilesystem fs = getFS();
+		fs.eaglerIterate(path, new VFSListFilesIteratorImpl(fs, ret), recursive);
 		return ret;
 	}
 
 	public static int copyFile(VFile2 src, VFile2 dst) {
 		src.assertNotRelative();
 		dst.assertNotRelative();
-		return PlatformFilesystem.eaglerCopy(src.path, dst.path);
+		IEaglerFilesystem sfs = src.getFS();
+		if(sfs != dst.getFS()) {
+			throw new UnsupportedOperationException("Cannot copy file between filesystems!");
+		}
+		return sfs.eaglerCopy(src.path, dst.path);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileOutputStream.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileOutputStream.java
index 3ec26fd..d4b6e83 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileOutputStream.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileOutputStream.java
@@ -3,7 +3,6 @@ package net.lax1dude.eaglercraft.v1_8.internal.vfs2;
 import java.io.IOException;
 
 import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 
@@ -41,7 +40,7 @@ class VFileOutputStream extends EaglerOutputStream {
 				copyBuffer.put(buf, 0, count);
 				copyBuffer.flip();
 				try {
-					PlatformFilesystem.eaglerWrite(vfsFile.path, copyBuffer);
+					vfsFile.getFS().eaglerWrite(vfsFile.path, copyBuffer);
 				}catch(Throwable t) {
 					throw new IOException("Could not write stream contents to file!", t);
 				}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/json/JSONTypeProvider.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/json/JSONTypeProvider.java
index 4694e4d..10261b1 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/json/JSONTypeProvider.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/json/JSONTypeProvider.java
@@ -54,10 +54,10 @@ import net.minecraft.world.gen.ChunkProviderSettings;
  */
 public class JSONTypeProvider {
 
-	private static final Map<Class<?>,JSONTypeSerializer<?,?>> serializers = new HashMap();
-	private static final Map<Class<?>,JSONTypeDeserializer<?,?>> deserializers = new HashMap();
+	private static final Map<Class<?>,JSONTypeSerializer<?,?>> serializers = new HashMap<>();
+	private static final Map<Class<?>,JSONTypeDeserializer<?,?>> deserializers = new HashMap<>();
 	
-	private static final List<JSONDataParserImpl> parsers = new ArrayList();
+	private static final List<JSONDataParserImpl> parsers = new ArrayList<>();
 
 	public static <J> J serialize(Object object) throws JSONException {
 		JSONTypeSerializer<Object,J> ser = (JSONTypeSerializer<Object,J>) serializers.get(object.getClass());
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/json/impl/SoundMapDeserializer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/json/impl/SoundMapDeserializer.java
index b90379b..8ac5126 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/json/impl/SoundMapDeserializer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/json/impl/SoundMapDeserializer.java
@@ -30,7 +30,7 @@ public class SoundMapDeserializer implements JSONTypeDeserializer<JSONObject, So
 
 	@Override
 	public SoundMap deserialize(JSONObject json) throws JSONException {
-		Map<String, SoundList> soundsMap = new HashMap();
+		Map<String, SoundList> soundsMap = new HashMap<>();
 		for(String str : json.keySet()) {
 			soundsMap.put(str, JSONTypeProvider.deserialize(json.getJSONObject(str), SoundList.class));
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/log4j/LogManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/log4j/LogManager.java
index 6529617..e804bb1 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/log4j/LogManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/log4j/LogManager.java
@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public class LogManager {
 	
-	private static final Map<String,Logger> loggerInstances = new HashMap();
+	private static final Map<String,Logger> loggerInstances = new HashMap<>();
 	
 	public static final Object logLock = new Object();
 	public static Level logLevel = Level.DEBUG;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/log4j/Logger.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/log4j/Logger.java
index e9dac05..dca4d59 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/log4j/Logger.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/log4j/Logger.java
@@ -101,7 +101,7 @@ public class Logger {
 		log(Level.FATAL, msg);
 	}
 	
-	private static final SimpleDateFormat fmt = EagRuntime.fixDateFormat(new SimpleDateFormat("hh:mm:ss+SSS"));
+	private static final SimpleDateFormat fmt = new SimpleDateFormat("hh:mm:ss+SSS");
 	private static final Date dateInstance = new Date();
 	
 	public void log(Level level, String msg) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/ChunkUpdateManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/ChunkUpdateManager.java
index f20cae7..fa087fd 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/ChunkUpdateManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/ChunkUpdateManager.java
@@ -5,6 +5,7 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 import java.util.LinkedList;
 import java.util.List;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
@@ -35,7 +36,7 @@ public class ChunkUpdateManager {
 	private int chunkUpdatesQueuedLast = 0;
 	private long chunkUpdatesTotalLastUpdate = 0l;
 	
-	private final List<ChunkCompileTaskGenerator> queue = new LinkedList();
+	private final List<ChunkCompileTaskGenerator> queue = new LinkedList<>();
 
 	public ChunkUpdateManager() {
 		worldVertexUploader = new WorldVertexBufferUploader();
@@ -108,8 +109,8 @@ public class ChunkUpdateManager {
 			return false;
 		}else {
 			boolean flag = false;
-			long millis = System.currentTimeMillis();
-			List<ChunkCompileTaskGenerator> droppedUpdates = new LinkedList();
+			long millis = EagRuntime.steadyTimeMillis();
+			List<ChunkCompileTaskGenerator> droppedUpdates = new LinkedList<>();
 			while(!queue.isEmpty()) {
 				ChunkCompileTaskGenerator generator = queue.remove(0);
 				
@@ -125,7 +126,7 @@ public class ChunkUpdateManager {
 				
 				++chunkUpdatesTotal;
 				
-				if(timeout < System.nanoTime()) {
+				if(timeout < EagRuntime.nanoTime()) {
 					break;
 				}
 			}
@@ -176,7 +177,7 @@ public class ChunkUpdateManager {
 		if (chunkcompiletaskgenerator == null) {
 			return true;
 		}
-		chunkcompiletaskgenerator.goddamnFuckingTimeout = System.currentTimeMillis();
+		chunkcompiletaskgenerator.goddamnFuckingTimeout = EagRuntime.steadyTimeMillis();
 		if(queue.size() < 100) {
 			chunkcompiletaskgenerator.addFinishRunnable(new Runnable() {
 				@Override
@@ -219,7 +220,7 @@ public class ChunkUpdateManager {
 	}
 
 	public String getDebugInfo() {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		
 		if(millis - chunkUpdatesTotalLastUpdate > 500l) {
 			chunkUpdatesTotalLastUpdate = millis;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFolderResourcePack.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFolderResourcePack.java
index 2da92f7..633492d 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFolderResourcePack.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFolderResourcePack.java
@@ -105,7 +105,7 @@ public class EaglerFolderResourcePack extends AbstractResourcePack {
 		}
 		try {
 			JSONArray json = (new JSONObject(str)).getJSONArray("resourcePacks");
-			List<EaglerFolderResourcePack> ret = new ArrayList(json.length());
+			List<EaglerFolderResourcePack> ret = new ArrayList<>(json.length());
 			for(int i = 0, l = json.length(); i < l; ++i) {
 				JSONObject jp = json.getJSONObject(i);
 				String folderName = jp.getString("folder");
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFontRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFontRenderer.java
index 2c5708c..a04e7d6 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFontRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFontRenderer.java
@@ -30,6 +30,15 @@ public class EaglerFontRenderer extends FontRenderer {
 
 	private final int[] temporaryCodepointArray = new int[6553];
 
+	public static FontRenderer createSupportedFontRenderer(GameSettings gameSettingsIn, ResourceLocation location,
+			TextureManager textureManagerIn, boolean unicode) {
+		if(EaglercraftGPU.checkInstancingCapable()) {
+			return new EaglerFontRenderer(gameSettingsIn, location, textureManagerIn, unicode);
+		}else {
+			return new FontRenderer(gameSettingsIn, location, textureManagerIn, unicode);
+		}
+	}
+
 	public EaglerFontRenderer(GameSettings gameSettingsIn, ResourceLocation location, TextureManager textureManagerIn,
 			boolean unicode) {
 		super(gameSettingsIn, location, textureManagerIn, unicode);
@@ -116,15 +125,16 @@ public class EaglerFontRenderer extends FontRenderer {
 				++i;
 			} else {
 				int j = temporaryCodepointArray[i];
+				if(j > 255) continue;
 				
 				if (this.randomStyle && j != -1) {
 					int k = this.getCharWidth(c0);
-					String chars = "\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000";
+					char[] chars = FontRenderer.codepointLookup;
 
 					char c1;
 					while (true) {
-						j = this.fontRandom.nextInt(chars.length());
-						c1 = chars.charAt(j);
+						j = this.fontRandom.nextInt(chars.length);
+						c1 = chars[j];
 						if (k == this.getCharWidth(c1)) {
 							break;
 						}
@@ -220,8 +230,7 @@ public class EaglerFontRenderer extends FontRenderer {
 
 	private boolean decodeASCIICodepointsAndValidate(String str) {
 		for(int i = 0, l = str.length(); i < l; ++i) {
-			int j = "\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000\u00a7"
-				.indexOf(str.charAt(i));
+			int j = FontMappingHelper.lookupChar(str.charAt(i), true);
 			if(j != -1) {
 				temporaryCodepointArray[i] = j;
 			}else {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerTextureAtlasSprite.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerTextureAtlasSprite.java
index dcba810..910f379 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerTextureAtlasSprite.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerTextureAtlasSprite.java
@@ -1,7 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.minecraft;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -229,10 +228,10 @@ public class EaglerTextureAtlasSprite {
 			int l = i;
 			this.height = this.width;
 			if (meta.getFrameCount() > 0) {
-				Iterator iterator = meta.getFrameIndexSet().iterator();
+				Iterator<Integer> iterator = meta.getFrameIndexSet().iterator();
 
 				while (iterator.hasNext()) {
-					int i1 = ((Integer) iterator.next()).intValue();
+					int i1 = iterator.next().intValue();
 					if (i1 >= j1) {
 						throw new RuntimeException("invalid frameindex " + i1);
 					}
@@ -243,7 +242,7 @@ public class EaglerTextureAtlasSprite {
 
 				this.animationMetadata = meta;
 			} else {
-				ArrayList arraylist = Lists.newArrayList();
+				List<AnimationFrame> arraylist = Lists.newArrayList();
 
 				for (int l1 = 0; l1 < j1; ++l1) {
 					this.framesTextureData.add(getFrameTextureData(aint, k1, l, l1));
@@ -258,10 +257,10 @@ public class EaglerTextureAtlasSprite {
 	}
 
 	public void generateMipmaps(int level) {
-		ArrayList arraylist = Lists.newArrayList();
+		List<int[][]> arraylist = Lists.newArrayList();
 
 		for (int i = 0; i < this.framesTextureData.size(); ++i) {
-			final int[][] aint = (int[][]) this.framesTextureData.get(i);
+			final int[][] aint = this.framesTextureData.get(i);
 			if (aint != null) {
 				try {
 					arraylist.add(TextureUtil.generateMipmapData(level, this.width, aint));
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EnumInputEvent.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EnumInputEvent.java
new file mode 100755
index 0000000..03bbbf4
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EnumInputEvent.java
@@ -0,0 +1,20 @@
+package net.lax1dude.eaglercraft.v1_8.minecraft;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumInputEvent {
+	CLIPBOARD_COPY, CLIPBOARD_PASTE;
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/FontMappingHelper.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/FontMappingHelper.java
new file mode 100755
index 0000000..cfe2dfa
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/FontMappingHelper.java
@@ -0,0 +1,525 @@
+package net.lax1dude.eaglercraft.v1_8.minecraft;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class FontMappingHelper {
+
+	public static int lookupChar(char c, boolean incSel) {
+		switch(c) {
+		case 167:
+			return incSel ? 256 : -1;
+		case 192:
+			return 0;
+		case 193:
+			return 1;
+		case 194:
+			return 2;
+		case 200:
+			return 3;
+		case 202:
+			return 4;
+		case 203:
+			return 5;
+		case 205:
+			return 6;
+		case 211:
+			return 7;
+		case 212:
+			return 8;
+		case 213:
+			return 9;
+		case 218:
+			return 10;
+		case 223:
+			return 11;
+		case 227:
+			return 12;
+		case 245:
+			return 13;
+		case 287:
+			return 14;
+		case 304:
+			return 15;
+		case 305:
+			return 16;
+		case 338:
+			return 17;
+		case 339:
+			return 18;
+		case 350:
+			return 19;
+		case 351:
+			return 20;
+		case 372:
+			return 21;
+		case 373:
+			return 22;
+		case 382:
+			return 23;
+		case 519:
+			return 24;
+		case 0:
+			return 25;
+		case 32:
+			return 32;
+		case 33:
+			return 33;
+		case 34:
+			return 34;
+		case 35:
+			return 35;
+		case 36:
+			return 36;
+		case 37:
+			return 37;
+		case 38:
+			return 38;
+		case 39:
+			return 39;
+		case 40:
+			return 40;
+		case 41:
+			return 41;
+		case 42:
+			return 42;
+		case 43:
+			return 43;
+		case 44:
+			return 44;
+		case 45:
+			return 45;
+		case 46:
+			return 46;
+		case 47:
+			return 47;
+		case 48:
+			return 48;
+		case 49:
+			return 49;
+		case 50:
+			return 50;
+		case 51:
+			return 51;
+		case 52:
+			return 52;
+		case 53:
+			return 53;
+		case 54:
+			return 54;
+		case 55:
+			return 55;
+		case 56:
+			return 56;
+		case 57:
+			return 57;
+		case 58:
+			return 58;
+		case 59:
+			return 59;
+		case 60:
+			return 60;
+		case 61:
+			return 61;
+		case 62:
+			return 62;
+		case 63:
+			return 63;
+		case 64:
+			return 64;
+		case 65:
+			return 65;
+		case 66:
+			return 66;
+		case 67:
+			return 67;
+		case 68:
+			return 68;
+		case 69:
+			return 69;
+		case 70:
+			return 70;
+		case 71:
+			return 71;
+		case 72:
+			return 72;
+		case 73:
+			return 73;
+		case 74:
+			return 74;
+		case 75:
+			return 75;
+		case 76:
+			return 76;
+		case 77:
+			return 77;
+		case 78:
+			return 78;
+		case 79:
+			return 79;
+		case 80:
+			return 80;
+		case 81:
+			return 81;
+		case 82:
+			return 82;
+		case 83:
+			return 83;
+		case 84:
+			return 84;
+		case 85:
+			return 85;
+		case 86:
+			return 86;
+		case 87:
+			return 87;
+		case 88:
+			return 88;
+		case 89:
+			return 89;
+		case 90:
+			return 90;
+		case 91:
+			return 91;
+		case 92:
+			return 92;
+		case 93:
+			return 93;
+		case 94:
+			return 94;
+		case 95:
+			return 95;
+		case 96:
+			return 96;
+		case 97:
+			return 97;
+		case 98:
+			return 98;
+		case 99:
+			return 99;
+		case 100:
+			return 100;
+		case 101:
+			return 101;
+		case 102:
+			return 102;
+		case 103:
+			return 103;
+		case 104:
+			return 104;
+		case 105:
+			return 105;
+		case 106:
+			return 106;
+		case 107:
+			return 107;
+		case 108:
+			return 108;
+		case 109:
+			return 109;
+		case 110:
+			return 110;
+		case 111:
+			return 111;
+		case 112:
+			return 112;
+		case 113:
+			return 113;
+		case 114:
+			return 114;
+		case 115:
+			return 115;
+		case 116:
+			return 116;
+		case 117:
+			return 117;
+		case 118:
+			return 118;
+		case 119:
+			return 119;
+		case 120:
+			return 120;
+		case 121:
+			return 121;
+		case 122:
+			return 122;
+		case 123:
+			return 123;
+		case 124:
+			return 124;
+		case 125:
+			return 125;
+		case 126:
+			return 126;
+		case 199:
+			return 128;
+		case 252:
+			return 129;
+		case 233:
+			return 130;
+		case 226:
+			return 131;
+		case 228:
+			return 132;
+		case 224:
+			return 133;
+		case 229:
+			return 134;
+		case 231:
+			return 135;
+		case 234:
+			return 136;
+		case 235:
+			return 137;
+		case 232:
+			return 138;
+		case 239:
+			return 139;
+		case 238:
+			return 140;
+		case 236:
+			return 141;
+		case 196:
+			return 142;
+		case 197:
+			return 143;
+		case 201:
+			return 144;
+		case 230:
+			return 145;
+		case 198:
+			return 146;
+		case 244:
+			return 147;
+		case 246:
+			return 148;
+		case 242:
+			return 149;
+		case 251:
+			return 150;
+		case 249:
+			return 151;
+		case 255:
+			return 152;
+		case 214:
+			return 153;
+		case 220:
+			return 154;
+		case 248:
+			return 155;
+		case 163:
+			return 156;
+		case 216:
+			return 157;
+		case 215:
+			return 158;
+		case 402:
+			return 159;
+		case 225:
+			return 160;
+		case 237:
+			return 161;
+		case 243:
+			return 162;
+		case 250:
+			return 163;
+		case 241:
+			return 164;
+		case 209:
+			return 165;
+		case 170:
+			return 166;
+		case 186:
+			return 167;
+		case 191:
+			return 168;
+		case 174:
+			return 169;
+		case 172:
+			return 170;
+		case 189:
+			return 171;
+		case 188:
+			return 172;
+		case 161:
+			return 173;
+		case 171:
+			return 174;
+		case 187:
+			return 175;
+		case 9617:
+			return 176;
+		case 9618:
+			return 177;
+		case 9619:
+			return 178;
+		case 9474:
+			return 179;
+		case 9508:
+			return 180;
+		case 9569:
+			return 181;
+		case 9570:
+			return 182;
+		case 9558:
+			return 183;
+		case 9557:
+			return 184;
+		case 9571:
+			return 185;
+		case 9553:
+			return 186;
+		case 9559:
+			return 187;
+		case 9565:
+			return 188;
+		case 9564:
+			return 189;
+		case 9563:
+			return 190;
+		case 9488:
+			return 191;
+		case 9492:
+			return 192;
+		case 9524:
+			return 193;
+		case 9516:
+			return 194;
+		case 9500:
+			return 195;
+		case 9472:
+			return 196;
+		case 9532:
+			return 197;
+		case 9566:
+			return 198;
+		case 9567:
+			return 199;
+		case 9562:
+			return 200;
+		case 9556:
+			return 201;
+		case 9577:
+			return 202;
+		case 9574:
+			return 203;
+		case 9568:
+			return 204;
+		case 9552:
+			return 205;
+		case 9580:
+			return 206;
+		case 9575:
+			return 207;
+		case 9576:
+			return 208;
+		case 9572:
+			return 209;
+		case 9573:
+			return 210;
+		case 9561:
+			return 211;
+		case 9560:
+			return 212;
+		case 9554:
+			return 213;
+		case 9555:
+			return 214;
+		case 9579:
+			return 215;
+		case 9578:
+			return 216;
+		case 9496:
+			return 217;
+		case 9484:
+			return 218;
+		case 9608:
+			return 219;
+		case 9604:
+			return 220;
+		case 9612:
+			return 221;
+		case 9616:
+			return 222;
+		case 9600:
+			return 223;
+		case 945:
+			return 224;
+		case 946:
+			return 225;
+		case 915:
+			return 226;
+		case 960:
+			return 227;
+		case 931:
+			return 228;
+		case 963:
+			return 229;
+		case 956:
+			return 230;
+		case 964:
+			return 231;
+		case 934:
+			return 232;
+		case 920:
+			return 233;
+		case 937:
+			return 234;
+		case 948:
+			return 235;
+		case 8734:
+			return 236;
+		case 8709:
+			return 237;
+		case 8712:
+			return 238;
+		case 8745:
+			return 239;
+		case 8801:
+			return 240;
+		case 177:
+			return 241;
+		case 8805:
+			return 242;
+		case 8804:
+			return 243;
+		case 8992:
+			return 244;
+		case 8993:
+			return 245;
+		case 247:
+			return 246;
+		case 8776:
+			return 247;
+		case 176:
+			return 248;
+		case 8729:
+			return 249;
+		case 183:
+			return 250;
+		case 8730:
+			return 251;
+		case 8319:
+			return 252;
+		case 178:
+			return 253;
+		case 9632:
+			return 254;
+		default:
+			return -1;
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiButtonWithStupidIcons.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiButtonWithStupidIcons.java
new file mode 100755
index 0000000..8135c66
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiButtonWithStupidIcons.java
@@ -0,0 +1,132 @@
+package net.lax1dude.eaglercraft.v1_8.minecraft;
+
+import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
+
+import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.util.ResourceLocation;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiButtonWithStupidIcons extends GuiButton {
+
+	protected ResourceLocation leftIcon;
+	protected float leftIconAspect;
+	protected ResourceLocation rightIcon;
+	protected float rightIconAspect;
+
+	public GuiButtonWithStupidIcons(int buttonId, int x, int y, int widthIn, int heightIn, String buttonText) {
+		super(buttonId, x, y, widthIn, heightIn, buttonText);
+	}
+
+	public GuiButtonWithStupidIcons(int buttonId, int x, int y, String buttonText) {
+		super(buttonId, x, y, buttonText);
+	}
+
+	public GuiButtonWithStupidIcons(int buttonId, int x, int y, int widthIn, int heightIn, String buttonText,
+			ResourceLocation leftIcon, float leftIconAspect, ResourceLocation rightIcon, float rightIconAspect) {
+		super(buttonId, x, y, widthIn, heightIn, buttonText);
+		this.leftIcon = leftIcon;
+		this.leftIconAspect = leftIconAspect;
+		this.rightIcon = rightIcon;
+		this.rightIconAspect = rightIconAspect;
+	}
+
+	public GuiButtonWithStupidIcons(int buttonId, int x, int y, String buttonText, ResourceLocation leftIcon,
+			float leftIconAspect, ResourceLocation rightIcon, float rightIconAspect) {
+		super(buttonId, x, y, buttonText);
+		this.leftIcon = leftIcon;
+		this.leftIconAspect = leftIconAspect;
+		this.rightIcon = rightIcon;
+		this.rightIconAspect = rightIconAspect;
+	}
+
+	public ResourceLocation getLeftIcon() {
+		return leftIcon;
+	}
+
+	public ResourceLocation getRightIcon() {
+		return rightIcon;
+	}
+
+	public void setLeftIcon(ResourceLocation leftIcon, float aspectRatio) {
+		this.leftIcon = leftIcon;
+		this.leftIconAspect = aspectRatio;
+	}
+
+	public void setRightIcon(ResourceLocation rightIcon, float aspectRatio) {
+		this.rightIcon = rightIcon;
+		this.rightIconAspect = aspectRatio;
+	}
+
+	public void drawButton(Minecraft mc, int mouseX, int mouseY) {
+		if (this.visible) {
+			FontRenderer fontrenderer = mc.fontRendererObj;
+			mc.getTextureManager().bindTexture(buttonTextures);
+			GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+			this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width
+					&& mouseY < this.yPosition + this.height;
+			if (this.enabled && this.hovered) {
+				Mouse.showCursor(EnumCursorType.HAND);
+			}
+			int i = this.getHoverState(this.hovered);
+			GlStateManager.enableBlend();
+			GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+			GlStateManager.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			this.drawTexturedModalRect(this.xPosition, this.yPosition, 0, 46 + i * 20, this.width / 2, this.height);
+			this.drawTexturedModalRect(this.xPosition + this.width / 2, this.yPosition, 200 - this.width / 2,
+					46 + i * 20, this.width / 2, this.height);
+			this.mouseDragged(mc, mouseX, mouseY);
+			int j = 14737632;
+			if (!this.enabled) {
+				j = 10526880;
+			} else if (this.hovered) {
+				j = 16777120;
+			}
+
+			int strWidth = fontrenderer.getStringWidth(displayString);
+			int strWidthAdj = strWidth - (leftIcon != null ? (int) (16 * leftIconAspect) : 0)
+					+ (rightIcon != null ? (int) (16 * rightIconAspect) : 0);
+			this.drawString(fontrenderer, this.displayString, this.xPosition + (this.width - strWidthAdj) / 2,
+					this.yPosition + (this.height - 8) / 2, j);
+			if(leftIcon != null) {
+				GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+				mc.getTextureManager().bindTexture(leftIcon);
+				GlStateManager.pushMatrix();
+				GlStateManager.translate(this.xPosition + (this.width - strWidthAdj) / 2 - 3 - 16 * leftIconAspect, this.yPosition + 2, 0.0f);
+				float f = 16.0f / 256.0f;
+				GlStateManager.scale(f * leftIconAspect, f, f);
+				this.drawTexturedModalRect(0, 0, 0, 0, 256, 256);
+				GlStateManager.popMatrix();
+			}
+			if(rightIcon != null) {
+				GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+				mc.getTextureManager().bindTexture(rightIcon);
+				GlStateManager.pushMatrix();
+				GlStateManager.translate(this.xPosition + (this.width - strWidthAdj) / 2 + strWidth + 3, this.yPosition + 2, 0.0f);
+				float f = 16.0f / 256.0f;
+				GlStateManager.scale(f * rightIconAspect, f, f);
+				this.drawTexturedModalRect(0, 0, 0, 0, 256, 256);
+				GlStateManager.popMatrix();
+			}
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiScreenGenericErrorMessage.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiScreenGenericErrorMessage.java
index 51e4f53..351c274 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiScreenGenericErrorMessage.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiScreenGenericErrorMessage.java
@@ -1,5 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.minecraft;
 
+import org.apache.commons.lang3.StringUtils;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
@@ -26,8 +28,8 @@ public class GuiScreenGenericErrorMessage extends GuiScreen {
 	private GuiScreen cont;
 
 	public GuiScreenGenericErrorMessage(String str1, String str2, GuiScreen cont) {
-		this.str1 = I18n.format(str1);
-		this.str2 = I18n.format(str2);
+		this.str1 = StringUtils.isAllEmpty(str1) ? "" : I18n.format(str1);
+		this.str2 = StringUtils.isAllEmpty(str2) ? "" : I18n.format(str2);
 		this.cont = cont;
 	}
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiScreenVisualViewport.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiScreenVisualViewport.java
new file mode 100755
index 0000000..f24625c
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiScreenVisualViewport.java
@@ -0,0 +1,144 @@
+package net.lax1dude.eaglercraft.v1_8.minecraft;
+
+import net.lax1dude.eaglercraft.v1_8.Display;
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenVisualViewport extends GuiScreen {
+
+	protected int offsetX;
+	protected int offsetY;
+
+	@Override
+	public final void setWorldAndResolution(Minecraft mc, int width, int height) {
+		Display.wasVisualViewportResized(); // clear state
+		offsetX = Display.getVisualViewportX() * width / mc.displayWidth;
+		offsetY = Display.getVisualViewportY() * height / mc.displayHeight;
+		setWorldAndResolution0(mc, Display.getVisualViewportW() * width / mc.displayWidth,
+				Display.getVisualViewportH() * height / mc.displayHeight);
+	}
+
+	protected void setWorldAndResolution0(Minecraft mc, int width, int height) {
+		super.setWorldAndResolution(mc, width, height);
+	}
+
+	@Override
+	public final void updateScreen() {
+		if(Display.wasVisualViewportResized()) {
+			setWorldAndResolution(mc, mc.scaledResolution.getScaledWidth(), mc.scaledResolution.getScaledHeight());
+		}
+		updateScreen0();
+	}
+
+	protected void updateScreen0() {
+		super.updateScreen();
+	}
+
+	@Override
+	public final void drawScreen(int i, int j, float var3) {
+		i -= offsetX;
+		j -= offsetY;
+		GlStateManager.pushMatrix();
+		GlStateManager.translate(offsetX, offsetY, 0.0f);
+		drawScreen0(i, j, var3);
+		GlStateManager.popMatrix();
+	}
+
+	protected void drawScreen0(int i, int j, float var3) {
+		super.drawScreen(i, j, var3);
+	}
+
+	@Override
+	protected final void mouseClicked(int parInt1, int parInt2, int parInt3) {
+		parInt1 -= offsetX;
+		parInt2 -= offsetY;
+		mouseClicked0(parInt1, parInt2, parInt3);
+	}
+
+	protected void mouseClicked0(int parInt1, int parInt2, int parInt3) {
+		super.mouseClicked(parInt1, parInt2, parInt3);
+	}
+
+	@Override
+	protected final void mouseReleased(int i, int j, int k) {
+		i -= offsetX;
+		j -= offsetY;
+		mouseReleased0(i, j, k);
+	}
+
+	protected void mouseReleased0(int i, int j, int k) {
+		super.mouseReleased(i, j, k);
+	}
+
+	@Override
+	protected final void mouseClickMove(int var1, int var2, int var3, long var4) {
+		var1 -= offsetX;
+		var2 -= offsetY;
+		mouseClickMove0(var1, var2, var3, var4);
+	}
+
+	protected void mouseClickMove0(int var1, int var2, int var3, long var4) {
+		super.mouseClickMove(var1, var2, var3, var4);
+	}
+
+	@Override
+	protected final void touchEndMove(int parInt1, int parInt2, int parInt3) {
+		parInt1 -= offsetX;
+		parInt2 -= offsetY;
+		touchEndMove0(parInt1, parInt2, parInt3);
+	}
+
+	protected void touchEndMove0(int parInt1, int parInt2, int parInt3) {
+		super.touchEndMove(parInt1, parInt2, parInt3);
+	}
+
+	@Override
+	protected final void touchMoved(int parInt1, int parInt2, int parInt3) {
+		parInt1 -= offsetX;
+		parInt2 -= offsetY;
+		touchMoved0(parInt1, parInt2, parInt3);
+	}
+
+	protected void touchMoved0(int parInt1, int parInt2, int parInt3) {
+		super.touchMoved(parInt1, parInt2, parInt3);
+	}
+
+	@Override
+	protected final void touchStarted(int parInt1, int parInt2, int parInt3) {
+		parInt1 -= offsetX;
+		parInt2 -= offsetY;
+		touchStarted0(parInt1, parInt2, parInt3);
+	}
+
+	protected void touchStarted0(int parInt1, int parInt2, int parInt3) {
+		super.touchStarted(parInt1, parInt2, parInt3);
+	}
+
+	@Override
+	protected void touchTapped(int parInt1, int parInt2, int parInt3) {
+		parInt1 -= offsetX;
+		parInt2 -= offsetY;
+		touchTapped0(parInt1, parInt2, parInt3);
+	}
+
+	protected void touchTapped0(int parInt1, int parInt2, int parInt3) {
+		super.touchTapped(parInt1, parInt2, parInt3);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/TextureAnimationCache.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/TextureAnimationCache.java
index 630e994..f927568 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/TextureAnimationCache.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/TextureAnimationCache.java
@@ -54,8 +54,8 @@ public class TextureAnimationCache {
 			for(int i = 0; i < cacheTextures.length; ++i) {
 				cacheTextures[i] = GlStateManager.generateTexture();
 				GlStateManager.bindTexture(cacheTextures[i]);
-				EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-				EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+				EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+				EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 				EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 				EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 			}
@@ -123,6 +123,8 @@ public class TextureAnimationCache {
 		if(cacheTextures == null) {
 			throw new IllegalStateException("Cannot copy from uninitialized TextureAnimationCache");
 		}
+		GlStateManager.disableBlend();
+		GlStateManager.disableAlpha();
 		GlStateManager.bindTexture(cacheTextures[level]);
 		TextureCopyUtil.srcSize(width >> level, (height >> level) * frameCount);
 		TextureCopyUtil.blitTextureUsingViewports(0, h * animationFrame, dx, dy, w, h);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/CachedNotifBadgeTexture.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/CachedNotifBadgeTexture.java
new file mode 100755
index 0000000..06e107e
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/CachedNotifBadgeTexture.java
@@ -0,0 +1,46 @@
+package net.lax1dude.eaglercraft.v1_8.notifications;
+
+import java.util.List;
+
+import net.minecraft.util.IChatComponent;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CachedNotifBadgeTexture {
+
+	public final int glTexture;
+	public final int scaleFactor;
+	public final int width;
+	public final int height;
+	public final List<ClickEventZone> cursorEvents;
+	public final IChatComponent rootClickEvent;
+	public final boolean hasClickEvents;
+	public final boolean hasHoverEvents;
+
+	protected CachedNotifBadgeTexture(int glTexture, int scaleFactor, int width, int height,
+			List<ClickEventZone> cursorEvents, IChatComponent rootClickEvent, boolean hasClickEvents,
+			boolean hasHoverEvents) {
+		this.glTexture = glTexture;
+		this.scaleFactor = scaleFactor;
+		this.width = width;
+		this.height = height;
+		this.cursorEvents = cursorEvents;
+		this.rootClickEvent = rootClickEvent;
+		this.hasClickEvents = hasClickEvents;
+		this.hasHoverEvents = hasHoverEvents;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/ClickEventZone.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/ClickEventZone.java
new file mode 100755
index 0000000..e7f7552
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/ClickEventZone.java
@@ -0,0 +1,41 @@
+package net.lax1dude.eaglercraft.v1_8.notifications;
+
+import net.minecraft.util.IChatComponent;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ClickEventZone {
+
+	public final int posX;
+	public final int posY;
+	public final int width;
+	public final int height;
+	public final IChatComponent chatComponent;
+	public final boolean hasHoverEvent;
+	public final boolean hasClickEvent;
+
+	public ClickEventZone(int posX, int posY, int width, int height, IChatComponent chatComponent,
+			boolean hasHoverEvent, boolean hasClickEvent) {
+		this.posX = posX;
+		this.posY = posY;
+		this.width = width;
+		this.height = height;
+		this.chatComponent = chatComponent;
+		this.hasHoverEvent = hasHoverEvent;
+		this.hasClickEvent = hasClickEvent;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/GuiButtonNotifBell.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/GuiButtonNotifBell.java
new file mode 100755
index 0000000..db1acf5
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/GuiButtonNotifBell.java
@@ -0,0 +1,69 @@
+package net.lax1dude.eaglercraft.v1_8.notifications;
+
+import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.util.ResourceLocation;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiButtonNotifBell extends GuiButton {
+
+	private static final ResourceLocation eaglerTextures = new ResourceLocation("eagler:gui/eagler_gui.png");
+
+	private int unread = 0;
+
+	public GuiButtonNotifBell(int buttonID, int xPos, int yPos) {
+		super(buttonID, xPos, yPos, 20, 20, "");
+	}
+
+	public void setUnread(int num) {
+		unread = num;
+	}
+
+	public void drawButton(Minecraft minecraft, int i, int j) {
+		if (this.visible) {
+			minecraft.getTextureManager().bindTexture(eaglerTextures);
+			GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+			boolean flag = i >= this.xPosition && j >= this.yPosition && i < this.xPosition + this.width
+					&& j < this.yPosition + this.height;
+			int k = 0;
+			int c = 14737632;
+			if (flag) {
+				k += this.height;
+				c = 16777120;
+				Mouse.showCursor(EnumCursorType.HAND);
+			}
+
+			drawTexturedModalRect(xPosition, yPosition, unread > 0 ? 116 : 136, k, width, height);
+			
+			if(unread > 0) {
+				GlStateManager.pushMatrix();
+				GlStateManager.translate(xPosition + 15.5f, yPosition + 11.0f, 0.0f);
+				if(unread >= 10) {
+					GlStateManager.translate(0.0f, 1.0f, 0.0f);
+					GlStateManager.scale(0.5f, 0.5f, 0.5f);
+				}else {
+					GlStateManager.scale(0.75f, 0.75f, 0.75f);
+				}
+				drawCenteredString(minecraft.fontRendererObj, Integer.toString(unread), 0, 0, c);
+				GlStateManager.popMatrix();
+			}
+		}
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/GuiScreenNotifications.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/GuiScreenNotifications.java
new file mode 100755
index 0000000..ac2a6b0
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/GuiScreenNotifications.java
@@ -0,0 +1,172 @@
+package net.lax1dude.eaglercraft.v1_8.notifications;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketNotifBadgeShowV4EAG.EnumBadgePriority;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenNotifications extends GuiScreen {
+
+	private static final String[] priorityLangKeys = new String[] {
+			"notifications.priority.low",
+			"notifications.priority.normal",
+			"notifications.priority.higher",
+			"notifications.priority.highest"
+	};
+
+	private static final int[] priorityOrder = new int[] {
+			0, 3, 2, 1
+	};
+
+	GuiScreen parent;
+	int selected;
+	GuiSlotNotifications slots;
+	GuiButton clearAllButton;
+	GuiButton priorityButton;
+	int showPriority = 0;
+	EnumBadgePriority selectedMaxPriority = EnumBadgePriority.LOW;
+	int lastUpdate = -1;
+
+	public GuiScreenNotifications(GuiScreen parent) {
+		this.parent = parent;
+	}
+
+	public void initGui() {
+		selected = -1;
+		buttonList.clear();
+		buttonList.add(new GuiButton(0, this.width / 2 + 54, this.height - 32, 100, 20, I18n.format("gui.done")));
+		buttonList.add(clearAllButton = new GuiButton(1, this.width / 2 - 154, this.height - 32, 100, 20,
+				I18n.format("notifications.clearAll")));
+		int i = priorityOrder[showPriority];
+		buttonList.add(priorityButton = new GuiButton(2, this.width / 2 - 50, this.height - 32, 100, 20,
+				I18n.format("notifications.priority", I18n.format(priorityLangKeys[i]))));
+		selectedMaxPriority = EnumBadgePriority.getByID(i);
+		slots = new GuiSlotNotifications(this);
+		lastUpdate = -69420;
+		updateList();
+		updateButtons();
+	}
+
+	void updateButtons() {
+		clearAllButton.enabled = !slots.currentDisplayNotifs.isEmpty();
+	}
+
+	void updateList() {
+		if(mc.thePlayer == null) return;
+		ServerNotificationManager mgr = mc.thePlayer.sendQueue.getNotifManager();
+		int verHash = showPriority | (mgr.getNotifListUpdateCount() << 2);
+		if(verHash != lastUpdate) {
+			lastUpdate = verHash;
+			EaglercraftUUID selectedUUID = null;
+			List<GuiSlotNotifications.NotifBadgeSlot> lst = slots.currentDisplayNotifs;
+			int oldSelectedId = selected;
+			if(oldSelectedId >= 0 && oldSelectedId < lst.size()) {
+				selectedUUID = lst.get(oldSelectedId).badge.badgeUUID;
+			}
+			lst.clear();
+			lst.addAll(Collections2.transform(Collections2.filter(mgr.getNotifLongHistory(), new Predicate<NotificationBadge>() {
+				@Override
+				public boolean apply(NotificationBadge input) {
+					return input.priority.priority >= priorityOrder[showPriority];
+				}
+			}), GuiSlotNotifications.NotifBadgeSlot::new));
+			selected = -1;
+			if(selectedUUID != null) {
+				for(int i = 0, l = lst.size(); i < l; ++i) {
+					if(selectedUUID.equals(lst.get(i).badge.badgeUUID)) {
+						selected = i;
+						break;
+					}
+				}
+			}
+			if(selected != -1) {
+				if(oldSelectedId != selected) {
+					slots.scrollBy((selected - oldSelectedId) * slots.getSlotHeight());
+				}
+			}
+			updateButtons();
+		}
+	}
+
+	public void updateScreen() {
+		if(mc.thePlayer == null) {
+			mc.displayGuiScreen(parent);
+			return;
+		}
+		updateList();
+	}
+
+	static Minecraft getMinecraft(GuiScreenNotifications screen) {
+		return screen.mc;
+	}
+
+	public void actionPerformed(GuiButton btn) {
+		switch(btn.id) {
+		case 0:
+			mc.displayGuiScreen(parent);
+			break;
+		case 1:
+			if(mc.thePlayer != null) {
+				ServerNotificationManager mgr = mc.thePlayer.sendQueue.getNotifManager();
+				mgr.removeAllNotifFromActiveList(mgr.getNotifLongHistory());
+				clearAllButton.enabled = false;
+			}
+			break;
+		case 2:
+			showPriority = (showPriority + 1) & 3;
+			int i = priorityOrder[showPriority];
+			priorityButton.displayString = I18n.format("notifications.priority", I18n.format(priorityLangKeys[i]));
+			selectedMaxPriority = EnumBadgePriority.getByID(i);
+			updateList();
+			break;
+		default:
+			break;
+		}
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		if(mc.thePlayer == null) return;
+		slots.drawScreen(par1, par2, par3);
+		this.drawCenteredString(fontRendererObj, I18n.format("notifications.title"), this.width / 2, 16, 16777215);
+		super.drawScreen(par1, par2, par3);
+	}
+
+	public void handleMouseInput() throws IOException {
+		super.handleMouseInput();
+		slots.handleMouseInput();
+	}
+
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		slots.handleTouchInput();
+	}
+
+	public void onGuiClosed() {
+		if(mc.thePlayer != null) {
+			mc.thePlayer.sendQueue.getNotifManager().commitUnreadFlag();
+		}
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/GuiSlotNotifications.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/GuiSlotNotifications.java
new file mode 100755
index 0000000..b05fcef
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/GuiSlotNotifications.java
@@ -0,0 +1,338 @@
+package net.lax1dude.eaglercraft.v1_8.notifications;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketNotifBadgeShowV4EAG.EnumBadgePriority;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.client.gui.GuiSlot;
+import net.minecraft.client.gui.GuiUtilRenderComponents;
+import net.minecraft.event.ClickEvent;
+import net.minecraft.event.HoverEvent;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiSlotNotifications extends GuiSlot {
+
+	private static final ResourceLocation eaglerGui = new ResourceLocation("eagler:gui/eagler_gui.png");
+	private static final ResourceLocation largeNotifBk = new ResourceLocation("eagler:gui/notif_bk_large.png");
+
+	private static final SimpleDateFormat dateFormat = new SimpleDateFormat("hh:mm a");
+
+	final GuiScreenNotifications parent;
+	final List<NotifBadgeSlot> currentDisplayNotifs;
+
+	int mouseX;
+	int mouseY;
+
+	protected static class NotifBadgeSlot {
+		
+		protected final NotificationBadge badge;
+		protected final List<ClickEventZone> cursorEvents = new ArrayList<>();
+		protected int currentScreenX = -69420;
+		protected int currentScreenY = -69420;
+		
+		protected NotifBadgeSlot(NotificationBadge badge) {
+			this.badge = badge;
+		}
+		
+	}
+
+	public GuiSlotNotifications(GuiScreenNotifications parent) {
+		super(GuiScreenNotifications.getMinecraft(parent), parent.width, parent.height, 32, parent.height - 44, 68);
+		this.parent = parent;
+		this.currentDisplayNotifs = new ArrayList<>();
+	}
+
+	@Override
+	protected int getSize() {
+		return currentDisplayNotifs.size();
+	}
+
+	@Override
+	protected void elementClicked(int id, boolean doubleClk, int xx, int yy) {
+		if(selectedElement != id) return; //workaround for vanilla bs
+		if(id < currentDisplayNotifs.size()) {
+			NotifBadgeSlot slot = currentDisplayNotifs.get(id);
+			if(slot.currentScreenY != -69420) {
+				int w = getListWidth();
+				int localX = xx - slot.currentScreenX;
+				int localY = yy - slot.currentScreenY;
+				if(localX >= w - 22 && localX < w - 5 && localY >= 5 && localY < 21) {
+					slot.badge.removeNotif();
+					mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+					return;
+				}
+				IChatComponent cmp = slot.badge.bodyComponent;
+				if(cmp != null) {
+					if(doubleClk) {
+						if (cmp.getChatStyle().getChatClickEvent() != null
+								&& cmp.getChatStyle().getChatClickEvent().getAction().shouldAllowInChat()) {
+							if(parent.handleComponentClick(cmp)) {
+								mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+								return;
+							}
+						}
+					}else {
+						if(parent.selected != id) {
+							parent.selected = id;
+						}else {
+							List<ClickEventZone> cursorEvents = slot.cursorEvents;
+							if(cursorEvents != null && !cursorEvents.isEmpty()) {
+								for(int j = 0, m = cursorEvents.size(); j < m; ++j) {
+									ClickEventZone evt = cursorEvents.get(j);
+									if(evt.hasClickEvent) {
+										int offsetPosX = slot.currentScreenX + evt.posX;
+										int offsetPosY = slot.currentScreenY + evt.posY;
+										if(xx >= offsetPosX && yy >= offsetPosY && xx < offsetPosX + evt.width && yy < offsetPosY + evt.height) {
+											if(parent.handleComponentClick(evt.chatComponent)) {
+												mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+												return;
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	protected boolean isSelected(int var1) {
+		return var1 == parent.selected;
+	}
+
+	@Override
+	protected void drawBackground() {
+		parent.drawBackground(0);
+	}
+
+	@Override
+	protected void drawSlot(int id, int xx, int yy, int width, int height, int ii) {
+		if(id < currentDisplayNotifs.size()) {
+			NotifBadgeSlot slot = currentDisplayNotifs.get(id);
+			slot.currentScreenX = xx;
+			slot.currentScreenY = yy;
+			NotificationBadge bd = slot.badge;
+			if(yy + 32 > this.top && yy + 32 < this.bottom) {
+				bd.markRead();
+			}
+			GlStateManager.pushMatrix();
+			GlStateManager.translate(xx, yy, 0.0f);
+			mc.getTextureManager().bindTexture(largeNotifBk);
+			int badgeWidth = getListWidth() - 4;
+			int badgeHeight = getSlotHeight() - 4;
+			float r = ((bd.backgroundColor >> 16) & 0xFF) * 0.00392156f;
+			float g = ((bd.backgroundColor >> 8) & 0xFF) * 0.00392156f;
+			float b = (bd.backgroundColor & 0xFF) * 0.00392156f;
+			if(parent.selected != id) {
+				r *= 0.85f;
+				g *= 0.85f;
+				b *= 0.85f;
+			}
+			GlStateManager.color(r, g, b, 1.0f);
+			parent.drawTexturedModalRect(0, 0, 0, bd.unreadFlagRender ? 64 : 0, badgeWidth - 32, 64);
+			parent.drawTexturedModalRect(badgeWidth - 32, 0, 224, bd.unreadFlagRender ? 64 : 0, 32, 64);
+			mc.getTextureManager().bindTexture(eaglerGui);
+			if(bd.priority == EnumBadgePriority.LOW) {
+				parent.drawTexturedModalRect(badgeWidth - 21, badgeHeight - 21, 192, 176, 16, 16);
+			}
+			GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+			
+			switch(bd.priority) {
+			default:
+				break;
+			case NORMAL:
+				parent.drawTexturedModalRect(badgeWidth - 21, badgeHeight - 21, 208, 176, 16, 16);
+				break;
+			case HIGHER:
+				parent.drawTexturedModalRect(badgeWidth - 21, badgeHeight - 21, 224, 176, 16, 16);
+				break;
+			case HIGHEST:
+				parent.drawTexturedModalRect(badgeWidth - 21, badgeHeight - 21, 240, 176, 16, 16);
+				break;
+			}
+			
+			int bodyYOffset = 16;
+					
+			int leftPadding = 6;
+			int rightPadding = 26;
+			
+			int mainIconSW = 32;
+			boolean mainIconEn = bd.mainIcon != null && bd.mainIcon.isValid();
+			if(mainIconEn) {
+				int iw = bd.mainIcon.texture.getWidth();
+				int ih = bd.mainIcon.texture.getHeight();
+				float iaspect = (float)iw / (float)ih;
+				mainIconSW = (int)(32 * iaspect);
+				leftPadding += Math.min(mainIconSW, 64) + 3;
+			}
+			
+			int textZoneWidth = badgeWidth - leftPadding - rightPadding;
+			
+			if(mainIconEn) {
+				mc.getTextureManager().bindTexture(bd.mainIcon.resource);
+				ServerNotificationRenderer.drawTexturedRect(6, bodyYOffset, mainIconSW, 32);
+			}
+
+			boolean titleIconEn = bd.titleIcon != null && bd.titleIcon.isValid();
+			if(titleIconEn) {
+				mc.getTextureManager().bindTexture(bd.titleIcon.resource);
+				ServerNotificationRenderer.drawTexturedRect(6, 5, 8, 8);
+			}
+			
+			String titleText = "";
+			IChatComponent titleComponent = bd.getTitleProfanityFilter();
+			if(titleComponent != null) {
+				titleText = titleComponent.getFormattedText();
+			}
+			
+			titleText += EnumChatFormatting.GRAY + (titleText.length() > 0 ? " @ " : "@ ")
+					+ (bd.unreadFlagRender ? EnumChatFormatting.YELLOW : EnumChatFormatting.GRAY)
+					+ formatAge(bd.serverTimestamp);
+
+			GlStateManager.pushMatrix();
+			GlStateManager.translate(6 + (titleIconEn ? 10 : 0), 6, 0.0f);
+			GlStateManager.scale(0.75f, 0.75f, 0.75f);
+			mc.fontRendererObj.drawStringWithShadow(titleText, 0, 0, bd.titleTxtColor);
+			GlStateManager.popMatrix();
+			
+			String sourceText = null;
+			IChatComponent sourceComponent = bd.getSourceProfanityFilter();
+			if(sourceComponent != null) {
+				sourceText = sourceComponent.getFormattedText();
+				if(sourceText.length() == 0) {
+					sourceText = null;
+				}
+			}
+			
+			List<IChatComponent> bodyLines = null;
+			float bodyFontSize = (sourceText != null || titleIconEn) ? 0.75f : 1.0f;
+			IChatComponent bodyComponent = bd.getBodyProfanityFilter();
+			if(bodyComponent != null) {
+				bodyLines = GuiUtilRenderComponents.func_178908_a(bodyComponent, (int) (textZoneWidth / bodyFontSize),
+						mc.fontRendererObj, true, true);
+				
+				int maxHeight = badgeHeight - (sourceText != null ? 32 : 22);
+				int maxLines = MathHelper.floor_float(maxHeight / (9 * bodyFontSize));
+				if(bodyLines.size() > maxLines) {
+					bodyLines = bodyLines.subList(0, maxLines);
+					IChatComponent cmp = bodyLines.get(maxLines - 1);
+					List<IChatComponent> siblings = cmp.getSiblings();
+					IChatComponent dots = new ChatComponentText("...");
+					if(siblings != null && siblings.size() > 0) {
+						dots.setChatStyle(siblings.get(siblings.size() - 1).getChatStyle());
+					}
+					cmp.appendSibling(dots);
+				}
+			}
+			
+			slot.cursorEvents.clear();
+			if(bodyLines != null && !bodyLines.isEmpty()) {
+				GlStateManager.pushMatrix();
+				GlStateManager.translate(leftPadding, bodyYOffset, 0.0f);
+				int l = bodyLines.size();
+				GlStateManager.scale(bodyFontSize, bodyFontSize, bodyFontSize);
+				IChatComponent toolTip = null;
+				for(int i = 0; i < l; ++i) {
+					int startXLocal = 0;
+					int startXReal = leftPadding;
+					for(IChatComponent comp : bodyLines.get(i)) {
+						int w = mc.fontRendererObj.drawStringWithShadow(
+								comp.getChatStyle().getFormattingCode() + comp.getUnformattedTextForChat(), startXLocal,
+								i * 9, bd.bodyTxtColor) - startXLocal;
+						ClickEvent clickEvent = comp.getChatStyle().getChatClickEvent();
+						HoverEvent hoverEvent = toolTip == null ? comp.getChatStyle().getChatHoverEvent() : null;
+						if(clickEvent != null && !clickEvent.getAction().shouldAllowInChat()) {
+							clickEvent = null;
+						}
+						if(hoverEvent != null && !hoverEvent.getAction().shouldAllowInChat()) {
+							hoverEvent = null;
+						}
+						if(clickEvent != null) {
+							slot.cursorEvents.add(new ClickEventZone(startXReal + (int) (startXLocal * bodyFontSize),
+									bodyYOffset + (int) (i * 9 * bodyFontSize), (int) (w * bodyFontSize),
+									(int) (9 * bodyFontSize), comp, clickEvent != null, hoverEvent != null));
+						}
+						if(hoverEvent != null) {
+							int px = xx + startXReal + (int) (startXLocal * bodyFontSize);
+							int py = yy + bodyYOffset + (int) (i * 9 * bodyFontSize);
+							if (mouseX >= px && mouseX < px + (int) (w * bodyFontSize) && mouseY >= py
+									&& mouseY < py + (int) (9 * bodyFontSize)) {
+								toolTip = comp;
+							}
+						}
+						startXLocal += w;
+					}
+				}
+				GlStateManager.popMatrix();
+				if(toolTip != null) {
+					parent.handleComponentHover(toolTip, mouseX - xx, mouseY - yy);
+				}
+			}
+			
+			if(sourceText != null) {
+				GlStateManager.pushMatrix();
+				GlStateManager.translate(badgeWidth - 21, badgeHeight - 5, 0.0f);
+				GlStateManager.scale(0.75f, 0.75f, 0.75f);
+				mc.fontRendererObj.drawStringWithShadow(sourceText, -mc.fontRendererObj.getStringWidth(sourceText) - 4, -10, bd.sourceTxtColor);
+				GlStateManager.popMatrix();
+			}
+			
+			GlStateManager.popMatrix();
+		}
+	}
+
+	private String formatAge(long serverTimestamp) {
+		long cur = System.currentTimeMillis();
+		long daysAgo = Math.round((cur - serverTimestamp) / 86400000.0);
+		String ret = dateFormat.format(new Date(serverTimestamp));
+		if(daysAgo > 0l) {
+			ret += " (" + daysAgo + (daysAgo == 1l ? " day" : " days") + " ago)";
+		}else if(daysAgo < 0l) {
+			ret += " (in " + -daysAgo + (daysAgo == -1l ? " day" : " days") + ")";
+		}
+		return ret;
+	}
+
+	@Override
+	public int getListWidth() {
+		return 224;
+	}
+
+	@Override
+	public void drawScreen(int mouseXIn, int mouseYIn, float parFloat1) {
+		mouseX = mouseXIn;
+		mouseY = mouseYIn;
+		for(int i = 0, l = currentDisplayNotifs.size(); i < l; ++i) {
+			NotifBadgeSlot slot = currentDisplayNotifs.get(i);
+			slot.currentScreenX = -69420;
+			slot.currentScreenY = -69420;
+		}
+		super.drawScreen(mouseXIn, mouseYIn, parFloat1);
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/NotificationBadge.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/NotificationBadge.java
new file mode 100755
index 0000000..02598a8
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/NotificationBadge.java
@@ -0,0 +1,171 @@
+package net.lax1dude.eaglercraft.v1_8.notifications;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+import net.lax1dude.eaglercraft.v1_8.profanity_filter.ProfanityFilter;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketNotifBadgeShowV4EAG.EnumBadgePriority;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.IChatComponent;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class NotificationBadge {
+	
+	public final ServerNotificationManager mgr;
+	public final EaglercraftUUID badgeUUID;
+	public final IChatComponent bodyComponent;
+	protected IChatComponent bodyComponentProfanityFilter;
+	public final IChatComponent titleComponent;
+	protected IChatComponent titleComponentProfanityFilter;
+	public final IChatComponent sourceComponent;
+	protected IChatComponent sourceComponentProfanityFilter;
+	public final long clientTimestamp;
+	public final long serverTimestamp;
+	public final boolean silent;
+	public final EnumBadgePriority priority;
+	public final NotificationIcon mainIcon;
+	public final NotificationIcon titleIcon;
+	public final int hideAfterSec;
+	public final int expireAfterSec;
+	public final int backgroundColor;
+	public final int bodyTxtColor;
+	public final int titleTxtColor;
+	public final int sourceTxtColor;
+
+	protected CachedNotifBadgeTexture currentCacheGLTexture = null;
+	protected int currentCacheScaleFac = -1;
+	protected boolean currentCacheXButton = false;
+	protected boolean currentCacheProfanityFilter = false;
+	protected long hideAtMillis = -1l;
+	protected boolean unreadFlag = true;
+	protected boolean unreadFlagRender = true;
+	
+	protected NotificationBadge(ServerNotificationManager mgr, EaglercraftUUID badgeUUID, IChatComponent bodyComponent,
+			IChatComponent titleComponent, IChatComponent sourceComponent, long clientTimestamp, long serverTimestamp,
+			boolean silent, EnumBadgePriority priority, NotificationIcon mainIcon, NotificationIcon titleIcon,
+			int hideAfterSec, int expireAfterSec, int backgroundColor, int bodyTxtColor, int titleTxtColor,
+			int sourceTxtColor) {
+		this.mgr = mgr;
+		this.badgeUUID = badgeUUID;
+		this.bodyComponent = bodyComponent;
+		this.titleComponent = titleComponent;
+		this.sourceComponent = sourceComponent;
+		this.clientTimestamp = clientTimestamp;
+		this.serverTimestamp = serverTimestamp;
+		this.silent = silent;
+		this.priority = priority;
+		this.mainIcon = mainIcon;
+		this.titleIcon = titleIcon;
+		this.hideAfterSec = hideAfterSec;
+		this.expireAfterSec = expireAfterSec;
+		this.backgroundColor = backgroundColor;
+		this.bodyTxtColor = bodyTxtColor;
+		this.titleTxtColor = titleTxtColor;
+		this.sourceTxtColor = sourceTxtColor;
+	}
+	
+	protected void incrIconRefcounts() {
+		if(mainIcon != null) {
+			mainIcon.retain();
+		}
+		if(titleIcon != null) {
+			titleIcon.retain();
+		}
+	}
+	
+	protected void decrIconRefcounts() {
+		deleteGLTexture();
+		if(mainIcon != null) {
+			mainIcon.release();
+		}
+		if(titleIcon != null) {
+			titleIcon.release();
+		}
+	}
+
+	protected CachedNotifBadgeTexture getGLTexture(ServerNotificationRenderer renderer, int scaleFactor, boolean showXButton) {
+		boolean profanityFilter = Minecraft.getMinecraft().isEnableProfanityFilter();
+		if(currentCacheGLTexture == null || currentCacheScaleFac != scaleFactor || currentCacheXButton != showXButton || currentCacheProfanityFilter != profanityFilter) {
+			deleteGLTexture();
+			currentCacheGLTexture = renderer.renderBadge(this, scaleFactor, showXButton);
+			currentCacheScaleFac = scaleFactor;
+			currentCacheXButton = showXButton;
+			currentCacheProfanityFilter = profanityFilter;
+		}
+		return currentCacheGLTexture;
+	}
+
+	protected void deleteGLTexture() {
+		if(currentCacheGLTexture != null) {
+			GlStateManager.deleteTexture(currentCacheGLTexture.glTexture);
+			currentCacheGLTexture = null;
+		}
+	}
+
+	public void hideNotif() {
+		if(hideAtMillis == -1l) {
+			markRead();
+			unreadFlagRender = false;
+			hideAtMillis = EagRuntime.steadyTimeMillis();
+		}
+	}
+
+	public void removeNotif() {
+		mgr.removeNotifFromActiveList(badgeUUID);
+	}
+
+	public void markRead() {
+		if(unreadFlag) {
+			unreadFlag = false;
+			--mgr.unreadCounter;
+		}
+	}
+
+	public IChatComponent getBodyProfanityFilter() {
+		if(Minecraft.getMinecraft().isEnableProfanityFilter()) {
+			if(bodyComponentProfanityFilter == null && bodyComponent != null) {
+				bodyComponentProfanityFilter = ProfanityFilter.getInstance().profanityFilterChatComponent(bodyComponent);
+			}
+			return bodyComponentProfanityFilter;
+		}else {
+			return bodyComponent;
+		}
+	}
+
+	public IChatComponent getTitleProfanityFilter() {
+		if(Minecraft.getMinecraft().isEnableProfanityFilter()) {
+			if(titleComponentProfanityFilter == null && titleComponent != null) {
+				titleComponentProfanityFilter = ProfanityFilter.getInstance().profanityFilterChatComponent(titleComponent);
+			}
+			return titleComponentProfanityFilter;
+		}else {
+			return titleComponent;
+		}
+	}
+
+	public IChatComponent getSourceProfanityFilter() {
+		if(Minecraft.getMinecraft().isEnableProfanityFilter()) {
+			if(sourceComponentProfanityFilter == null && sourceComponent != null) {
+				sourceComponentProfanityFilter = ProfanityFilter.getInstance().profanityFilterChatComponent(sourceComponent);
+			}
+			return sourceComponentProfanityFilter;
+		}else {
+			return sourceComponent;
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/NotificationIcon.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/NotificationIcon.java
new file mode 100755
index 0000000..772e186
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/NotificationIcon.java
@@ -0,0 +1,51 @@
+package net.lax1dude.eaglercraft.v1_8.notifications;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.profile.EaglerSkinTexture;
+import net.minecraft.util.ResourceLocation;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class NotificationIcon {
+
+	private static int notifIconTmpId = 0;
+
+	protected int refCount = 0;
+	protected boolean serverRegistered = true;
+
+	public final EaglercraftUUID iconUUID;
+	public final EaglerSkinTexture texture;
+	public final ResourceLocation resource;
+
+	protected NotificationIcon(EaglercraftUUID iconUUID, EaglerSkinTexture texture) {
+		this.iconUUID = iconUUID;
+		this.texture = texture;
+		this.resource = new ResourceLocation("eagler:gui/server/notifs/tex_" + notifIconTmpId++);
+	}
+
+	public void retain() {
+		++refCount;
+	}
+
+	public void release() {
+		--refCount;
+	}
+
+	public boolean isValid() {
+		return serverRegistered || refCount > 0;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/ServerNotificationManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/ServerNotificationManager.java
new file mode 100755
index 0000000..eb7adc4
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/ServerNotificationManager.java
@@ -0,0 +1,277 @@
+package net.lax1dude.eaglercraft.v1_8.notifications;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
+import net.lax1dude.eaglercraft.v1_8.profile.EaglerSkinTexture;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketNotifBadgeHideV4EAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketNotifBadgeShowV4EAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketNotifIconsRegisterV4EAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketNotifIconsReleaseV4EAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.util.PacketImageData;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.util.IChatComponent;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ServerNotificationManager {
+
+	private static final Logger logger = LogManager.getLogger("ServerNotificationManager");
+
+	private final Map<EaglercraftUUID,NotificationIcon> activeIcons = new HashMap<>();
+	private final Map<EaglercraftUUID,NotificationBadge> activeNotifications = new HashMap<>();
+	private List<NotificationBadge> sortedNotifList = new ArrayList<>(0);
+	private List<NotificationBadge> sortedDisplayNotifList = new ArrayList<>(0);
+	private int updateCounter = 0;
+	private long lastCleanup = EagRuntime.steadyTimeMillis();
+	private final TextureManager textureMgr;
+	protected int unreadCounter = 0;
+
+	public ServerNotificationManager() {
+		this.textureMgr = Minecraft.getMinecraft().getTextureManager();
+	}
+
+	public void processPacketAddIcons(SPacketNotifIconsRegisterV4EAG packet) {
+		for(SPacketNotifIconsRegisterV4EAG.CreateIcon icn : packet.iconsToCreate) {
+			if(icn.uuidMost == 0 && icn.uuidLeast == 0) {
+				logger.error("Skipping notification icon with UUID 0!");
+				continue;
+			}
+			EaglercraftUUID uuid = new EaglercraftUUID(icn.uuidMost, icn.uuidLeast);
+			PacketImageData imageData = icn.imageData;
+			NotificationIcon existing = activeIcons.get(uuid);
+			if(existing != null) {
+				if (existing.texture.getWidth() != imageData.width
+						|| existing.texture.getHeight() != imageData.height) {
+					logger.error("Error: server tried to change the dimensions of icon {}!", uuid);
+				}else if(!Arrays.equals(existing.texture.getData(), imageData.rgba)) {
+					existing.texture.copyPixelsIn(ImageData.swapRB(imageData.rgba));
+				}
+				existing.serverRegistered = true;
+				continue;
+			}
+			NotificationIcon newIcon = new NotificationIcon(uuid,
+					new EaglerSkinTexture(ImageData.swapRB(imageData.rgba), imageData.width, imageData.height));
+			textureMgr.loadTexture(newIcon.resource, newIcon.texture);
+			activeIcons.put(uuid, newIcon);
+		}
+	}
+
+	public void processPacketRemIcons(SPacketNotifIconsReleaseV4EAG packet) {
+		for(SPacketNotifIconsReleaseV4EAG.DestroyIcon icn : packet.iconsToDestroy) {
+			NotificationIcon existing = activeIcons.get(new EaglercraftUUID(icn.uuidMost, icn.uuidLeast));
+			if(existing != null) {
+				existing.serverRegistered = false;
+			}
+		}
+	}
+
+	public void processPacketShowBadge(SPacketNotifBadgeShowV4EAG packet) {
+		EaglercraftUUID newUuid = new EaglercraftUUID(packet.badgeUUIDMost, packet.badgeUUIDLeast);
+		NotificationBadge existing = activeNotifications.get(newUuid);
+		if(existing != null) {
+			logger.error("Duplicate notification UUID {}, all notifications should have unique UUIDs!", newUuid);
+			return;
+		}
+		NotificationBadge newBadge = new NotificationBadge(this, newUuid,
+				!StringUtils.isAllBlank(packet.bodyComponent) ? IChatComponent.Serializer.jsonToComponent(packet.bodyComponent) : null,
+				!StringUtils.isAllBlank(packet.titleComponent) ? IChatComponent.Serializer.jsonToComponent(packet.titleComponent) : null,
+				!StringUtils.isAllBlank(packet.sourceComponent) ? IChatComponent.Serializer.jsonToComponent(packet.sourceComponent) : null,
+				EagRuntime.steadyTimeMillis(), packet.originalTimestampSec * 1000l, packet.silent, packet.priority,
+				getIcon(packet.mainIconUUIDMost, packet.mainIconUUIDLeast),
+				getIcon(packet.titleIconUUIDMost, packet.titleIconUUIDLeast), packet.hideAfterSec, packet.expireAfterSec,
+				packet.backgroundColor, packet.bodyTxtColor, packet.titleTxtColor, packet.sourceTxtColor);
+		++unreadCounter;
+		addNotifToActiveList(newBadge);
+	}
+
+	private NotificationIcon getIcon(long uuidMost, long uuidLeast) {
+		if(uuidMost == 0l && uuidLeast == 0l) {
+			return null;
+		}
+		return activeIcons.get(new EaglercraftUUID(uuidMost, uuidLeast));
+	}
+
+	public void processPacketHideBadge(SPacketNotifBadgeHideV4EAG packet) {
+		removeNotifFromActiveList(new EaglercraftUUID(packet.badgeUUIDLeast, packet.badgeUUIDMost));
+	}
+
+	public int getNotifListUpdateCount() {
+		return updateCounter;
+	}
+
+	public List<NotificationBadge> getNotifBadgesToDisplay() {
+		return sortedDisplayNotifList;
+	}
+
+	public List<NotificationBadge> getNotifLongHistory() {
+		return sortedNotifList;
+	}
+
+	protected void addNotifToActiveList(NotificationBadge badge) {
+		NotificationBadge exists = activeNotifications.put(badge.badgeUUID, badge);
+		if(exists != null) {
+			exists.decrIconRefcounts();
+		}
+		badge.incrIconRefcounts();
+		resortLists();
+	}
+
+	protected void removeNotifFromActiveList(EaglercraftUUID badge) {
+		NotificationBadge exists = activeNotifications.remove(badge);
+		if(exists != null) {
+			exists.decrIconRefcounts();
+			resortLists();
+		}
+	}
+
+	protected void removeAllNotifFromActiveList(Collection<NotificationBadge> badges) {
+		boolean resort = false;
+		for(NotificationBadge badge : badges) {
+			NotificationBadge exists = activeNotifications.remove(badge.badgeUUID);
+			if(exists != null) {
+				exists.decrIconRefcounts();
+				resort = true;
+			}
+		}
+		if(resort) {
+			resortLists();
+		}
+	}
+
+	protected static final Comparator<NotificationBadge> clientAgeComparator = (a, b) -> {
+		return (int)(b.clientTimestamp - a.clientTimestamp);
+	};
+
+	private void resortLists() {
+		updateCounter++;
+		int ll = activeNotifications.size();
+		if(!sortedNotifList.isEmpty()) sortedNotifList = new ArrayList<>(ll);
+		if(!sortedDisplayNotifList.isEmpty()) sortedDisplayNotifList = new ArrayList<>(Math.min(ll, 4));
+		if(ll > 0) {
+			sortedNotifList.addAll(activeNotifications.values());
+			Collections.sort(sortedNotifList, clientAgeComparator);
+			long millis = EagRuntime.steadyTimeMillis();
+			for(int i = 0, l = sortedNotifList.size(); i < l; ++i) {
+				NotificationBadge bd = sortedNotifList.get(i);
+				if(millis - bd.clientTimestamp < (long)(bd.hideAfterSec * 1000)) {
+					sortedDisplayNotifList.add(bd);
+				}else {
+					bd.deleteGLTexture();
+				}
+			}
+		}
+	}
+
+	public void runTick() {
+		long millis = EagRuntime.steadyTimeMillis();
+		if(millis - lastCleanup > 2500l) {
+			lastCleanup = millis;
+			int len = sortedNotifList.size();
+			if(len > 128) {
+				removeAllNotifFromActiveList(new ArrayList<NotificationBadge>(sortedNotifList.subList(128, len)));
+			}
+			Iterator<NotificationIcon> itr = activeIcons.values().iterator();
+			while(itr.hasNext()) {
+				NotificationIcon icn = itr.next();
+				if(!icn.isValid()) {
+					itr.remove();
+					textureMgr.deleteTexture(icn.resource);
+				}
+			}
+			if(!sortedDisplayNotifList.isEmpty()) {
+				Iterator<NotificationBadge> itr2 = sortedDisplayNotifList.iterator();
+				while(itr2.hasNext()) {
+					NotificationBadge bd = itr2.next();
+					if(bd.hideAtMillis != -1l) {
+						if(millis - bd.hideAtMillis > 500l) {
+							bd.deleteGLTexture();
+							itr2.remove();
+						}
+					}else {
+						long age = millis - bd.clientTimestamp;
+						if(age > (long)(bd.hideAfterSec * 1000) || age > (long)(bd.expireAfterSec * 1000)) {
+							bd.deleteGLTexture();
+							itr2.remove();
+						}
+					}
+				}
+			}
+			if(!activeNotifications.isEmpty()) {
+				Iterator<NotificationBadge> itr3 = activeNotifications.values().iterator();
+				List<NotificationBadge> toDelete = null;
+				while(itr3.hasNext()) {
+					NotificationBadge bd = itr3.next();
+					long age = millis - bd.clientTimestamp;
+					if(age > (long)(bd.expireAfterSec * 1000)) {
+						if(toDelete == null) {
+							toDelete = new ArrayList<>();
+						}
+						toDelete.add(bd);
+					}
+				}
+				if(toDelete != null) {
+					removeAllNotifFromActiveList(toDelete);
+				}
+			}
+		}
+	}
+
+	public int getUnread() {
+		if(unreadCounter < 0) unreadCounter = 0;
+		return unreadCounter;
+	}
+
+	public void commitUnreadFlag() {
+		for(NotificationBadge badge : activeNotifications.values()) {
+			badge.unreadFlagRender = badge.unreadFlag;
+		}
+	}
+
+	public void markRead() {
+		for(NotificationBadge badge : activeNotifications.values()) {
+			badge.unreadFlag = false;
+			badge.unreadFlagRender = false;
+		}
+		unreadCounter = 0;
+	}
+
+	public void destroy() {
+		for(NotificationIcon icn : activeIcons.values()) {
+			textureMgr.deleteTexture(icn.resource);
+		}
+		activeIcons.clear();
+		activeNotifications.clear();
+		sortedNotifList = null;
+		sortedDisplayNotifList = null;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/ServerNotificationRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/ServerNotificationRenderer.java
new file mode 100755
index 0000000..cdf13cd
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/notifications/ServerNotificationRenderer.java
@@ -0,0 +1,539 @@
+package net.lax1dude.eaglercraft.v1_8.notifications;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.IFramebufferGL;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+import net.lax1dude.eaglercraft.v1_8.opengl.VertexFormat;
+import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.client.gui.GuiChat;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiUtilRenderComponents;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.event.ClickEvent;
+import net.minecraft.event.HoverEvent;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
+import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
+import static net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ExtGLEnums.*;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ServerNotificationRenderer {
+
+	protected static final Logger logger = LogManager.getLogger("ServerNotificationRenderer");
+
+	protected Minecraft mc;
+	protected int width;
+	protected int height;
+	protected int scaleFactor;
+
+	protected IFramebufferGL rendererFramebuffer;
+
+	protected static final int BADGE_WIDTH = 160;
+	protected static final int BADGE_HEIGHT = 64;
+
+	private static final ResourceLocation eaglerGui = new ResourceLocation("eagler:gui/eagler_gui.png");
+
+	public ServerNotificationRenderer() {
+		
+	}
+
+	public void init() {
+		destroy();
+		rendererFramebuffer = _wglCreateFramebuffer();
+	}
+
+	public void setResolution(Minecraft mc, int w, int h, int scaleFactor) {
+		this.mc = mc;
+		this.width = w;
+		this.height = h;
+		this.scaleFactor = scaleFactor;
+	}
+
+	public boolean handleClicked(GuiScreen currentScreen, int posX, int posY) {
+		if(mc.thePlayer == null) return false;
+		ServerNotificationManager mgr = mc.thePlayer.sendQueue.getNotifManager();
+		List<NotificationBadge> lst = mgr.getNotifBadgesToDisplay();
+		if(!lst.isEmpty()) {
+			int baseOffset = mc.guiAchievement.getHeight();
+			boolean showX = (currentScreen instanceof GuiChat);
+			if(showX) {
+				baseOffset += 25; // exit button in chat screen;
+			}
+			long millis = EagRuntime.steadyTimeMillis();
+			for(int i = 0, l = lst.size(); i < l; ++i) {
+				NotificationBadge badge = lst.get(i);
+				CachedNotifBadgeTexture tex = badge.currentCacheGLTexture;
+				if(tex != null) {
+					int baseX = width - tex.width;
+					float texHeight = tex.height;
+					float timeRemainingSec;
+					long age = millis - badge.clientTimestamp;
+					if(badge.hideAtMillis != -1l) {
+						timeRemainingSec = (float)((double)(500l - (millis - badge.hideAtMillis)) * 0.001);
+					}else {
+						timeRemainingSec = (float)((double)((long)badge.hideAfterSec * 1000l - age) * 0.001);
+					}
+					timeRemainingSec = Math.min((float)(age * 0.001) + 0.001f, timeRemainingSec);
+					float f = MathHelper.clamp_float(timeRemainingSec * 3.0F, 0.0F, 1.0F);
+					f *= f;
+					texHeight *= f;
+					if(badge.hideAtMillis == -1l) {
+						if(posX >= baseX && posX < width && posY >= baseOffset && posY < baseOffset + texHeight) {
+							if(showX) {
+								int xposX = baseX + tex.width - 21;
+								int xposY = baseOffset + 5;
+								if(posX >= xposX && posY >= xposY && posX < xposX + 16 && posY < xposY + 16) {
+									badge.hideNotif();
+									mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+									return true;
+								}
+							}
+							if(tex.rootClickEvent != null) {
+								if(currentScreen.handleComponentClick(tex.rootClickEvent)) {
+									mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+									return true;
+								}
+							}
+							List<ClickEventZone> cursorEvents = tex.cursorEvents;
+							if(tex.hasClickEvents && cursorEvents != null) {
+								for(int j = 0, m = cursorEvents.size(); j < m; ++j) {
+									ClickEventZone evt = cursorEvents.get(j);
+									if(evt.hasClickEvent) {
+										int offsetPosX = baseX + evt.posX;
+										int offsetPosY = baseOffset + evt.posY;
+										if(posX >= offsetPosX && posY >= offsetPosY && posX < offsetPosX + evt.width && posY < offsetPosY + evt.height) {
+											if(currentScreen.handleComponentClick(evt.chatComponent)) {
+												mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+												return true;
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+					baseOffset += texHeight;
+				}
+			}
+		}
+		return false;
+	}
+
+	public void renderOverlay(int mouseX, int mouseY) {
+		if(mc.thePlayer == null) return;
+		ServerNotificationManager mgr = mc.thePlayer.sendQueue.getNotifManager();
+		List<NotificationBadge> lst = mgr.getNotifBadgesToDisplay();
+		if(!lst.isEmpty()) {
+			GlStateManager.clear(GL_DEPTH_BUFFER_BIT);
+			boolean showXButtons = false;
+			int baseOffset = mc.guiAchievement.getHeight();
+			if(mc.currentScreen != null) {
+				if(mc.currentScreen instanceof GuiChat) {
+					baseOffset += 25; // exit button in chat screen;
+					showXButtons = true;
+				}else if(mc.currentScreen instanceof GuiScreenNotifications) {
+					return;
+				}
+			}
+			long millis = EagRuntime.steadyTimeMillis();
+			boolean isBlend = false;
+			for(int i = 0, l = lst.size(); i < l; ++i) {
+				NotificationBadge badge = lst.get(i);
+				boolean isHiding = false;
+				if(badge.hideAtMillis != -1l) {
+					isHiding = true;
+					if(millis - badge.hideAtMillis > 500l) {
+						continue;
+					}
+				}
+				CachedNotifBadgeTexture tex = badge.getGLTexture(this, scaleFactor, showXButtons);
+				if(tex != null) {
+					GlStateManager.bindTexture(tex.glTexture);
+					float alphaTop = 1.0f;
+					float alphaBottom = 1.0f;
+					float timeRemainingSec;
+					long age = millis - badge.clientTimestamp;
+					if(isHiding) {
+						timeRemainingSec = (float)((double)(500l - (millis - badge.hideAtMillis)) * 0.001);
+					}else {
+						timeRemainingSec = (float)((double)((long)badge.hideAfterSec * 1000l - age) * 0.001);
+					}
+					timeRemainingSec = Math.min((float)(age * 0.001) + 0.001f, timeRemainingSec);
+					alphaTop *= MathHelper.clamp_float(timeRemainingSec * 3.0F, 0.0F, 1.0F);
+					alphaTop *= alphaTop;
+					alphaBottom *= MathHelper.clamp_float(timeRemainingSec * 2.0F, 0.0F, 1.0F);
+					alphaBottom *= alphaBottom;
+					if(alphaTop == 0.0F && alphaBottom == 0.0F) {
+						continue;
+					}
+					boolean blend = alphaTop < 1.0f || alphaBottom < 1.0f;
+					if(blend != isBlend) {
+						if(blend) {
+							GlStateManager.enableBlend();
+							GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+						}else {
+							GlStateManager.disableBlend();
+						}
+						isBlend = blend;
+					}
+					int px = width - tex.width;
+					drawTexturedGradientFBRect(px, baseOffset, tex.width, tex.height,
+							((int) (alphaTop * 255.0f) << 24) | 0xFFFFFF,
+							((int) (alphaBottom * 255.0f) << 24) | 0xFFFFFF, 200.0f);
+					if(showXButtons && tex.hasHoverEvents) {
+						if(mouseX >= px && mouseY >= baseOffset && mouseX < px + tex.width && mouseY < baseOffset + tex.height) {
+							List<ClickEventZone> cursorEvents = tex.cursorEvents;
+							if(cursorEvents != null) {
+								for(int j = 0, m = cursorEvents.size(); j < m; ++j) {
+									ClickEventZone evt = cursorEvents.get(j);
+									if(evt.hasHoverEvent) {
+										int offsetPosX = px + evt.posX;
+										int offsetPosY = baseOffset + evt.posY;
+										if(mouseX >= offsetPosX && mouseY >= offsetPosY && mouseX < offsetPosX + evt.width
+												&& mouseY < offsetPosY + evt.height) {
+											if(isBlend) {
+												GlStateManager.disableBlend();
+												isBlend = false;
+											}
+											mc.currentScreen.handleComponentHover(evt.chatComponent, mouseX, mouseY);
+										}
+									}
+								}
+							}
+						}
+					}
+					baseOffset += tex.height * alphaTop;
+				}
+			}
+			if(isBlend) {
+				GlStateManager.disableBlend();
+			}
+		}
+	}
+
+	protected CachedNotifBadgeTexture renderBadge(NotificationBadge badge, int scaleFactor, boolean showXButton) {
+		int badgeWidth = BADGE_WIDTH;
+		int badgeHeight = 10;
+		
+		int leftPadding = 6;
+		int rightPadding = 26;
+		
+		int mainIconSW = 32;
+		if(badge.mainIcon != null) {
+			int iw = badge.mainIcon.texture.getWidth();
+			int ih = badge.mainIcon.texture.getHeight();
+			float iaspect = (float)iw / (float)ih;
+			mainIconSW = (int)(32 * iaspect);
+			leftPadding += Math.min(mainIconSW, 64) + 3;
+		}
+		
+		int textZoneWidth = badgeWidth - leftPadding - rightPadding;
+		int bodyYOffset = 5;
+		
+		String titleText = null;
+		IChatComponent titleComponent = badge.getTitleProfanityFilter();
+		if(titleComponent != null) {
+			titleText = titleComponent.getFormattedText();
+			if(titleText.length() > 0) {
+				badgeHeight += 12;
+				bodyYOffset += 12;
+			}else {
+				titleText = null;
+			}
+		}
+		
+		if(badge.titleIcon != null && titleText == null) {
+			badgeHeight += 12;
+			bodyYOffset += 12;
+		}
+		
+		float bodyFontSize = 0.75f;
+		List<IChatComponent> bodyLines = null;
+		List<ClickEventZone> clickEvents = null;
+		IChatComponent rootClickEvt = null;
+		boolean hasClickEvents = false;
+		boolean hasHoverEvents = false;
+		
+		int bodyHeight = 0;
+		
+		IChatComponent bodyComponent = badge.getBodyProfanityFilter();
+		if(bodyComponent != null) {
+			if (bodyComponent.getChatStyle().getChatClickEvent() != null
+					&& bodyComponent.getChatStyle().getChatClickEvent().getAction().shouldAllowInChat()) {
+				rootClickEvt = bodyComponent;
+			}
+			bodyLines = GuiUtilRenderComponents.func_178908_a(bodyComponent, (int) (textZoneWidth / bodyFontSize),
+					mc.fontRendererObj, true, true);
+			
+			int maxHeight = BADGE_HEIGHT - 32;
+			int maxLines = MathHelper.floor_float(maxHeight / (9 * bodyFontSize));
+			if(bodyLines.size() > maxLines) {
+				bodyLines = bodyLines.subList(0, maxLines);
+				bodyComponent = bodyLines.get(maxLines - 1);
+				List<IChatComponent> siblings = bodyComponent.getSiblings();
+				IChatComponent dots = new ChatComponentText("...");
+				if(siblings != null && siblings.size() > 0) {
+					dots.setChatStyle(siblings.get(siblings.size() - 1).getChatStyle());
+				}
+				bodyComponent.appendSibling(dots);
+			}
+			bodyHeight = MathHelper.floor_float(bodyLines.size() * (9 * bodyFontSize));
+		}
+
+		String sourceText = null;
+		IChatComponent sourceComponent = badge.getSourceProfanityFilter();
+		if(sourceComponent != null) {
+			sourceText = sourceComponent.getFormattedText();
+			if(sourceText.length() == 0) {
+				sourceText = null;
+			}
+		}
+		
+		if(badge.mainIcon != null) {
+			bodyHeight = Math.max(sourceText != null ? 30 : 32, bodyHeight);
+		}
+		
+		if(sourceText != null) {
+			badgeHeight += 6;
+		}
+		
+		badgeHeight += bodyHeight;
+		
+		badgeHeight = Math.max(badgeHeight, showXButton ? 42 : 26);
+		
+		if(badgeHeight > BADGE_HEIGHT) {
+			logger.info("Warning: Badge {} was {} pixels too high!", badge.badgeUUID, BADGE_HEIGHT - badgeHeight);
+			badgeHeight = BADGE_HEIGHT;
+		}
+		
+		int glTex = GlStateManager.generateTexture();
+		GlStateManager.bindTexture(glTex);
+		EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+		EaglercraftGPU.glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, badgeWidth * scaleFactor, badgeHeight * scaleFactor, 0, GL_RGBA,
+				GL_UNSIGNED_BYTE, (ByteBuffer) null);
+		_wglBindFramebuffer(_GL_FRAMEBUFFER, rendererFramebuffer);
+		_wglFramebufferTexture2D(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, EaglercraftGPU.getNativeTexture(glTex), 0);
+		_wglDrawBuffers(_GL_COLOR_ATTACHMENT0);
+		
+		int[] oldViewport = new int[4];
+		EaglercraftGPU.glGetInteger(GL_VIEWPORT, oldViewport);
+		
+		GlStateManager.viewport(0, 0, badgeWidth * scaleFactor, badgeHeight * scaleFactor);
+		
+		GlStateManager.disableDepth();
+		GlStateManager.depthMask(false);
+		GlStateManager.enableTexture2D();
+		GlStateManager.disableLighting();
+		GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+		
+		GlStateManager.matrixMode(GL_PROJECTION);
+		GlStateManager.pushMatrix();
+		GlStateManager.loadIdentity();
+		GlStateManager.ortho(0.0D, badgeWidth, badgeHeight, 0.0D, 1000.0D, 3000.0D);
+		GlStateManager.matrixMode(GL_MODELVIEW);
+		GlStateManager.pushMatrix();
+		GlStateManager.loadIdentity();
+		GlStateManager.translate(0.0F, 0.0F, -2000.0F);
+
+		Tessellator tess = Tessellator.getInstance();
+		WorldRenderer worldRenderer = tess.getWorldRenderer();
+
+		worldRenderer.begin(GL_QUADS, VertexFormat.POSITION_TEX_COLOR);
+		
+		mc.getTextureManager().bindTexture(eaglerGui);
+
+		drawTexturedColoredRect(worldRenderer, 0, 0, 96, 192, 160, 8, (badge.backgroundColor >>> 16) & 0xFF,
+				(badge.backgroundColor >>> 8) & 0xFF, badge.backgroundColor & 0xFF, 0xFF);
+		
+		drawTexturedColoredRect(worldRenderer, 0, 8, 96, 192 + (BADGE_HEIGHT - badgeHeight + 8), 160, (badgeHeight - 8),
+				(badge.backgroundColor >>> 16) & 0xFF, (badge.backgroundColor >>> 8) & 0xFF,
+				badge.backgroundColor & 0xFF, 0xFF);
+		
+		switch(badge.priority) {
+		case LOW:
+		default:
+			drawTexturedColoredRect(worldRenderer, badgeWidth - 21, badgeHeight - 21, 192, 176, 16, 16, (badge.backgroundColor >>> 16) & 0xFF,
+					(badge.backgroundColor >>> 8) & 0xFF, badge.backgroundColor & 0xFF, 0xFF);
+			break;
+		case NORMAL:
+			drawTexturedColoredRect(worldRenderer, badgeWidth - 21, badgeHeight - 21, 208, 176, 16, 16, 0xFF, 0xFF, 0xFF, 0xFF);
+			break;
+		case HIGHER:
+			drawTexturedColoredRect(worldRenderer, badgeWidth - 21, badgeHeight - 21, 224, 176, 16, 16, 0xFF, 0xFF, 0xFF, 0xFF);
+			break;
+		case HIGHEST:
+			drawTexturedColoredRect(worldRenderer, badgeWidth - 21, badgeHeight - 21, 240, 176, 16, 16, 0xFF, 0xFF, 0xFF, 0xFF);
+			break;
+		}
+		
+		if(showXButton) {
+			drawTexturedColoredRect(worldRenderer, badgeWidth - 21, 5, 80, 208, 16, 16, 0xFF, 0xFF, 0xFF, 0xFF);
+		}
+		
+		tess.draw();
+
+		if(badge.mainIcon != null) {
+			mc.getTextureManager().bindTexture(badge.mainIcon.resource);
+			drawTexturedRect(6, bodyYOffset, mainIconSW, 32);
+		}
+
+		if(badge.titleIcon != null) {
+			mc.getTextureManager().bindTexture(badge.titleIcon.resource);
+			drawTexturedRect(6, 5, 8, 8);
+		}
+		
+		if(titleText != null) {
+			GlStateManager.pushMatrix();
+			GlStateManager.translate(6 + (badge.titleIcon != null ? 10 : 0), 6, 0.0f);
+			GlStateManager.scale(0.75f, 0.75f, 0.75f);
+			mc.fontRendererObj.drawStringWithShadow(titleText, 0, 0, badge.titleTxtColor);
+			GlStateManager.popMatrix();
+		}
+		
+		if(bodyLines != null && !bodyLines.isEmpty()) {
+			GlStateManager.pushMatrix();
+			if(!showXButton && badge.mainIcon == null && titleText != null) {
+				bodyYOffset -= 2;
+			}
+			GlStateManager.translate(leftPadding, bodyYOffset, 0.0f);
+			int l = bodyLines.size();
+			GlStateManager.scale(bodyFontSize, bodyFontSize, bodyFontSize);
+			for(int i = 0; i < l; ++i) {
+				int startXLocal = 0;
+				int startXReal = leftPadding;
+				for(IChatComponent comp : bodyLines.get(i)) {
+					int w = mc.fontRendererObj.drawStringWithShadow(
+							comp.getChatStyle().getFormattingCode() + comp.getUnformattedTextForChat(), startXLocal,
+							i * 9, badge.bodyTxtColor) - startXLocal;
+					ClickEvent clickEvent = comp.getChatStyle().getChatClickEvent();
+					HoverEvent hoverEvent = comp.getChatStyle().getChatHoverEvent();
+					if(clickEvent != null && !clickEvent.getAction().shouldAllowInChat()) {
+						clickEvent = null;
+					}
+					if(hoverEvent != null && !hoverEvent.getAction().shouldAllowInChat()) {
+						hoverEvent = null;
+					}
+					if(clickEvent != null || hoverEvent != null) {
+						hasClickEvents |= clickEvent != null;
+						hasHoverEvents |= hoverEvent != null;
+						if(clickEvents == null) {
+							clickEvents = new ArrayList<>();
+						}
+						clickEvents.add(new ClickEventZone(startXReal + (int) (startXLocal * bodyFontSize),
+								bodyYOffset + (int) (i * 9 * bodyFontSize), (int) (w * bodyFontSize),
+								(int) (9 * bodyFontSize), comp, clickEvent != null, hoverEvent != null));
+					}
+					startXLocal += w;
+				}
+			}
+			GlStateManager.popMatrix();
+		}
+		
+		if(sourceText != null) {
+			GlStateManager.pushMatrix();
+			GlStateManager.translate(badgeWidth - 21, badgeHeight - 5, 0.0f);
+			GlStateManager.scale(0.5f, 0.5f, 0.5f);
+			mc.fontRendererObj.drawStringWithShadow(sourceText, -mc.fontRendererObj.getStringWidth(sourceText) - 4, -10, badge.sourceTxtColor);
+			GlStateManager.popMatrix();
+		}
+		
+		GlStateManager.matrixMode(GL_PROJECTION);
+		GlStateManager.popMatrix();
+		GlStateManager.matrixMode(GL_MODELVIEW);
+		GlStateManager.popMatrix();
+
+		GlStateManager.depthMask(true);
+		GlStateManager.enableDepth();
+
+		_wglBindFramebuffer(_GL_FRAMEBUFFER, null);
+		GlStateManager.viewport(oldViewport[0], oldViewport[1], oldViewport[2], oldViewport[3]);
+		
+		return new CachedNotifBadgeTexture(glTex, scaleFactor, badgeWidth, badgeHeight, clickEvents, rootClickEvt, hasClickEvents, hasHoverEvents);
+	}
+
+	static void drawTexturedColoredRect(WorldRenderer worldRenderer, float xCoord, float yCoord, int minU,
+			int minV, int width, int height, int r, int g, int b, int a) {
+		float f = 0.00390625F;
+		float f1 = 0.00390625F;
+		worldRenderer.pos((double) (xCoord + 0.0F), (double) (yCoord + (float) height), 0.0).color(r, g, b, a)
+				.tex((double) ((float) (minU + 0) * f), (double) ((float) (minV + height) * f1)).endVertex();
+		worldRenderer.pos((double) (xCoord + (float) width), (double) (yCoord + (float) height), 0.0).color(r, g, b, a)
+				.tex((double) ((float) (minU + width) * f), (double) ((float) (minV + height) * f1)).endVertex();
+		worldRenderer.pos((double) (xCoord + (float) width), (double) (yCoord + 0.0F), 0.0).color(r, g, b, a)
+				.tex((double) ((float) (minU + width) * f), (double) ((float) (minV + 0) * f1)).endVertex();
+		worldRenderer.pos((double) (xCoord + 0.0F), (double) (yCoord + 0.0F), 0.0).color(r, g, b, a)
+				.tex((double) ((float) (minU + 0) * f), (double) ((float) (minV + 0) * f1)).endVertex();
+	}
+
+	static void drawTexturedGradientFBRect(float xCoord, float yCoord, int width, int height, int rgbaTop, int rgbaBottom, float zIndex) {
+		int topR = (rgbaTop >>> 16) & 0xFF;
+		int topG = (rgbaTop >>> 8) & 0xFF;
+		int topB = rgbaTop & 0xFF;
+		int topA = (rgbaTop >>> 24) & 0xFF;
+		int bottomR = (rgbaBottom >>> 16) & 0xFF;
+		int bottomG = (rgbaBottom >>> 8) & 0xFF;
+		int bottomB = rgbaBottom & 0xFF;
+		int bottomA = (rgbaBottom >>> 24) & 0xFF;
+		Tessellator tess = Tessellator.getInstance();
+		WorldRenderer worldRenderer = tess.getWorldRenderer();
+		worldRenderer.begin(GL_QUADS, VertexFormat.POSITION_TEX_COLOR);
+		worldRenderer.pos((double) (xCoord + 0.0F), (double) (yCoord + (float) height), zIndex)
+				.color(bottomR, bottomG, bottomB, bottomA).tex(0.0, 0.0).endVertex();
+		worldRenderer.pos((double) (xCoord + (float) width), (double) (yCoord + (float) height), zIndex)
+				.color(bottomR, bottomG, bottomB, bottomA).tex(1.0, 0.0).endVertex();
+		worldRenderer.pos((double) (xCoord + (float) width), (double) (yCoord + 0.0F), zIndex)
+				.color(topR, topG, topB, topA).tex(1.0, 1.0).endVertex();
+		worldRenderer.pos((double) (xCoord + 0.0F), (double) (yCoord + 0.0F), zIndex).color(topR, topG, topB, topA)
+				.tex(0.0, 1.0).endVertex();
+		tess.draw();
+	}
+
+	static void drawTexturedRect(float xCoord, float yCoord, int width, int height) {
+		Tessellator tess = Tessellator.getInstance();
+		WorldRenderer worldRenderer = tess.getWorldRenderer();
+		worldRenderer.begin(GL_QUADS, VertexFormat.POSITION_TEX);
+		worldRenderer.pos((double) (xCoord + 0.0F), (double) (yCoord + (float) height), 0.0).tex(0.0, 1.0).endVertex();
+		worldRenderer.pos((double) (xCoord + (float) width), (double) (yCoord + (float) height), 0.0).tex(1.0, 1.0).endVertex();
+		worldRenderer.pos((double) (xCoord + (float) width), (double) (yCoord + 0.0F), 0.0).tex(1.0, 0.0).endVertex();
+		worldRenderer.pos((double) (xCoord + 0.0F), (double) (yCoord + 0.0F), 0.0).tex(0.0, 0.0).endVertex();
+		tess.draw();
+	}
+
+	public void destroy() {
+		if(rendererFramebuffer != null) {
+			_wglDeleteFramebuffer(rendererFramebuffer);
+			rendererFramebuffer = null;
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/DrawUtils.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/DrawUtils.java
index eb01dd0..5fcd73f 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/DrawUtils.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/DrawUtils.java
@@ -3,15 +3,16 @@ package net.lax1dude.eaglercraft.v1_8.opengl;
 import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
+import java.util.List;
+
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.IBufferArrayGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IBufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IShaderGL;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
-import net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader.FixedFunctionConstants;
 
 /**
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -28,17 +29,19 @@ import net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader.FixedFunctionCon
 public class DrawUtils {
 
 	public static final String vertexShaderPath = "/assets/eagler/glsl/local.vsh";
+	public static final String vertexShaderPrecision = "precision highp float;\n";
 
 	public static IBufferArrayGL standardQuad2DVAO = null;
 	public static IBufferArrayGL standardQuad3DVAO = null;
 	public static IBufferGL standardQuadVBO = null;
 
 	public static IShaderGL vshLocal = null;
+	public static List<VSHInputLayoutParser.ShaderInput> vshLocalLayout = null;
 
 	static void init() {
 		if(standardQuad2DVAO == null) {
-			standardQuad2DVAO = _wglGenVertexArrays();
-			standardQuad3DVAO = _wglGenVertexArrays();
+			standardQuad2DVAO = EaglercraftGPU.createGLBufferArray();
+			standardQuad3DVAO = EaglercraftGPU.createGLBufferArray();
 			standardQuadVBO = _wglGenBuffers();
 
 			FloatBuffer verts = EagRuntime.allocateFloatBuffer(18);
@@ -48,30 +51,29 @@ public class DrawUtils {
 			});
 			verts.flip();
 
-			EaglercraftGPU.bindGLArrayBuffer(standardQuadVBO);
+			EaglercraftGPU.bindVAOGLArrayBufferNow(standardQuadVBO);
 			_wglBufferData(GL_ARRAY_BUFFER, verts, GL_STATIC_DRAW);
 			EagRuntime.freeFloatBuffer(verts);
 
 			EaglercraftGPU.bindGLBufferArray(standardQuad2DVAO);
 
-			_wglEnableVertexAttribArray(0);
-			_wglVertexAttribPointer(0, 2, GL_FLOAT, false, 12, 0);
+			EaglercraftGPU.enableVertexAttribArray(0);
+			EaglercraftGPU.vertexAttribPointer(0, 2, GL_FLOAT, false, 12, 0);
 
 			EaglercraftGPU.bindGLBufferArray(standardQuad3DVAO);
 
-			_wglEnableVertexAttribArray(0);
-			_wglVertexAttribPointer(0, 3, GL_FLOAT, false, 12, 0);
+			EaglercraftGPU.enableVertexAttribArray(0);
+			EaglercraftGPU.vertexAttribPointer(0, 3, GL_FLOAT, false, 12, 0);
 		}
 
 		if(vshLocal == null) {
-			String vertexSource = EagRuntime.getResourceString(vertexShaderPath);
-			if(vertexSource == null) {
-				throw new RuntimeException("vertex shader \"" + vertexShaderPath + "\" is missing!");
-			}
-	
+			String vertexSource = EagRuntime.getRequiredResourceString(vertexShaderPath);
+
+			vshLocalLayout = VSHInputLayoutParser.getShaderInputs(vertexSource);
+
 			vshLocal = _wglCreateShader(GL_VERTEX_SHADER);
-	
-			_wglShaderSource(vshLocal, FixedFunctionConstants.VERSION + "\n" + vertexSource);
+
+			_wglShaderSource(vshLocal, GLSLHeader.getVertexHeaderCompat(vertexSource, vertexShaderPrecision));
 			_wglCompileShader(vshLocal);
 	
 			if(_wglGetShaderi(vshLocal, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -90,12 +92,32 @@ public class DrawUtils {
 
 	public static void drawStandardQuad2D() {
 		EaglercraftGPU.bindGLBufferArray(standardQuad2DVAO);
-		_wglDrawArrays(GL_TRIANGLES, 0, 6);
+		EaglercraftGPU.doDrawArrays(GL_TRIANGLES, 0, 6);
 	}
 
 	public static void drawStandardQuad3D() {
 		EaglercraftGPU.bindGLBufferArray(standardQuad3DVAO);
-		_wglDrawArrays(GL_TRIANGLES, 0, 6);
+		EaglercraftGPU.doDrawArrays(GL_TRIANGLES, 0, 6);
+	}
+
+	public static void destroy() {
+		if(standardQuad2DVAO != null) {
+			EaglercraftGPU.destroyGLBufferArray(standardQuad2DVAO);
+			standardQuad2DVAO = null;
+		}
+		if(standardQuad3DVAO != null) {
+			EaglercraftGPU.destroyGLBufferArray(standardQuad3DVAO);
+			standardQuad3DVAO = null;
+		}
+		if(standardQuadVBO != null) {
+			_wglDeleteBuffers(standardQuadVBO);
+			standardQuadVBO = null;
+		}
+		if(vshLocal != null) {
+			vshLocal.free();
+			vshLocal = null;
+			vshLocalLayout = null;
+		}
 	}
 
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EaglerMeshLoader.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EaglerMeshLoader.java
index cfe129c..c2d1ad3 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EaglerMeshLoader.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EaglerMeshLoader.java
@@ -39,7 +39,7 @@ public class EaglerMeshLoader implements IResourceManagerReloadListener {
 
 	private static final Logger logger = LogManager.getLogger("EaglerMeshLoader");
 
-	private static final Map<ResourceLocation, HighPolyMesh> meshCache = new HashMap();
+	private static final Map<ResourceLocation, HighPolyMesh> meshCache = new HashMap<>();
 
 	public static HighPolyMesh getEaglerMesh(ResourceLocation meshLoc) {
 		if(meshLoc.cachedPointerType == ResourceLocation.CACHED_POINTER_EAGLER_MESH) {
@@ -104,7 +104,7 @@ public class EaglerMeshLoader implements IResourceManagerReloadListener {
 			}
 
 			if(meshStruct.vertexArray == null) {
-				meshStruct.vertexArray = _wglGenVertexArrays();
+				meshStruct.vertexArray = EaglercraftGPU.createGLBufferArray();
 			}
 			if(meshStruct.vertexBuffer == null) {
 				meshStruct.vertexBuffer = _wglGenBuffers();
@@ -115,29 +115,29 @@ public class EaglerMeshLoader implements IResourceManagerReloadListener {
 			
 			up1.position(0).limit(intsOfVertex);
 			
-			EaglercraftGPU.bindGLArrayBuffer(meshStruct.vertexBuffer);
+			EaglercraftGPU.bindVAOGLArrayBufferNow(meshStruct.vertexBuffer);
 			_wglBufferData(GL_ARRAY_BUFFER, up1, GL_STATIC_DRAW);
 			
 			EaglercraftGPU.bindGLBufferArray(meshStruct.vertexArray);
 			
 			up1.position(intsOfVertex).limit(intsTotal);
 			
-			_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, meshStruct.indexBuffer);
+			EaglercraftGPU.bindVAOGLElementArrayBufferNow(meshStruct.indexBuffer);
 			_wglBufferData(GL_ELEMENT_ARRAY_BUFFER, up1, GL_STATIC_DRAW);
 			
-			_wglEnableVertexAttribArray(0);
-			_wglVertexAttribPointer(0, 3, GL_FLOAT, false, stride, 0);
+			EaglercraftGPU.enableVertexAttribArray(0);
+			EaglercraftGPU.vertexAttribPointer(0, 3, GL_FLOAT, false, stride, 0);
 			
 			if(meshStruct.hasTexture) {
-				_wglEnableVertexAttribArray(1);
-				_wglVertexAttribPointer(1, 2, GL_FLOAT, false, stride, 16);
+				EaglercraftGPU.enableVertexAttribArray(1);
+				EaglercraftGPU.vertexAttribPointer(1, 2, GL_FLOAT, false, stride, 16);
 			}
 			
-			_wglEnableVertexAttribArray(meshStruct.hasTexture ? 2 : 1);
-			_wglVertexAttribPointer(meshStruct.hasTexture ? 2 : 1, 4, GL_BYTE, true, stride, 12);
+			EaglercraftGPU.enableVertexAttribArray(meshStruct.hasTexture ? 2 : 1);
+			EaglercraftGPU.vertexAttribPointer(meshStruct.hasTexture ? 2 : 1, 4, GL_BYTE, true, stride, 12);
 		}catch(Throwable ex) {
 			if(meshStruct.vertexArray != null) {
-				_wglDeleteVertexArrays(meshStruct.vertexArray);
+				EaglercraftGPU.destroyGLBufferArray(meshStruct.vertexArray);
 				meshStruct.vertexArray = null;
 			}
 			if(meshStruct.vertexBuffer != null) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EaglercraftGPU.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EaglercraftGPU.java
index 457189f..6b5dd78 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EaglercraftGPU.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EaglercraftGPU.java
@@ -5,6 +5,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.minecraft.util.MathHelper;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,7 +17,6 @@ import net.lax1dude.eaglercraft.v1_8.internal.IBufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IProgramGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IQueryGL;
 import net.lax1dude.eaglercraft.v1_8.internal.ITextureGL;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformBufferFunctions;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL;
 
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
@@ -39,12 +39,15 @@ import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
  */
 public class EaglercraftGPU {
 
-	static final GLObjectMap<ITextureGL> mapTexturesGL = new GLObjectMap(32767);
-	static final GLObjectMap<IQueryGL> mapQueriesGL = new GLObjectMap(32767);
-	static final GLObjectMap<DisplayList> mapDisplayListsGL = new GLObjectMap(32767);
+	static final GLObjectMap<ITextureGL> mapTexturesGL = new GLObjectMap<>(8192);
+	static final GLObjectMap<IQueryGL> mapQueriesGL = new GLObjectMap<>(8192);
+	static final GLObjectMap<DisplayList> mapDisplayListsGL = new GLObjectMap<>(8192);
 
 	static final Logger logger = LogManager.getLogger("EaglercraftGPU");
 
+	static boolean emulatedVAOs = false;
+	static SoftGLBufferState emulatedVAOState = new SoftGLBufferState();
+
 	public static final String gluErrorString(int i) {
 		switch(i) {
 		case GL_INVALID_ENUM: return "GL_INVALID_ENUM";
@@ -87,16 +90,16 @@ public class EaglercraftGPU {
 			EaglercraftGPU.bindGLBufferArray(dp.vertexArray);
 			int c = 0;
 			if((dp.attribs & ATTRIB_TEXTURE) == ATTRIB_TEXTURE) {
-				_wglDisableVertexAttribArray(++c);
+				EaglercraftGPU.disableVertexAttribArray(++c);
 			}
 			if((dp.attribs & ATTRIB_COLOR) == ATTRIB_COLOR) {
-				_wglDisableVertexAttribArray(++c);
+				EaglercraftGPU.disableVertexAttribArray(++c);
 			}
 			if((dp.attribs & ATTRIB_NORMAL) == ATTRIB_NORMAL) {
-				_wglDisableVertexAttribArray(++c);
+				EaglercraftGPU.disableVertexAttribArray(++c);
 			}
 			if((dp.attribs & ATTRIB_LIGHTMAP) == ATTRIB_LIGHTMAP) {
-				_wglDisableVertexAttribArray(++c);
+				EaglercraftGPU.disableVertexAttribArray(++c);
 			}
 		}
 		dp.attribs = -1;
@@ -109,7 +112,7 @@ public class EaglercraftGPU {
 		if(displayListBuffer.capacity() < wantSize) {
 			int newSize = (wantSize & 0xFFFE0000) + 0x40000;
 			ByteBuffer newBuffer = EagRuntime.allocateByteBuffer(newSize);
-			PlatformBufferFunctions.put(newBuffer, (ByteBuffer)displayListBuffer.flip());
+			newBuffer.put((ByteBuffer)displayListBuffer.flip());
 			EagRuntime.freeByteBuffer(displayListBuffer);
 			displayListBuffer = newBuffer;
 		}
@@ -123,7 +126,7 @@ public class EaglercraftGPU {
 		
 		if(dp.attribs == -1) {
 			if(dp.vertexArray != null) {
-				_wglDeleteVertexArrays(dp.vertexArray);
+				EaglercraftGPU.destroyGLBufferArray(dp.vertexArray);
 				dp.vertexArray = null;
 			}
 			if(dp.vertexBuffer != null) {
@@ -135,7 +138,7 @@ public class EaglercraftGPU {
 		}
 		
 		if(dp.vertexArray == null) {
-			dp.vertexArray = _wglGenVertexArrays();
+			dp.vertexArray = createGLBufferArray();
 			dp.bindQuad16 = false;
 			dp.bindQuad32 = false;
 		}
@@ -143,7 +146,7 @@ public class EaglercraftGPU {
 			dp.vertexBuffer = _wglGenBuffers();
 		}
 		
-		bindGLArrayBuffer(dp.vertexBuffer);
+		bindVAOGLArrayBufferNow(dp.vertexBuffer);
 		displayListBuffer.flip();
 		_wglBufferData(GL_ARRAY_BUFFER, displayListBuffer, GL_STATIC_DRAW);
 		displayListBuffer.clear();
@@ -194,7 +197,7 @@ public class EaglercraftGPU {
 		}
 		dp.attribs = -1;
 		if(dp.vertexArray != null) {
-			_wglDeleteVertexArrays(dp.vertexArray);
+			EaglercraftGPU.destroyGLBufferArray(dp.vertexArray);
 			dp.vertexArray = null;
 		}
 		if(dp.vertexBuffer != null) {
@@ -210,7 +213,7 @@ public class EaglercraftGPU {
 		++GlStateManager.stateNormalSerial;
 	}
 	
-	private static final Map<Integer,String> stringCache = new HashMap();
+	private static final Map<Integer,String> stringCache = new HashMap<>();
 
 	public static final String glGetString(int param) {
 		String str = stringCache.get(param);
@@ -238,9 +241,24 @@ public class EaglercraftGPU {
 		return _wglGetInteger(param);
 	}
 
+	public static final void glTexImage2D(int target, int level, int internalFormat, int w, int h, int unused,
+			int format, int type, ByteBuffer pixels) {
+		if(glesVers >= 300) {
+			_wglTexImage2D(target, level, internalFormat, w, h, unused, format, type, pixels);
+		}else {
+			int tv = TextureFormatHelper.trivializeInternalFormatToGLES20(internalFormat);
+			_wglTexImage2D(target, level, tv, w, h, unused, tv, type, pixels);
+		}
+	}
+
 	public static final void glTexImage2D(int target, int level, int internalFormat, int w, int h, int unused,
 			int format, int type, IntBuffer pixels) {
-		_wglTexImage2D(target, level, internalFormat, w, h, unused, format, type, pixels);
+		if(glesVers >= 300) {
+			_wglTexImage2D(target, level, internalFormat, w, h, unused, format, type, pixels);
+		}else {
+			int tv = TextureFormatHelper.trivializeInternalFormatToGLES20(internalFormat);
+			_wglTexImage2D(target, level, tv, w, h, unused, tv, type, pixels);
+		}
 	}
 
 	public static final void glTexSubImage2D(int target, int level, int x, int y, int w, int h, int format,
@@ -249,9 +267,32 @@ public class EaglercraftGPU {
 	}
 
 	public static final void glTexStorage2D(int target, int levels, int internalFormat, int w, int h) {
-		_wglTexStorage2D(target, levels, internalFormat, w, h);
+		if(texStorageCapable && (glesVers >= 300 || levels == 1 || (MathHelper.calculateLogBaseTwo(Math.max(w, h)) + 1) == levels)) {
+			_wglTexStorage2D(target, levels, internalFormat, w, h);
+		}else {
+			int tv = TextureFormatHelper.trivializeInternalFormatToGLES20(internalFormat);
+			int type = TextureFormatHelper.getTypeFromInternal(internalFormat);
+			for(int i = 0; i < levels; ++i) {
+				_wglTexImage2D(target, i, tv, Math.max(w >> i, 1), Math.max(h >> i, 1), 0, tv, type, (ByteBuffer)null);
+			}
+		}
 	}
-	
+
+	public static final void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer buffer) {
+		switch(type) {
+		case GL_FLOAT:
+			_wglReadPixels(x, y, width, height, format, GL_FLOAT, buffer.asFloatBuffer());
+			break;
+		case 0x140B: // GL_HALF_FLOAT
+			_wglReadPixels_u16(x, y, width, height, format, glesVers == 200 ? 0x8D61 : 0x140B, buffer);
+			break;
+		case GL_UNSIGNED_BYTE:
+		default:
+			_wglReadPixels(x, y, width, height, format, type, buffer);
+			break;
+		}
+	}
+
 	public static final void glLineWidth(float f) {
 		_wglLineWidth(f);
 	}
@@ -284,7 +325,7 @@ public class EaglercraftGPU {
 		DisplayList d = mapDisplayListsGL.free(id);
 		if(d != null) {
 			if(d.vertexArray != null) {
-				_wglDeleteVertexArrays(d.vertexArray);
+				EaglercraftGPU.destroyGLBufferArray(d.vertexArray);
 			}
 			if(d.vertexBuffer != null) {
 				_wglDeleteBuffers(d.vertexBuffer);
@@ -302,18 +343,197 @@ public class EaglercraftGPU {
 			GlStateManager.stateBlendEquation = equation;
 		}
 	}
-	
-	private static IBufferArrayGL currentBufferArray = null;
-	
-	public static final void bindGLBufferArray(IBufferArrayGL buffer) {
-		if(currentBufferArray != buffer) {
-			_wglBindVertexArray(buffer);
-			currentBufferArray = buffer;
+
+	public static final boolean areVAOsEmulated() {
+		return emulatedVAOs;
+	}
+
+	public static final IBufferArrayGL createGLBufferArray() {
+		if(emulatedVAOs) {
+			return new SoftGLBufferArray();
+		}else {
+			return _wglGenVertexArrays();
 		}
 	}
+
+	public static final void destroyGLBufferArray(IBufferArrayGL buffer) {
+		if(!emulatedVAOs) {
+			_wglDeleteVertexArrays(buffer);
+		}
+	}
+
+	public static final void enableVertexAttribArray(int index) {
+		if(emulatedVAOs) {
+			if(currentBufferArray == null) {
+				logger.warn("Skipping enable attrib with emulated VAO because no known VAO is bound!");
+				return;
+			}
+			((SoftGLBufferArray)currentBufferArray).enableAttrib(index, true);
+		}else {
+			_wglEnableVertexAttribArray(index);
+		}
+	}
+
+	public static final void disableVertexAttribArray(int index) {
+		if(emulatedVAOs) {
+			if(currentBufferArray == null) {
+				logger.warn("Skipping disable attrib with emulated VAO because no known VAO is bound!");
+				return;
+			}
+			((SoftGLBufferArray)currentBufferArray).enableAttrib(index, false);
+		}else {
+			_wglDisableVertexAttribArray(index);
+		}
+	}
+
+	public static final void vertexAttribPointer(int index, int size, int format, boolean normalized, int stride, int offset) {
+		if(emulatedVAOs) {
+			if(currentBufferArray == null) {
+				logger.warn("Skipping vertexAttribPointer with emulated VAO because no known VAO is bound!");
+				return;
+			}
+			if(currentVAOArrayBuffer == null) {
+				logger.warn("Skipping vertexAttribPointer with emulated VAO because no VAO array buffer is bound!");
+				return;
+			}
+			((SoftGLBufferArray)currentBufferArray).setAttrib(currentVAOArrayBuffer, index, size, format, normalized, stride, offset);
+		}else {
+			_wglVertexAttribPointer(index, size, format, normalized, stride, offset);
+		}
+	}
+
+	public static final void vertexAttribDivisor(int index, int divisor) {
+		if(emulatedVAOs) {
+			if(currentBufferArray == null) {
+				logger.warn("Skipping vertexAttribPointer with emulated VAO because no known VAO is bound!");
+				return;
+			}
+			((SoftGLBufferArray)currentBufferArray).setAttribDivisor(index, divisor);
+		}else {
+			_wglVertexAttribDivisor(index, divisor);
+		}
+	}
+
+	public static final void doDrawArrays(int mode, int first, int count) {
+		if(emulatedVAOs) {
+			if(currentBufferArray == null) {
+				logger.warn("Skipping draw call with emulated VAO because no known VAO is bound!");
+				return;
+			}
+			((SoftGLBufferArray)currentBufferArray).transitionToState(emulatedVAOState, false);
+		}
+		_wglDrawArrays(mode, first, count);
+	}
+
+	public static final void doDrawElements(int mode, int count, int type, int offset) {
+		if(emulatedVAOs) {
+			if(currentBufferArray == null) {
+				logger.warn("Skipping draw call with emulated VAO because no known VAO is bound!");
+				return;
+			}
+			((SoftGLBufferArray)currentBufferArray).transitionToState(emulatedVAOState, true);
+		}
+		_wglDrawElements(mode, count, type, offset);
+	}
+
+	public static final void doDrawArraysInstanced(int mode, int first, int count, int instances) {
+		if(emulatedVAOs) {
+			if(currentBufferArray == null) {
+				logger.warn("Skipping instanced draw call with emulated VAO because no known VAO is bound!");
+				return;
+			}
+			((SoftGLBufferArray)currentBufferArray).transitionToState(emulatedVAOState, false);
+		}
+		_wglDrawArraysInstanced(mode, first, count, instances);
+	}
+
+	public static final void doDrawElementsInstanced(int mode, int count, int type, int offset, int instances) {
+		if(emulatedVAOs) {
+			if(currentBufferArray == null) {
+				logger.warn("Skipping instanced draw call with emulated VAO because no known VAO is bound!");
+				return;
+			}
+			((SoftGLBufferArray)currentBufferArray).transitionToState(emulatedVAOState, true);
+		}
+		_wglDrawElementsInstanced(mode, count, type, offset, instances);
+	}
+
+	static IBufferArrayGL currentBufferArray = null;
 	
-	private static IBufferGL currentArrayBuffer = null;
-	
+	public static final void bindGLBufferArray(IBufferArrayGL buffer) {
+		if(emulatedVAOs) {
+			currentBufferArray = buffer;
+		}else {
+			if(currentBufferArray != buffer) {
+				_wglBindVertexArray(buffer);
+				currentBufferArray = buffer;
+			}
+		}
+	}
+
+	static IBufferGL currentArrayBuffer = null;
+
+	// only used when VAOs are emulated
+	static IBufferGL currentVAOArrayBuffer = null;
+
+	public static final void bindVAOGLArrayBuffer(IBufferGL buffer) {
+		if(emulatedVAOs) {
+			currentVAOArrayBuffer = buffer;
+		}else {
+			if(currentArrayBuffer != buffer) {
+				_wglBindBuffer(GL_ARRAY_BUFFER, buffer);
+				currentArrayBuffer = buffer;
+			}
+		}
+	}
+
+	public static final void bindVAOGLArrayBufferNow(IBufferGL buffer) {
+		if(emulatedVAOs) {
+			currentVAOArrayBuffer = buffer;
+		}
+		if(currentArrayBuffer != buffer) {
+			_wglBindBuffer(GL_ARRAY_BUFFER, buffer);
+			currentArrayBuffer = buffer;
+		}
+	}
+
+	public static final void bindVAOGLElementArrayBuffer(IBufferGL buffer) {
+		if(emulatedVAOs) {
+			if(currentBufferArray == null) {
+				logger.warn("Skipping set element array buffer with emulated VAO because no known VAO is bound!");
+				return;
+			}
+			((SoftGLBufferArray)currentBufferArray).setIndexBuffer(buffer);
+		}else {
+			_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer);
+		}
+	}
+
+	static final void bindVAOGLElementArrayBufferNow(IBufferGL buffer) {
+		if(emulatedVAOs) {
+			if(currentBufferArray == null) {
+				logger.warn("Skipping set element array buffer with emulated VAO because no known VAO is bound!");
+				return;
+			}
+			((SoftGLBufferArray)currentBufferArray).setIndexBuffer(buffer);
+			if(currentEmulatedVAOIndexBuffer != buffer) {
+				_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer);
+				currentEmulatedVAOIndexBuffer = buffer;
+			}
+		}else {
+			_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer);
+		}
+	}
+
+	static IBufferGL currentEmulatedVAOIndexBuffer = null;
+
+	static final void bindEmulatedVAOIndexBuffer(IBufferGL buffer) {
+		if(currentEmulatedVAOIndexBuffer != buffer) {
+			_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer);
+			currentEmulatedVAOIndexBuffer = buffer;
+		}
+	}
+
 	public static final void bindGLArrayBuffer(IBufferGL buffer) {
 		if(currentArrayBuffer != buffer) {
 			_wglBindBuffer(GL_ARRAY_BUFFER, buffer);
@@ -321,7 +541,7 @@ public class EaglercraftGPU {
 		}
 	}
 	
-	private static IBufferGL currentUniformBuffer = null;
+	static IBufferGL currentUniformBuffer = null;
 	
 	public static final void bindGLUniformBuffer(IBufferGL buffer) {
 		if(currentUniformBuffer != buffer) {
@@ -330,7 +550,7 @@ public class EaglercraftGPU {
 		}
 	}
 	
-	private static IProgramGL currentShaderProgram = null;
+	static IProgramGL currentShaderProgram = null;
 	
 	public static final void bindGLShaderProgram(IProgramGL prog) {
 		if(currentShaderProgram != prog) {
@@ -352,6 +572,38 @@ public class EaglercraftGPU {
 			currentUniformBlockBindingSize[index] = size;
 		}
 	}
+
+	public static final int CLEAR_BINDING_TEXTURE = 1;
+	public static final int CLEAR_BINDING_TEXTURE0 = 2;
+	public static final int CLEAR_BINDING_ACTIVE_TEXTURE = 4;
+	public static final int CLEAR_BINDING_BUFFER_ARRAY = 8;
+	public static final int CLEAR_BINDING_ARRAY_BUFFER = 16;
+	public static final int CLEAR_BINDING_SHADER_PROGRAM = 32;
+	
+	public static final void clearCurrentBinding(int mask) {
+		if((mask & CLEAR_BINDING_TEXTURE) != 0) {
+			int[] i = GlStateManager.boundTexture;
+			for(int j = 0; j < i.length; ++j) {
+				i[j] = -1;
+			}
+		}
+		if((mask & CLEAR_BINDING_TEXTURE0) != 0) {
+			GlStateManager.boundTexture[0] = -1;
+		}
+		if((mask & CLEAR_BINDING_ACTIVE_TEXTURE) != 0) {
+			GlStateManager.activeTexture = 0;
+			_wglActiveTexture(GL_TEXTURE0);
+		}
+		if((mask & CLEAR_BINDING_BUFFER_ARRAY) != 0) {
+			currentBufferArray = null;
+		}
+		if((mask & CLEAR_BINDING_ARRAY_BUFFER) != 0) {
+			currentArrayBuffer = currentVAOArrayBuffer = null;
+		}
+		if((mask & CLEAR_BINDING_SHADER_PROGRAM) != 0) {
+			currentShaderProgram = null;
+		}
+	}
 	
 	public static final int ATTRIB_TEXTURE = 1;
 	public static final int ATTRIB_COLOR = 2;
@@ -414,7 +666,7 @@ public class EaglercraftGPU {
 			if(newSize > 0xFFFF) {
 				newSize = 0xFFFF;
 			}
-			_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buf);
+			EaglercraftGPU.bindVAOGLElementArrayBufferNow(buf);
 			resizeQuad16EmulationBuffer(newSize >> 2);
 		}else {
 			int cnt = quad16EmulationBufferSize;
@@ -423,10 +675,10 @@ public class EaglercraftGPU {
 				if(newSize > 0xFFFF) {
 					newSize = 0xFFFF;
 				}
-				_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buf);
+				EaglercraftGPU.bindVAOGLElementArrayBufferNow(buf);
 				resizeQuad16EmulationBuffer(newSize >> 2);
 			}else if(bind) {
-				_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buf);
+				EaglercraftGPU.bindVAOGLElementArrayBuffer(buf);
 			}
 		}
 	}
@@ -436,16 +688,16 @@ public class EaglercraftGPU {
 		if(buf == null) {
 			quad32EmulationBuffer = buf = _wglGenBuffers();
 			int newSize = quad32EmulationBufferSize = (vertexCount & 0xFFFFC000) + 0x8000;
-			_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buf);
+			EaglercraftGPU.bindVAOGLElementArrayBufferNow(buf);
 			resizeQuad32EmulationBuffer(newSize >> 2);
 		}else {
 			int cnt = quad32EmulationBufferSize;
 			if(cnt < vertexCount) {
 				int newSize = quad32EmulationBufferSize = (vertexCount & 0xFFFFC000) + 0x8000;
-				_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buf);
+				EaglercraftGPU.bindVAOGLElementArrayBufferNow(buf);
 				resizeQuad32EmulationBuffer(newSize >> 2);
 			}else if(bind) {
-				_wglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buf);
+				EaglercraftGPU.bindVAOGLElementArrayBuffer(buf);
 			}
 		}
 	}
@@ -508,9 +760,19 @@ public class EaglercraftGPU {
 		p.drawElements(GL_TRIANGLES, mesh.indexCount, GL_UNSIGNED_SHORT, 0);
 	}
 
+	static int glesVers = -1;
 	static boolean hasFramebufferHDR16FSupport = false;
 	static boolean hasFramebufferHDR32FSupport = false;
+	static boolean hasLinearHDR16FSupport = false;
 	static boolean hasLinearHDR32FSupport = false;
+	static boolean fboRenderMipmapCapable = false;
+	static boolean vertexArrayCapable = false;
+	static boolean instancingCapable = false;
+	static boolean texStorageCapable = false;
+	static boolean textureLODCapable = false;
+	static boolean shader5Capable = false;
+	static boolean npotCapable = false;
+	static int uniformBufferOffsetAlignment = -1;
 
 	public static final void createFramebufferHDR16FTexture(int target, int level, int w, int h, int format, boolean allow32bitFallback) {
 		createFramebufferHDR16FTexture(target, level, w, h, format, allow32bitFallback, null);
@@ -525,19 +787,24 @@ public class EaglercraftGPU {
 			int internalFormat;
 			switch(format) {
 			case GL_RED:
-				internalFormat = 0x822D; // GL_R16F
+				if(glesVers == 200) {
+					format = GL_LUMINANCE;
+					internalFormat = GL_LUMINANCE;
+				}else {
+					internalFormat = glesVers == 200 ? GL_LUMINANCE : 0x822D; // GL_R16F
+				}
 				break;
 			case 0x8227: // GL_RG
-				internalFormat = 0x822F; // GL_RG16F
+				internalFormat = glesVers == 200 ? 0x8227 : 0x822F; // GL_RG16F
 			case GL_RGB:
 				throw new UnsupportedOperationException("GL_RGB16F isn't supported specifically in WebGL 2.0 for some goddamn reason");
 			case GL_RGBA:
-				internalFormat = 0x881A; // GL_RGBA16F
+				internalFormat = glesVers == 200 ? GL_RGBA : 0x881A; // GL_RGBA16F
 				break;
 			default:
 				throw new UnsupportedOperationException("Unknown format: " + format);
 			}
-			_wglTexImage2Du16(target, level, internalFormat, w, h, 0, format, 0x140B, pixelData);
+			_wglTexImage2Du16(target, level, internalFormat, w, h, 0, format, glesVers == 200 ? 0x8D61 : 0x140B, pixelData);
 		}else {
 			if(allow32bitFallback) {
 				if(hasFramebufferHDR32FSupport) {
@@ -567,7 +834,7 @@ public class EaglercraftGPU {
 				internalFormat = 0x822E; // GL_R32F
 				break;
 			case 0x8227: // GL_RG
-				internalFormat = 0x822F; // GL_RG32F
+				internalFormat = 0x8230; // GL_RG32F
 			case GL_RGB:
 				throw new UnsupportedOperationException("GL_RGB32F isn't supported specifically in WebGL 2.0 for some goddamn reason");
 			case GL_RGBA:
@@ -594,19 +861,38 @@ public class EaglercraftGPU {
 		EaglercraftGPU.glGetString(7936);
 		EaglercraftGPU.glGetString(7937);
 		EaglercraftGPU.glGetString(7938);
+		glesVers = PlatformOpenGL.checkOpenGLESVersion();
+		vertexArrayCapable = PlatformOpenGL.checkVAOCapable();
+		emulatedVAOs = !vertexArrayCapable;
+		fboRenderMipmapCapable = PlatformOpenGL.checkFBORenderMipmapCapable();
+		instancingCapable = PlatformOpenGL.checkInstancingCapable();
+		texStorageCapable = PlatformOpenGL.checkTexStorageCapable();
+		textureLODCapable = PlatformOpenGL.checkTextureLODCapable();
+		shader5Capable = PlatformOpenGL.checkOESGPUShader5Capable() || PlatformOpenGL.checkEXTGPUShader5Capable();
+		npotCapable = PlatformOpenGL.checkNPOTCapable();
+		uniformBufferOffsetAlignment = glesVers >= 300 ? _wglGetInteger(0x8A34) : -1;
+		if(!npotCapable) {
+			logger.warn("NPOT texture support detected as false, texture wrapping must be set to GL_CLAMP_TO_EDGE if the texture's width or height is not a power of 2");
+		}
 		hasFramebufferHDR16FSupport = PlatformOpenGL.checkHDRFramebufferSupport(16);
 		if(hasFramebufferHDR16FSupport) {
 			logger.info("16-bit HDR render target support: true");
 		}else {
 			logger.error("16-bit HDR render target support: false");
 		}
+		hasLinearHDR16FSupport = PlatformOpenGL.checkLinearHDRFilteringSupport(16);
+		if(hasLinearHDR16FSupport) {
+			logger.info("16-bit HDR linear filter support: true");
+		}else {
+			logger.error("16-bit HDR linear filter support: false");
+		}
 		hasFramebufferHDR32FSupport = PlatformOpenGL.checkHDRFramebufferSupport(32);
 		if(hasFramebufferHDR32FSupport) {
 			logger.info("32-bit HDR render target support: true");
 		}else {
 			logger.error("32-bit HDR render target support: false");
 		}
-		hasLinearHDR32FSupport = PlatformOpenGL.checkLinearHDR32FSupport();
+		hasLinearHDR32FSupport = PlatformOpenGL.checkLinearHDRFilteringSupport(32);
 		if(hasLinearHDR32FSupport) {
 			logger.info("32-bit HDR linear filter support: true");
 		}else {
@@ -615,16 +901,86 @@ public class EaglercraftGPU {
 		if(!checkHasHDRFramebufferSupportWithFilter()) {
 			logger.error("No HDR render target support was detected! Shaders will be disabled.");
 		}
+		if(emulatedVAOs) {
+			logger.info("Note: Could not unlock VAOs via OpenGL extensions, emulating them instead");
+		}
+		if(!instancingCapable) {
+			logger.info("Note: Could not unlock instancing via OpenGL extensions, using slow vanilla font and particle rendering");
+		}
+		emulatedVAOState = emulatedVAOs ? new SoftGLBufferState() : null;
+		PlatformOpenGL.enterVAOEmulationHook();
+		GLSLHeader.init();
 		DrawUtils.init();
 		SpriteLevelMixer.initialize();
-		InstancedFontRenderer.initialize();
-		InstancedParticleRenderer.initialize();
+		if(instancingCapable) {
+			InstancedFontRenderer.initialize();
+			InstancedParticleRenderer.initialize();
+		}
 		EffectPipelineFXAA.initialize();
 		TextureCopyUtil.initialize();
 		DrawUtils.vshLocal.free();
 		DrawUtils.vshLocal = null;
 	}
 
+	public static final void destroyCache() {
+		stringCache.clear();
+		mapTexturesGL.clear();
+		mapQueriesGL.clear();
+		mapDisplayListsGL.clear();
+		emulatedVAOs = false;
+		emulatedVAOState = null;
+		glesVers = -1;
+		fboRenderMipmapCapable = false;
+		vertexArrayCapable = false;
+		instancingCapable = false;
+		hasFramebufferHDR16FSupport = false;
+		hasFramebufferHDR32FSupport = false;
+		hasLinearHDR32FSupport = false;
+		GLSLHeader.destroy();
+		DrawUtils.destroy();
+		SpriteLevelMixer.destroy();
+		InstancedFontRenderer.destroy();
+		InstancedParticleRenderer.destroy();
+		EffectPipelineFXAA.destroy();
+		TextureCopyUtil.destroy();
+	}
+
+	public static final int checkOpenGLESVersion() {
+		return glesVers;
+	}
+
+	public static final boolean checkFBORenderMipmapCapable() {
+		return fboRenderMipmapCapable;
+	}
+
+	public static final boolean checkVAOCapable() {
+		return vertexArrayCapable;
+	}
+
+	public static final boolean checkInstancingCapable() {
+		return instancingCapable;
+	}
+
+	public static final boolean checkTexStorageCapable() {
+		return texStorageCapable;
+	}
+
+	public static final boolean checkTextureLODCapable() {
+		return textureLODCapable;
+	}
+
+	public static final boolean checkShader5Capable() {
+		return shader5Capable;
+	}
+
+	public static final boolean checkNPOTCapable() {
+		return npotCapable;
+	}
+
+	public static final int getUniformBufferOffsetAlignment() {
+		return uniformBufferOffsetAlignment;
+	}
+
 	public static final boolean checkHDRFramebufferSupport(int bits) {
 		switch(bits) {
 		case 16:
@@ -636,15 +992,28 @@ public class EaglercraftGPU {
 		}
 	}
 
+	public static final boolean checkLinearHDRFilteringSupport(int bits) {
+		switch(bits) {
+		case 16:
+			return hasLinearHDR16FSupport;
+		case 32:
+			return hasLinearHDR32FSupport;
+		default:
+			return false;
+		}
+	}
+
 	public static final boolean checkHasHDRFramebufferSupport() {
 		return hasFramebufferHDR16FSupport || hasFramebufferHDR32FSupport;
 	}
 
 	public static final boolean checkHasHDRFramebufferSupportWithFilter() {
-		return hasFramebufferHDR16FSupport || (hasFramebufferHDR32FSupport && hasLinearHDR32FSupport);
+		return (hasFramebufferHDR16FSupport && hasLinearHDR16FSupport) || (hasFramebufferHDR32FSupport && hasLinearHDR32FSupport);
 	}
 
+	//legacy
 	public static final boolean checkLinearHDR32FSupport() {
 		return hasLinearHDR32FSupport;
 	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EffectPipelineFXAA.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EffectPipelineFXAA.java
index b9e1a8c..f3f8421 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EffectPipelineFXAA.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/EffectPipelineFXAA.java
@@ -8,7 +8,6 @@ import net.lax1dude.eaglercraft.v1_8.internal.IUniformGL;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader.FixedFunctionConstants;
 
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
@@ -35,11 +34,13 @@ public class EffectPipelineFXAA {
 	private static final Logger logger = LogManager.getLogger("EffectPipelineFXAA");
 
 	public static final String fragmentShaderPath = "/assets/eagler/glsl/post_fxaa.fsh";
+	public static final String fragmentShaderPrecision = "precision lowp int;\nprecision mediump float;\nprecision mediump sampler2D;\n";
 
 	private static final int _GL_FRAMEBUFFER = 0x8D40;
 	private static final int _GL_RENDERBUFFER = 0x8D41;
 	private static final int _GL_COLOR_ATTACHMENT0 = 0x8CE0;
 	private static final int _GL_DEPTH_ATTACHMENT = 0x8D00;
+	private static final int _GL_DEPTH_COMPONENT16 = 0x81A5;
 	private static final int _GL_DEPTH_COMPONENT32F = 0x8CAC;
 
 	private static IProgramGL shaderProgram = null;
@@ -53,14 +54,11 @@ public class EffectPipelineFXAA {
 	private static int currentHeight = -1;
 
 	static void initialize() {
-		String fragmentSource = EagRuntime.getResourceString(fragmentShaderPath);
-		if(fragmentSource == null) {
-			throw new RuntimeException("EffectPipelineFXAA shader \"" + fragmentShaderPath + "\" is missing!");
-		}
+		String fragmentSource = EagRuntime.getRequiredResourceString(fragmentShaderPath);
 
 		IShaderGL frag = _wglCreateShader(GL_FRAGMENT_SHADER);
 
-		_wglShaderSource(frag, FixedFunctionConstants.VERSION + "\n" + fragmentSource);
+		_wglShaderSource(frag, GLSLHeader.getFragmentHeaderCompat(fragmentSource, fragmentShaderPrecision));
 		_wglCompileShader(frag);
 
 		if(_wglGetShaderi(frag, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -80,6 +78,10 @@ public class EffectPipelineFXAA {
 		_wglAttachShader(shaderProgram, DrawUtils.vshLocal);
 		_wglAttachShader(shaderProgram, frag);
 
+		if(EaglercraftGPU.checkOpenGLESVersion() == 200) {
+			VSHInputLayoutParser.applyLayout(shaderProgram, DrawUtils.vshLocalLayout);
+		}
+
 		_wglLinkProgram(shaderProgram);
 
 		_wglDetachShader(shaderProgram, DrawUtils.vshLocal);
@@ -130,10 +132,10 @@ public class EffectPipelineFXAA {
 			currentHeight = height;
 
 			GlStateManager.bindTexture(framebufferColor);
-			_wglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (ByteBuffer)null);
+			EaglercraftGPU.glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (ByteBuffer)null);
 
 			_wglBindRenderbuffer(_GL_RENDERBUFFER, framebufferDepth);
-			_wglRenderbufferStorage(_GL_RENDERBUFFER, _GL_DEPTH_COMPONENT32F, width, height);
+			_wglRenderbufferStorage(_GL_RENDERBUFFER, EaglercraftGPU.checkOpenGLESVersion() == 200 ? _GL_DEPTH_COMPONENT16 : _GL_DEPTH_COMPONENT32F, width, height);
 		}
 
 		_wglBindFramebuffer(_GL_FRAMEBUFFER, framebuffer);
@@ -155,4 +157,24 @@ public class EffectPipelineFXAA {
 		DrawUtils.drawStandardQuad2D();
 	}
 
+	public static void destroy() {
+		if(shaderProgram != null) {
+			_wglDeleteProgram(shaderProgram);
+			shaderProgram = null;
+		}
+		u_screenSize2f = null;
+		if(framebuffer != null) {
+			_wglDeleteFramebuffer(framebuffer);
+			framebuffer = null;
+		}
+		if(framebufferColor != -1) {
+			GlStateManager.deleteTexture(framebufferColor);
+			framebufferColor = -2;
+		}
+		if(framebufferDepth != null) {
+			_wglDeleteRenderbuffer(framebufferDepth);
+			framebufferDepth = null;
+		}
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java
index dc1d6ec..0885ff2 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java
@@ -98,33 +98,33 @@ public class FixedFunctionPipeline {
 		}
 		
 		EaglercraftGPU.bindGLBufferArray(list.vertexArray);
-		EaglercraftGPU.bindGLArrayBuffer(list.vertexBuffer);
+		EaglercraftGPU.bindVAOGLArrayBuffer(list.vertexBuffer);
 		
-		_wglEnableVertexAttribArray(0);
-		_wglVertexAttribPointer(0, VertexFormat.COMPONENT_POSITION_SIZE,
+		EaglercraftGPU.enableVertexAttribArray(0);
+		EaglercraftGPU.vertexAttribPointer(0, VertexFormat.COMPONENT_POSITION_SIZE,
 				VertexFormat.COMPONENT_POSITION_FORMAT, false, self.attribStride, 0);
 
 		if(self.attribTextureIndex != -1) {
-			_wglEnableVertexAttribArray(self.attribTextureIndex);
-			_wglVertexAttribPointer(self.attribTextureIndex, VertexFormat.COMPONENT_TEX_SIZE,
+			EaglercraftGPU.enableVertexAttribArray(self.attribTextureIndex);
+			EaglercraftGPU.vertexAttribPointer(self.attribTextureIndex, VertexFormat.COMPONENT_TEX_SIZE,
 					VertexFormat.COMPONENT_TEX_FORMAT, false, self.attribStride, self.attribTextureOffset);
 		}
 		
 		if(self.attribColorIndex != -1) {
-			_wglEnableVertexAttribArray(self.attribColorIndex);
-			_wglVertexAttribPointer(self.attribColorIndex, VertexFormat.COMPONENT_COLOR_SIZE,
+			EaglercraftGPU.enableVertexAttribArray(self.attribColorIndex);
+			EaglercraftGPU.vertexAttribPointer(self.attribColorIndex, VertexFormat.COMPONENT_COLOR_SIZE,
 					VertexFormat.COMPONENT_COLOR_FORMAT, true, self.attribStride, self.attribColorOffset);
 		}
 		
 		if(self.attribNormalIndex != -1) {
-			_wglEnableVertexAttribArray(self.attribNormalIndex);
-			_wglVertexAttribPointer(self.attribNormalIndex, VertexFormat.COMPONENT_NORMAL_SIZE,
+			EaglercraftGPU.enableVertexAttribArray(self.attribNormalIndex);
+			EaglercraftGPU.vertexAttribPointer(self.attribNormalIndex, VertexFormat.COMPONENT_NORMAL_SIZE,
 					VertexFormat.COMPONENT_NORMAL_FORMAT, true, self.attribStride, self.attribNormalOffset);
 		}
 		
 		if(self.attribLightmapIndex != -1) {
-			_wglEnableVertexAttribArray(self.attribLightmapIndex);
-			_wglVertexAttribPointer(self.attribLightmapIndex, VertexFormat.COMPONENT_LIGHTMAP_SIZE,
+			EaglercraftGPU.enableVertexAttribArray(self.attribLightmapIndex);
+			EaglercraftGPU.vertexAttribPointer(self.attribLightmapIndex, VertexFormat.COMPONENT_LIGHTMAP_SIZE,
 					VertexFormat.COMPONENT_LIGHTMAP_FORMAT, false, self.attribStride, self.attribLightmapOffset);
 		}
 		
@@ -145,7 +145,7 @@ public class FixedFunctionPipeline {
 	
 	void drawArrays(int mode, int offset, int count) {
 		EaglercraftGPU.bindGLShaderProgram(shaderProgram);
-		PlatformOpenGL._wglDrawArrays(mode, offset, count);
+		EaglercraftGPU.doDrawArrays(mode, offset, count);
 	}
 	
 	void drawDirectArrays(int mode, int offset, int count) {
@@ -160,7 +160,7 @@ public class FixedFunctionPipeline {
 				}else {
 					EaglercraftGPU.attachQuad32EmulationBuffer(count, false);
 				}
-				PlatformOpenGL._wglDrawElements(GL_TRIANGLES, count + (count >> 1),
+				EaglercraftGPU.doDrawElements(GL_TRIANGLES, count + (count >> 1),
 						GL_UNSIGNED_INT, 0);
 			}else {
 				if(!sb.bindQuad16) {
@@ -170,17 +170,17 @@ public class FixedFunctionPipeline {
 				}else {
 					EaglercraftGPU.attachQuad16EmulationBuffer(count, false);
 				}
-				PlatformOpenGL._wglDrawElements(GL_TRIANGLES, count + (count >> 1),
+				EaglercraftGPU.doDrawElements(GL_TRIANGLES, count + (count >> 1),
 						GL_UNSIGNED_SHORT, 0);
 			}
 		}else {
-			PlatformOpenGL._wglDrawArrays(mode, offset, count);
+			EaglercraftGPU.doDrawArrays(mode, offset, count);
 		}
 	}
 	
 	void drawElements(int mode, int count, int type, int offset) {
 		EaglercraftGPU.bindGLShaderProgram(shaderProgram);
-		PlatformOpenGL._wglDrawElements(mode, count, type, offset);
+		EaglercraftGPU.doDrawElements(mode, count, type, offset);
 	}
 	
 	private static IExtPipelineCompiler extensionProvider;
@@ -192,7 +192,7 @@ public class FixedFunctionPipeline {
 
 	private static final FixedFunctionPipeline[] pipelineStateCache = new FixedFunctionPipeline[fixedFunctionStatesBits + 1];
 	private static final FixedFunctionPipeline[][] pipelineExtStateCache = new FixedFunctionPipeline[fixedFunctionStatesBits + 1][];
-	private static final List<FixedFunctionPipeline> pipelineListTracker = new ArrayList(1024);
+	private static final List<FixedFunctionPipeline> pipelineListTracker = new ArrayList<>(1024);
 
 	private static String shaderSourceCacheVSH = null;
 	private static String shaderSourceCacheFSH = null;
@@ -232,22 +232,16 @@ public class FixedFunctionPipeline {
 			fshSource = extSource[1];
 		}else {
 			if(shaderSourceCacheVSH == null) {
-				shaderSourceCacheVSH = EagRuntime.getResourceString(FILENAME_VSH);
-				if(shaderSourceCacheVSH == null) {
-					throw new RuntimeException("Could not load: " + FILENAME_VSH);
-				}
+				shaderSourceCacheVSH = EagRuntime.getRequiredResourceString(FILENAME_VSH);
 			}
 			vshSource = shaderSourceCacheVSH;
 			if(shaderSourceCacheFSH == null) {
-				shaderSourceCacheFSH = EagRuntime.getResourceString(FILENAME_FSH);
-				if(shaderSourceCacheFSH == null) {
-					throw new RuntimeException("Could not load: " + FILENAME_FSH);
-				}
+				shaderSourceCacheFSH = EagRuntime.getRequiredResourceString(FILENAME_FSH);
 			}
 			fshSource = shaderSourceCacheFSH;
 		}
 		
-		StringBuilder macros = new StringBuilder(VERSION + "\n");
+		StringBuilder macros = new StringBuilder();
 		if((coreBits & STATE_HAS_ATTRIB_TEXTURE) != 0) {
 			macros.append("#define " + MACRO_ATTRIB_TEXTURE + "\n");
 		}
@@ -291,7 +285,8 @@ public class FixedFunctionPipeline {
 		
 		IShaderGL vsh = _wglCreateShader(GL_VERTEX_SHADER);
 		
-		_wglShaderSource(vsh, macros.toString() + vshSource);
+		String macrosStr = macros.toString();
+		_wglShaderSource(vsh, GLSLHeader.getVertexHeaderCompat(vshSource, macrosStr));
 		_wglCompileShader(vsh);
 		
 		if(_wglGetShaderi(vsh, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -309,7 +304,7 @@ public class FixedFunctionPipeline {
 		
 		IShaderGL fsh = _wglCreateShader(GL_FRAGMENT_SHADER);
 		
-		_wglShaderSource(fsh, macros.toString() + fshSource);
+		_wglShaderSource(fsh, GLSLHeader.getFragmentHeaderCompat(fshSource, macrosStr));
 		_wglCompileShader(fsh);
 		
 		if(_wglGetShaderi(fsh, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -581,45 +576,45 @@ public class FixedFunctionPipeline {
 		streamBuffer = new StreamBuffer(FixedFunctionShader.initialSize, FixedFunctionShader.initialCount,
 				FixedFunctionShader.maxCount, (vertexArray, vertexBuffer) -> {
 					EaglercraftGPU.bindGLBufferArray(vertexArray);
-					EaglercraftGPU.bindGLArrayBuffer(vertexBuffer);
+					EaglercraftGPU.bindVAOGLArrayBuffer(vertexBuffer);
 
-					_wglEnableVertexAttribArray(0);
-					_wglVertexAttribPointer(0, VertexFormat.COMPONENT_POSITION_SIZE,
+					EaglercraftGPU.enableVertexAttribArray(0);
+					EaglercraftGPU.vertexAttribPointer(0, VertexFormat.COMPONENT_POSITION_SIZE,
 							VertexFormat.COMPONENT_POSITION_FORMAT, false, attribStride, 0);
 
 					if(attribTextureIndex != -1) {
-						_wglEnableVertexAttribArray(attribTextureIndex);
-						_wglVertexAttribPointer(attribTextureIndex, VertexFormat.COMPONENT_TEX_SIZE,
+						EaglercraftGPU.enableVertexAttribArray(attribTextureIndex);
+						EaglercraftGPU.vertexAttribPointer(attribTextureIndex, VertexFormat.COMPONENT_TEX_SIZE,
 								VertexFormat.COMPONENT_TEX_FORMAT, false, attribStride, attribTextureOffset);
 					}
 					
 					if(attribColorIndex != -1) {
-						_wglEnableVertexAttribArray(attribColorIndex);
-						_wglVertexAttribPointer(attribColorIndex, VertexFormat.COMPONENT_COLOR_SIZE,
+						EaglercraftGPU.enableVertexAttribArray(attribColorIndex);
+						EaglercraftGPU.vertexAttribPointer(attribColorIndex, VertexFormat.COMPONENT_COLOR_SIZE,
 								VertexFormat.COMPONENT_COLOR_FORMAT, true, attribStride, attribColorOffset);
 					}
 					
 					if(attribNormalIndex != -1) {
-						_wglEnableVertexAttribArray(attribNormalIndex);
-						_wglVertexAttribPointer(attribNormalIndex, VertexFormat.COMPONENT_NORMAL_SIZE,
+						EaglercraftGPU.enableVertexAttribArray(attribNormalIndex);
+						EaglercraftGPU.vertexAttribPointer(attribNormalIndex, VertexFormat.COMPONENT_NORMAL_SIZE,
 								VertexFormat.COMPONENT_NORMAL_FORMAT, true, attribStride, attribNormalOffset);
 					}
 					
 					if(attribLightmapIndex != -1) {
-						_wglEnableVertexAttribArray(attribLightmapIndex);
-						_wglVertexAttribPointer(attribLightmapIndex, VertexFormat.COMPONENT_LIGHTMAP_SIZE,
+						EaglercraftGPU.enableVertexAttribArray(attribLightmapIndex);
+						EaglercraftGPU.vertexAttribPointer(attribLightmapIndex, VertexFormat.COMPONENT_LIGHTMAP_SIZE,
 								VertexFormat.COMPONENT_LIGHTMAP_FORMAT, false, attribStride, attribLightmapOffset);
 					}
 				});
 
-		stateEnableTexture2D = (bits & STATE_ENABLE_TEXTURE2D) == STATE_ENABLE_TEXTURE2D;
-		stateEnableLightmap = (bits & STATE_ENABLE_LIGHTMAP) == STATE_ENABLE_LIGHTMAP;
-		stateEnableAlphaTest = (bits & STATE_ENABLE_ALPHA_TEST) == STATE_ENABLE_ALPHA_TEST;
-		stateEnableMCLighting = (bits & STATE_ENABLE_MC_LIGHTING) == STATE_ENABLE_MC_LIGHTING;
-		stateEnableEndPortal = (bits & STATE_ENABLE_END_PORTAL) == STATE_ENABLE_END_PORTAL;
-		stateEnableAnisotropicFix = (bits & STATE_ENABLE_ANISOTROPIC_FIX) == STATE_ENABLE_ANISOTROPIC_FIX;
-		stateEnableFog = (bits & STATE_ENABLE_FOG) == STATE_ENABLE_FOG;
-		stateEnableBlendAdd = (bits & STATE_ENABLE_BLEND_ADD) == STATE_ENABLE_BLEND_ADD;
+		stateEnableTexture2D = (bits & STATE_ENABLE_TEXTURE2D) != 0;
+		stateEnableLightmap = (bits & STATE_ENABLE_LIGHTMAP) != 0;
+		stateEnableAlphaTest = (bits & STATE_ENABLE_ALPHA_TEST) != 0;
+		stateEnableMCLighting = (bits & STATE_ENABLE_MC_LIGHTING) != 0;
+		stateEnableEndPortal = (bits & STATE_ENABLE_END_PORTAL) != 0;
+		stateEnableAnisotropicFix = (bits & STATE_ENABLE_ANISOTROPIC_FIX) != 0;
+		stateEnableFog = (bits & STATE_ENABLE_FOG) != 0;
+		stateEnableBlendAdd = (bits & STATE_ENABLE_BLEND_ADD) != 0;
 		
 		for(int i = 0; i < stateLightsVectors.length; ++i) { 
 			stateLightsVectors[i] = new Vector4f(-999.0f, -999.0f, -999.0f, 0.0f);
@@ -1068,7 +1063,6 @@ public class FixedFunctionPipeline {
 	}
 
 	static void optimize() {
-		FixedFunctionPipeline pp;
 		for(int i = 0, l = pipelineListTracker.size(); i < l; ++i) {
 			pipelineListTracker.get(i).streamBuffer.optimize();
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionShader.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionShader.java
index 48e64ab..60980ac 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionShader.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionShader.java
@@ -44,7 +44,6 @@ public class FixedFunctionShader {
 
 	public class FixedFunctionConstants {
 
-		public static final String VERSION = "#version 300 es";
 		public static final String FILENAME_VSH = "/assets/eagler/glsl/core.vsh";
 		public static final String FILENAME_FSH = "/assets/eagler/glsl/core.fsh";
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GLSLHeader.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GLSLHeader.java
new file mode 100755
index 0000000..e31a076
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GLSLHeader.java
@@ -0,0 +1,99 @@
+package net.lax1dude.eaglercraft.v1_8.opengl;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GLSLHeader {
+
+	public static final String GLES2_COMPAT_FILE_NAME = "/assets/eagler/glsl/gles2_compat.glsl";
+
+	private static String header = null;
+	private static String gles2CompatFile = null;
+
+	static void init() {
+		gles2CompatFile = EagRuntime.getRequiredResourceString(GLES2_COMPAT_FILE_NAME);
+		int glesVersion = EaglercraftGPU.checkOpenGLESVersion();
+		StringBuilder headerBuilder;
+		if(glesVersion >= 310) {
+			headerBuilder = new StringBuilder("#version 310 es");
+			boolean oes5 = PlatformOpenGL.checkOESGPUShader5Capable();
+			boolean ext5 = !oes5 && PlatformOpenGL.checkEXTGPUShader5Capable();
+			if(oes5) {
+				headerBuilder.append("\n#extension GL_OES_gpu_shader5 : enable");
+			}else if(ext5) {
+				headerBuilder.append("\n#extension GL_EXT_gpu_shader5 : enable");
+			}
+			headerBuilder.append("\n#define EAGLER_IS_GLES_310");
+			headerBuilder.append("\n#define EAGLER_HAS_GLES_310");
+			headerBuilder.append("\n#define EAGLER_HAS_GLES_300");
+			headerBuilder.append("\n#define EAGLER_HAS_GLES_200");
+			if(oes5 || ext5) {
+				headerBuilder.append("\n#define EAGLER_HAS_GLES_310_SHADER_5");
+			}
+		}else if(glesVersion == 300) {
+			headerBuilder = new StringBuilder("#version 300 es");
+			headerBuilder.append("\n#define EAGLER_IS_GLES_300");
+			headerBuilder.append("\n#define EAGLER_HAS_GLES_300");
+			headerBuilder.append("\n#define EAGLER_HAS_GLES_200");
+		}else if(glesVersion == 200) {
+			boolean texLOD = PlatformOpenGL.checkTextureLODCapable();
+			headerBuilder = new StringBuilder("#version 100");
+			if(texLOD) {
+				headerBuilder.append("\n#extension GL_EXT_shader_texture_lod : enable");
+			}
+			headerBuilder.append("\n#define EAGLER_HAS_GLES_200");
+			headerBuilder.append("\n#define EAGLER_IS_GLES_200");
+			if(texLOD) {
+				headerBuilder.append("\n#define EAGLER_HAS_GLES_200_SHADER_TEXTURE_LOD");
+			}
+		}else {
+			throw new IllegalStateException("Unsupported OpenGL ES version: " + glesVersion);
+		}
+		header = headerBuilder.append('\n').toString();
+	}
+
+	static void destroy() {
+		header = null;
+	}
+
+	public static String getHeader() {
+		if(header == null) throw new IllegalStateException();
+		return header;
+	}
+
+	public static String getVertexHeader(String shaderSrc) {
+		if(header == null) throw new IllegalStateException();
+		return header + "#define EAGLER_IS_VERTEX_SHADER\n" + shaderSrc;
+	}
+
+	public static String getFragmentHeader(String shaderSrc) {
+		if(header == null) throw new IllegalStateException();
+		return header + "#define EAGLER_IS_FRAGMENT_SHADER\n" + shaderSrc;
+	}
+
+	public static String getVertexHeaderCompat(String shaderSrc, String precisions) {
+		if(header == null || gles2CompatFile == null) throw new IllegalStateException();
+		return header + "#define EAGLER_IS_VERTEX_SHADER\n" + (precisions == null ? "" : precisions + "\n") + gles2CompatFile + "\n" + shaderSrc;
+	}
+
+	public static String getFragmentHeaderCompat(String shaderSrc, String precisions) {
+		if(header == null || gles2CompatFile == null) throw new IllegalStateException();
+		return header + "#define EAGLER_IS_FRAGMENT_SHADER\n"+ (precisions == null ? "" : precisions + "\n") + gles2CompatFile + "\n" + shaderSrc;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GameOverlayFramebuffer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GameOverlayFramebuffer.java
index 3c4be6d..cdfb7da 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GameOverlayFramebuffer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GameOverlayFramebuffer.java
@@ -5,10 +5,13 @@ import net.lax1dude.eaglercraft.v1_8.internal.IRenderbufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+
 import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
 
 /**
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -40,10 +43,20 @@ public class GameOverlayFramebuffer {
 
 	private int framebufferColor = -1;
 
-	public void beginRender(int width, int height) {
+	private final boolean enableDepth;
+
+	public GameOverlayFramebuffer() {
+		this(true);
+	}
+
+	public GameOverlayFramebuffer(boolean enableDepth) {
+		this.enableDepth = enableDepth;
+	}
+
+	public boolean beginRender(int width, int height) {
 		if(framebuffer == null) {
 			framebuffer = _wglCreateFramebuffer();
-			depthBuffer = _wglCreateRenderbuffer();
+			depthBuffer = enableDepth ? _wglCreateRenderbuffer() : null;
 			framebufferColor = GlStateManager.generateTexture();
 			_wglBindFramebuffer(_GL_FRAMEBUFFER, framebuffer);
 			GlStateManager.bindTexture(framebufferColor);
@@ -52,29 +65,35 @@ public class GameOverlayFramebuffer {
 			_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 			_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 			_wglFramebufferTexture2D(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, EaglercraftGPU.getNativeTexture(framebufferColor), 0);
-			_wglBindRenderbuffer(_GL_RENDERBUFFER, depthBuffer);
-			_wglFramebufferRenderbuffer(_GL_FRAMEBUFFER, _GL_DEPTH_ATTACHMENT, _GL_RENDERBUFFER, depthBuffer);
+			if(enableDepth) {
+				_wglBindRenderbuffer(_GL_RENDERBUFFER, depthBuffer);
+				_wglFramebufferRenderbuffer(_GL_FRAMEBUFFER, _GL_DEPTH_ATTACHMENT, _GL_RENDERBUFFER, depthBuffer);
+			}
 		}
 
-		if(currentWidth != width || currentHeight != height) {
+		boolean resized = currentWidth != width || currentHeight != height;
+		if(resized) {
 			currentWidth = width;
 			currentHeight = height;
 			GlStateManager.bindTexture(framebufferColor);
-			_wglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (ByteBuffer)null);
-			_wglBindRenderbuffer(_GL_RENDERBUFFER, depthBuffer);
-			_wglRenderbufferStorage(_GL_RENDERBUFFER, _GL_DEPTH_COMPONENT16, width, height);
+			EaglercraftGPU.glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (ByteBuffer)null);
+			if(enableDepth) {
+				_wglBindRenderbuffer(_GL_RENDERBUFFER, depthBuffer);
+				_wglRenderbufferStorage(_GL_RENDERBUFFER, _GL_DEPTH_COMPONENT16, width, height);
+			}
 		}
 
 		_wglBindFramebuffer(_GL_FRAMEBUFFER, framebuffer);
+		return resized;
 	}
 
 	public void endRender() {
 		_wglBindFramebuffer(_GL_FRAMEBUFFER, null);
-		age = System.currentTimeMillis();
+		age = EagRuntime.steadyTimeMillis();
 	}
 
 	public long getAge() {
-		return age == -1l ? -1l : (System.currentTimeMillis() - age);
+		return age == -1l ? -1l : (EagRuntime.steadyTimeMillis() - age);
 	}
 
 	public int getTexture() {
@@ -84,7 +103,9 @@ public class GameOverlayFramebuffer {
 	public void destroy() {
 		if(framebuffer != null) {
 			_wglDeleteFramebuffer(framebuffer);
-			_wglDeleteRenderbuffer(depthBuffer);
+			if(enableDepth) {
+				_wglDeleteRenderbuffer(depthBuffer);
+			}
 			GlStateManager.deleteTexture(framebufferColor);
 			framebuffer = null;
 			depthBuffer = null;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GlStateManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GlStateManager.java
index 9a826eb..327a59d 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GlStateManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/GlStateManager.java
@@ -30,10 +30,12 @@ public class GlStateManager {
 	static final Logger logger = LogManager.getLogger("GlStateManager");
 
 	static boolean stateDepthTest = false;
+	static boolean stateDepthTestStash = false;
 	static int stateDepthFunc = -1;
 	static boolean stateDepthMask = true;
 
 	static boolean stateCull = false;
+	static boolean stateCullStash = false;
 	static int stateCullFace = GL_BACK;
 
 	static boolean statePolygonOffset = false;
@@ -58,6 +60,7 @@ public class GlStateManager {
 	static boolean stateEnableShaderBlendColor = false;
 
 	static boolean stateBlend = false;
+	static boolean stateBlendStash = false;
 	static boolean stateGlobalBlend = true;
 	static int stateBlendEquation = -1;
 	static int stateBlendSRC = -1;
@@ -312,6 +315,30 @@ public class GlStateManager {
 		}
 	}
 
+	public static final void eagPushStateForGLES2BlitHack() {
+		stateDepthTestStash = stateDepthTest;
+		stateCullStash = stateCull;
+		stateBlendStash = stateBlend;
+	}
+
+	public static final void eagPopStateForGLES2BlitHack() {
+		if(stateDepthTestStash) {
+			enableDepth();
+		}else {
+			disableDepth();
+		}
+		if(stateCullStash) {
+			enableCull();
+		}else {
+			disableCull();
+		}
+		if(stateBlendStash) {
+			enableBlend();
+		}else {
+			disableBlend();
+		}
+	}
+
 	public static final void depthFunc(int depthFunc) {
 		int rev = depthFunc;
 		switch(depthFunc) {
@@ -603,7 +630,9 @@ public class GlStateManager {
 					f2 = f1;
 				}
 				_wglBindTexture(GL_TEXTURE_2D, null);
-				_wglBindTexture(GL_TEXTURE_3D, null);
+				if(EaglercraftGPU.checkOpenGLESVersion() >= 300) {
+					_wglBindTexture(GL_TEXTURE_3D, null);
+				}
 				boundTexture[i] = -1;
 			}
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ImageData.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ImageData.java
index 4d91176..28d0cb3 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ImageData.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ImageData.java
@@ -56,6 +56,22 @@ public class ImageData {
 		return new ImageData(pw, ph, img, alpha);
 	}
 
+	public static String getMimeFromType(String nameOrPath) {
+		if(nameOrPath == null) return "image/png";
+		nameOrPath = nameOrPath.toLowerCase();
+		if(nameOrPath.endsWith(".png")) {
+			return "image/png";
+		}else if(nameOrPath.endsWith(".jpg") || nameOrPath.endsWith(".jpeg")) {
+			return "image/jpeg";
+		}else if(nameOrPath.endsWith(".gif")) {
+			return "image/gif";
+		}else if(nameOrPath.endsWith(".bmp")) {
+			return "image/bmp";
+		}else {
+			return "image/png"; // rip
+		}
+	}
+
 	public static final ImageData loadImageFile(String path) {
 		byte[] fileData = EagRuntime.getResourceBytes(path);
 		if(fileData != null) {
@@ -73,6 +89,23 @@ public class ImageData {
 		return PlatformAssets.loadImageFile(data);
 	}
 
+	public static final ImageData loadImageFile(String path, String mime) {
+		byte[] fileData = EagRuntime.getResourceBytes(path);
+		if(fileData != null) {
+			return loadImageFile(fileData, mime);
+		}else {
+			return null;
+		}
+	}
+
+	public static final ImageData loadImageFile(InputStream data, String mime) {
+		return PlatformAssets.loadImageFile(data, mime);
+	}
+
+	public static final ImageData loadImageFile(byte[] data, String mime) {
+		return PlatformAssets.loadImageFile(data, mime);
+	}
+
 	public void getRGB(int startX, int startY, int w, int h,
             int[] rgbArray, int offset, int scansize) {
 		for(int y = 0; y < h; ++y) {
@@ -147,5 +180,22 @@ public class ImageData {
 	public static int swapRB(int c) {
 		return (c & 0xFF00FF00) | ((c & 0x00FF0000) >>> 16) | ((c & 0x000000FF) << 16);
 	}
+	
+	public static int[] swapRB(int[] arr) {
+		for(int i = 0; i < arr.length; ++i) {
+			int j = arr[i];
+			arr[i] = (j & 0xFF00FF00) | ((j & 0x00FF0000) >>> 16) |
+					((j & 0x000000FF) << 16);
+		}
+		return arr;
+	}
+
+	public boolean isNPOT() {
+		return (width & (width - 1)) != 0 || (height & (height - 1)) != 0;
+	}
+
+	public static boolean isNPOTStatic(int w, int h) {
+		return (w & (w - 1)) != 0 || (h & (h - 1)) != 0;
+	}
 
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedFontRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedFontRenderer.java
index 0bc60b6..256098d 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedFontRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedFontRenderer.java
@@ -13,13 +13,12 @@ import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader.FixedFunctionConstants;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager;
 import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f;
 import net.lax1dude.eaglercraft.v1_8.vector.Vector4f;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -38,7 +37,10 @@ public class InstancedFontRenderer {
 	private static final Logger logger = LogManager.getLogger("InstancedFontRenderer");
 
 	public static final String vertexShaderPath = "/assets/eagler/glsl/accel_font.vsh";
+	public static final String vertexShaderPrecision = "precision lowp int;\nprecision highp float;\nprecision mediump sampler2D;\n";
+
 	public static final String fragmentShaderPath = "/assets/eagler/glsl/accel_font.fsh";
+	public static final String fragmentShaderPrecision = "precision lowp int;\nprecision highp float;\nprecision mediump sampler2D;\n";
 
 	private static final int BYTES_PER_CHARACTER = 10;
 	private static final int CHARACTER_LIMIT = 6553;
@@ -78,21 +80,13 @@ public class InstancedFontRenderer {
 	private static float charCoordHeightValue = -1.0f;
 	
 	static void initialize() {
-		
-		String vertexSource = EagRuntime.getResourceString(vertexShaderPath);
-		if(vertexSource == null) {
-			throw new RuntimeException("InstancedFontRenderer shader \"" + vertexShaderPath + "\" is missing!");
-		}
-
-		String fragmentSource = EagRuntime.getResourceString(fragmentShaderPath);
-		if(fragmentSource == null) {
-			throw new RuntimeException("InstancedFontRenderer shader \"" + fragmentShaderPath + "\" is missing!");
-		}
+		String vertexSource = EagRuntime.getRequiredResourceString(vertexShaderPath);
+		String fragmentSource = EagRuntime.getRequiredResourceString(fragmentShaderPath);
 
 		IShaderGL vert = _wglCreateShader(GL_VERTEX_SHADER);
 		IShaderGL frag = _wglCreateShader(GL_FRAGMENT_SHADER);
 
-		_wglShaderSource(vert, FixedFunctionConstants.VERSION + "\n" + vertexSource);
+		_wglShaderSource(vert, GLSLHeader.getVertexHeaderCompat(vertexSource, vertexShaderPrecision));
 		_wglCompileShader(vert);
 
 		if(_wglGetShaderi(vert, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -107,7 +101,7 @@ public class InstancedFontRenderer {
 			throw new IllegalStateException("Vertex shader \"" + vertexShaderPath + "\" could not be compiled!");
 		}
 
-		_wglShaderSource(frag, FixedFunctionConstants.VERSION + "\n" + fragmentSource);
+		_wglShaderSource(frag, GLSLHeader.getFragmentHeaderCompat(fragmentSource, fragmentShaderPrecision));
 		_wglCompileShader(frag);
 
 		if(_wglGetShaderi(frag, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -127,6 +121,10 @@ public class InstancedFontRenderer {
 		_wglAttachShader(shaderProgram, vert);
 		_wglAttachShader(shaderProgram, frag);
 
+		if(EaglercraftGPU.checkOpenGLESVersion() == 200) {
+			VSHInputLayoutParser.applyLayout(shaderProgram, VSHInputLayoutParser.getShaderInputs(vertexSource));
+		}
+
 		_wglLinkProgram(shaderProgram);
 
 		_wglDetachShader(shaderProgram, vert);
@@ -161,60 +159,62 @@ public class InstancedFontRenderer {
 
 		_wglUniform1i(_wglGetUniformLocation(shaderProgram, "u_inputTexture"), 0);
 
-		vertexArray = _wglGenVertexArrays();
+		vertexArray = EaglercraftGPU.createGLBufferArray();
 		vertexBuffer = _wglGenBuffers();
 		instancesBuffer = _wglGenBuffers();
 
 		FloatBuffer verts = EagRuntime.allocateFloatBuffer(108);
+		float paddingA = 0.005f;
+		float paddingB = 1.0f - paddingA;
 		verts.put(new float[] {
 				
 				// (0 - 6 - 12) regular:
 				
-				0.0f, 0.0f, 0.25f,  0.0f, 1.0f, 0.25f,  1.0f, 0.0f, 0.25f,
-				1.0f, 0.0f, 0.25f,  0.0f, 1.0f, 0.25f,  1.0f, 1.0f, 0.25f,
-				0.0f, 0.0f, 0.0f,  0.0f, 1.0f, 0.0f,  1.0f, 0.0f, 0.0f,
-				1.0f, 0.0f, 0.0f,  0.0f, 1.0f, 0.0f,  1.0f, 1.0f, 0.0f,
+				paddingA, paddingA, 0.25f,  paddingA, paddingB, 0.25f,  paddingB, paddingA, 0.25f,
+				paddingB, paddingA, 0.25f,  paddingA, paddingB, 0.25f,  paddingB, paddingB, 0.25f,
+				paddingA, paddingA, 0.0f,  paddingA, paddingB, 0.0f,  paddingB, paddingA, 0.0f,
+				paddingB, paddingA, 0.0f,  paddingA, paddingB, 0.0f,  paddingB, paddingB, 0.0f,
 
 				// (12 - 24 - 36) bold shadow:
 
-				0.0f, 0.0f, 0.25f,  0.0f, 1.0f, 0.25f,  1.0f, 0.0f, 0.25f,
-				1.0f, 0.0f, 0.25f,  0.0f, 1.0f, 0.25f,  1.0f, 1.0f, 0.25f,
-				0.0f, 0.0f, 0.75f,  0.0f, 1.0f, 0.75f,  1.0f, 0.0f, 0.75f,
-				1.0f, 0.0f, 0.75f,  0.0f, 1.0f, 0.75f,  1.0f, 1.0f, 0.75f,
+				paddingA, paddingA, 0.25f,  paddingA, paddingB, 0.25f,  paddingB, paddingA, 0.25f,
+				paddingB, paddingA, 0.25f,  paddingA, paddingB, 0.25f,  paddingB, paddingB, 0.25f,
+				paddingA, paddingA, 0.75f,  paddingA, paddingB, 0.75f,  paddingB, paddingA, 0.75f,
+				paddingB, paddingA, 0.75f,  paddingA, paddingB, 0.75f,  paddingB, paddingB, 0.75f,
 
-				0.0f, 0.0f, 0.0f,  0.0f, 1.0f, 0.0f,  1.0f, 0.0f, 0.0f,
-				1.0f, 0.0f, 0.0f,  0.0f, 1.0f, 0.0f,  1.0f, 1.0f, 0.0f,
-				0.0f, 0.0f, 0.5f,  0.0f, 1.0f, 0.5f,  1.0f, 0.0f, 0.5f,
-				1.0f, 0.0f, 0.5f,  0.0f, 1.0f, 0.5f,  1.0f, 1.0f, 0.5f
+				paddingA, paddingA, 0.0f,  paddingA, paddingB, 0.0f,  paddingB, paddingA, 0.0f,
+				paddingB, paddingA, 0.0f,  paddingA, paddingB, 0.0f,  paddingB, paddingB, 0.0f,
+				paddingA, paddingA, 0.5f,  paddingA, paddingB, 0.5f,  paddingB, paddingA, 0.5f,
+				paddingB, paddingA, 0.5f,  paddingA, paddingB, 0.5f,  paddingB, paddingB, 0.5f
 
 		});
 		verts.flip();
 
 		EaglercraftGPU.bindGLBufferArray(vertexArray);
 
-		EaglercraftGPU.bindGLArrayBuffer(vertexBuffer);
+		EaglercraftGPU.bindVAOGLArrayBufferNow(vertexBuffer);
 		_wglBufferData(GL_ARRAY_BUFFER, verts, GL_STATIC_DRAW);
 
 		EagRuntime.freeFloatBuffer(verts);
 
-		_wglEnableVertexAttribArray(0);
-		_wglVertexAttribPointer(0, 3, GL_FLOAT, false, 12, 0);
-		_wglVertexAttribDivisor(0, 0);
+		EaglercraftGPU.enableVertexAttribArray(0);
+		EaglercraftGPU.vertexAttribPointer(0, 3, GL_FLOAT, false, 12, 0);
+		EaglercraftGPU.vertexAttribDivisor(0, 0);
 
-		EaglercraftGPU.bindGLArrayBuffer(instancesBuffer);
+		EaglercraftGPU.bindVAOGLArrayBufferNow(instancesBuffer);
 		_wglBufferData(GL_ARRAY_BUFFER, fontDataBuffer.remaining(), GL_STREAM_DRAW);
 
-		_wglEnableVertexAttribArray(1);
-		_wglVertexAttribPointer(1, 2, GL_SHORT, false, 10, 0);
-		_wglVertexAttribDivisor(1, 1);
+		EaglercraftGPU.enableVertexAttribArray(1);
+		EaglercraftGPU.vertexAttribPointer(1, 2, GL_SHORT, false, 10, 0);
+		EaglercraftGPU.vertexAttribDivisor(1, 1);
 
-		_wglEnableVertexAttribArray(2);
-		_wglVertexAttribPointer(2, 2, GL_UNSIGNED_BYTE, false, 10, 4);
-		_wglVertexAttribDivisor(2, 1);
+		EaglercraftGPU.enableVertexAttribArray(2);
+		EaglercraftGPU.vertexAttribPointer(2, 2, GL_UNSIGNED_BYTE, false, 10, 4);
+		EaglercraftGPU.vertexAttribDivisor(2, 1);
 
-		_wglEnableVertexAttribArray(3);
-		_wglVertexAttribPointer(3, 4, GL_UNSIGNED_BYTE, true, 10, 6);
-		_wglVertexAttribDivisor(3, 1);
+		EaglercraftGPU.enableVertexAttribArray(3);
+		EaglercraftGPU.vertexAttribPointer(3, 4, GL_UNSIGNED_BYTE, true, 10, 6);
+		EaglercraftGPU.vertexAttribDivisor(3, 1);
 		
 	}
 
@@ -381,7 +381,7 @@ public class InstancedFontRenderer {
 			fontDataBuffer.position(p);
 			fontDataBuffer.limit(l);
 
-			_wglDrawArraysInstanced(GL_TRIANGLES, shadow ? 0 : 6, shadow ? 12 : 6, charactersDrawn);
+			EaglercraftGPU.doDrawArraysInstanced(GL_TRIANGLES, shadow ? 0 : 6, shadow ? 12 : 6, charactersDrawn);
 		}
 
 		if(boldCharactersDrawn > 0) {
@@ -394,7 +394,7 @@ public class InstancedFontRenderer {
 			fontBoldDataBuffer.position(p);
 			fontBoldDataBuffer.limit(l);
 
-			_wglDrawArraysInstanced(GL_TRIANGLES, shadow ? 12 : 24, shadow ? 24 : 12, boldCharactersDrawn);
+			EaglercraftGPU.doDrawArraysInstanced(GL_TRIANGLES, shadow ? 12 : 24, shadow ? 24 : 12, boldCharactersDrawn);
 		}
 	}
 
@@ -455,4 +455,40 @@ public class InstancedFontRenderer {
 		if(y > heightCalcMost || heightCalcMost == Integer.MAX_VALUE) heightCalcMost = y;
 	}
 
+	public static void destroy() {
+		if(fontDataBuffer != null) {
+			EagRuntime.freeByteBuffer(fontDataBuffer);
+			fontDataBuffer = null;
+		}
+		if(fontBoldDataBuffer != null) {
+			EagRuntime.freeByteBuffer(fontBoldDataBuffer);
+			fontBoldDataBuffer = null;
+		}
+		if(shaderProgram != null) {
+			_wglDeleteProgram(shaderProgram);
+			shaderProgram = null;
+		}
+		if(matrixCopyBuffer != null) {
+			EagRuntime.freeFloatBuffer(matrixCopyBuffer);
+			matrixCopyBuffer = null;
+		}
+		u_matrixTransform = null;
+		u_charSize2f = null;
+		u_charCoordSize2f = null;
+		u_color4f = null;
+		u_colorBias4f = null;
+		if(vertexArray != null) {
+			EaglercraftGPU.destroyGLBufferArray(vertexArray);
+			vertexArray = null;
+		}
+		if(vertexBuffer != null) {
+			_wglDeleteBuffers(vertexBuffer);
+			vertexBuffer = null;
+		}
+		if(instancesBuffer != null) {
+			_wglDeleteBuffers(instancesBuffer);
+			instancesBuffer = null;
+		}
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java
index 8cca43d..242f8a3 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java
@@ -13,11 +13,10 @@ import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader.FixedFunctionConstants;
 import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -36,7 +35,10 @@ public class InstancedParticleRenderer {
 	private static final Logger logger = LogManager.getLogger("InstancedParticleRenderer");
 
 	public static final String vertexShaderPath = "/assets/eagler/glsl/accel_particle.vsh";
+	public static final String vertexShaderPrecision = "precision lowp int;\nprecision highp float;\nprecision mediump sampler2D;\n";
+
 	public static final String fragmentShaderPath = "/assets/eagler/glsl/accel_particle.fsh";
+	public static final String fragmentShaderPrecision = "precision lowp int;\nprecision mediump float;\nprecision mediump sampler2D;\n";
 
 	private static ByteBuffer particleBuffer = null;
 	private static int particleCount = 0;
@@ -79,20 +81,13 @@ public class InstancedParticleRenderer {
 	private static float stateTransformParam5 = -999.0f;
 
 	static void initialize() {
-		String vertexSource = EagRuntime.getResourceString(vertexShaderPath);
-		if(vertexSource == null) {
-			throw new RuntimeException("InstancedParticleRenderer shader \"" + vertexShaderPath + "\" is missing!");
-		}
-
-		String fragmentSource = EagRuntime.getResourceString(fragmentShaderPath);
-		if(fragmentSource == null) {
-			throw new RuntimeException("InstancedParticleRenderer shader \"" + fragmentShaderPath + "\" is missing!");
-		}
+		String vertexSource = EagRuntime.getRequiredResourceString(vertexShaderPath);
+		String fragmentSource = EagRuntime.getRequiredResourceString(fragmentShaderPath);
 
 		IShaderGL vert = _wglCreateShader(GL_VERTEX_SHADER);
 		IShaderGL frag = _wglCreateShader(GL_FRAGMENT_SHADER);
 
-		_wglShaderSource(vert, FixedFunctionConstants.VERSION + "\n" + vertexSource);
+		_wglShaderSource(vert, GLSLHeader.getVertexHeaderCompat(vertexSource, vertexShaderPrecision));
 		_wglCompileShader(vert);
 
 		if(_wglGetShaderi(vert, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -107,7 +102,7 @@ public class InstancedParticleRenderer {
 			throw new IllegalStateException("Vertex shader \"" + vertexShaderPath + "\" could not be compiled!");
 		}
 
-		_wglShaderSource(frag, FixedFunctionConstants.VERSION + "\n" + fragmentSource);
+		_wglShaderSource(frag, GLSLHeader.getFragmentHeaderCompat(fragmentSource, fragmentShaderPrecision));
 		_wglCompileShader(frag);
 
 		if(_wglGetShaderi(frag, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -127,6 +122,10 @@ public class InstancedParticleRenderer {
 		_wglAttachShader(shaderProgram, vert);
 		_wglAttachShader(shaderProgram, frag);
 
+		if(EaglercraftGPU.checkOpenGLESVersion() == 200) {
+			VSHInputLayoutParser.applyLayout(shaderProgram, VSHInputLayoutParser.getShaderInputs(vertexSource));
+		}
+
 		_wglLinkProgram(shaderProgram);
 
 		_wglDetachShader(shaderProgram, vert);
@@ -161,7 +160,7 @@ public class InstancedParticleRenderer {
 		_wglUniform1i(_wglGetUniformLocation(shaderProgram, "u_inputTexture"), 0);
 		_wglUniform1i(_wglGetUniformLocation(shaderProgram, "u_lightmapTexture"), 1);
 
-		vertexArray = _wglGenVertexArrays();
+		vertexArray = EaglercraftGPU.createGLBufferArray();
 		vertexBuffer = _wglGenBuffers();
 		instancesBuffer = _wglGenBuffers();
 
@@ -174,37 +173,37 @@ public class InstancedParticleRenderer {
 
 		EaglercraftGPU.bindGLBufferArray(vertexArray);
 
-		EaglercraftGPU.bindGLArrayBuffer(vertexBuffer);
+		EaglercraftGPU.bindVAOGLArrayBufferNow(vertexBuffer);
 		_wglBufferData(GL_ARRAY_BUFFER, verts, GL_STATIC_DRAW);
 
 		EagRuntime.freeFloatBuffer(verts);
 
-		_wglEnableVertexAttribArray(0);
-		_wglVertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
-		_wglVertexAttribDivisor(0, 0);
+		EaglercraftGPU.enableVertexAttribArray(0);
+		EaglercraftGPU.vertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
+		EaglercraftGPU.vertexAttribDivisor(0, 0);
 
-		EaglercraftGPU.bindGLArrayBuffer(instancesBuffer);
+		EaglercraftGPU.bindVAOGLArrayBufferNow(instancesBuffer);
 		_wglBufferData(GL_ARRAY_BUFFER, particleBuffer.remaining(), GL_STREAM_DRAW);
 
-		_wglEnableVertexAttribArray(1);
-		_wglVertexAttribPointer(1, 3, GL_FLOAT, false, 24, 0);
-		_wglVertexAttribDivisor(1, 1);
+		EaglercraftGPU.enableVertexAttribArray(1);
+		EaglercraftGPU.vertexAttribPointer(1, 3, GL_FLOAT, false, 24, 0);
+		EaglercraftGPU.vertexAttribDivisor(1, 1);
 
-		_wglEnableVertexAttribArray(2);
-		_wglVertexAttribPointer(2, 2, GL_UNSIGNED_SHORT, false, 24, 12);
-		_wglVertexAttribDivisor(2, 1);
+		EaglercraftGPU.enableVertexAttribArray(2);
+		EaglercraftGPU.vertexAttribPointer(2, 2, GL_UNSIGNED_SHORT, false, 24, 12);
+		EaglercraftGPU.vertexAttribDivisor(2, 1);
 
-		_wglEnableVertexAttribArray(3);
-		_wglVertexAttribPointer(3, 2, GL_UNSIGNED_BYTE, true, 24, 16);
-		_wglVertexAttribDivisor(3, 1);
+		EaglercraftGPU.enableVertexAttribArray(3);
+		EaglercraftGPU.vertexAttribPointer(3, 2, GL_UNSIGNED_BYTE, true, 24, 16);
+		EaglercraftGPU.vertexAttribDivisor(3, 1);
 
-		_wglEnableVertexAttribArray(4);
-		_wglVertexAttribPointer(4, 2, GL_UNSIGNED_BYTE, false, 24, 18);
-		_wglVertexAttribDivisor(4, 1);
+		EaglercraftGPU.enableVertexAttribArray(4);
+		EaglercraftGPU.vertexAttribPointer(4, 2, GL_UNSIGNED_BYTE, false, 24, 18);
+		EaglercraftGPU.vertexAttribDivisor(4, 1);
 
-		_wglEnableVertexAttribArray(5);
-		_wglVertexAttribPointer(5, 4, GL_UNSIGNED_BYTE, true, 24, 20);
-		_wglVertexAttribDivisor(5, 1);
+		EaglercraftGPU.enableVertexAttribArray(5);
+		EaglercraftGPU.vertexAttribPointer(5, 4, GL_UNSIGNED_BYTE, true, 24, 20);
+		EaglercraftGPU.vertexAttribDivisor(5, 1);
 
 	}
 
@@ -316,11 +315,43 @@ public class InstancedParticleRenderer {
 		particleBuffer.position(p);
 		particleBuffer.limit(l);
 
-		_wglDrawArraysInstanced(GL_TRIANGLES, 0, 6, particleCount);
+		EaglercraftGPU.doDrawArraysInstanced(GL_TRIANGLES, 0, 6, particleCount);
 	}
 
 	public static void stupidColorSetHack(IUniformGL color4f) {
 		_wglUniform4f(color4f, GlStateManager.stateColorR, GlStateManager.stateColorG, GlStateManager.stateColorB, GlStateManager.stateColorA);
 	}
 
+	public static void destroy() {
+		if(particleBuffer != null) {
+			EagRuntime.freeByteBuffer(particleBuffer);
+			particleBuffer = null;
+		}
+		if(shaderProgram != null) {
+			_wglDeleteProgram(shaderProgram);
+			shaderProgram = null;
+		}
+		if(matrixCopyBuffer != null) {
+			EagRuntime.freeFloatBuffer(matrixCopyBuffer);
+			matrixCopyBuffer = null;
+		}
+		u_matrixTransform = null;
+		u_texCoordSize2f_particleSize1f = null;
+		u_transformParam_1_2_5_f = null;
+		u_transformParam_3_4_f = null;
+		u_color4f = null;
+		if(vertexArray != null) {
+			EaglercraftGPU.destroyGLBufferArray(vertexArray);
+			vertexArray = null;
+		}
+		if(vertexBuffer != null) {
+			_wglDeleteBuffers(vertexBuffer);
+			vertexBuffer = null;
+		}
+		if(instancesBuffer != null) {
+			_wglDeleteBuffers(instancesBuffer);
+			instancesBuffer = null;
+		}
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/RealOpenGLEnums.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/RealOpenGLEnums.java
index 427abb5..94347aa 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/RealOpenGLEnums.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/RealOpenGLEnums.java
@@ -1,7 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.opengl;
 
 /**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SoftGLBufferArray.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SoftGLBufferArray.java
new file mode 100755
index 0000000..4006214
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SoftGLBufferArray.java
@@ -0,0 +1,225 @@
+package net.lax1dude.eaglercraft.v1_8.opengl;
+
+import net.lax1dude.eaglercraft.v1_8.internal.IBufferArrayGL;
+import net.lax1dude.eaglercraft.v1_8.internal.IBufferGL;
+
+import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+class SoftGLBufferArray implements IBufferArrayGL {
+
+	Attrib[] attribs = new Attrib[4];
+	int[] attribDivisors = null;
+	int hasAttribDivisorMask = 0;
+	int enabled = 0;
+	int enabledCnt = -1;
+	IBufferGL indexBuffer = null;
+
+	SoftGLBufferArray() {
+	}
+
+	void setAttrib(IBufferGL buffer, int index, int size, int format, boolean normalized, int stride, int offset) {
+		if(index >= attribs.length) {
+			int newLen = attribs.length << 1;
+			while(newLen <= index) {
+				newLen <<= 1;
+			}
+			Attrib[] newAttrib = new Attrib[newLen];
+			System.arraycopy(attribs, 0, newAttrib, 0, attribs.length);
+			attribs = newAttrib;
+		}
+		attribs[index] = new Attrib(buffer, size, format, normalized, stride, offset);
+	}
+
+	void setAttribDivisor(int index, int divisor) {
+		if(attribDivisors == null) {
+			if(divisor != 0) {
+				int newLen = 8;
+				while(newLen <= index) {
+					newLen <<= 1;
+				}
+				attribDivisors = new int[newLen];
+			}
+		}else if(index >= attribDivisors.length) {
+			int newLen = attribDivisors.length << 1;
+			while(newLen <= index) {
+				newLen <<= 1;
+			}
+			int[] newDivisor = new int[newLen];
+			System.arraycopy(attribDivisors, 0, newDivisor, 0, attribDivisors.length);
+			attribDivisors = newDivisor;
+		}
+		if(attribDivisors != null) {
+			attribDivisors[index] = divisor;
+			if(divisor != 0) {
+				hasAttribDivisorMask |= (1 << index);
+			}else {
+				hasAttribDivisorMask &= ~(1 << index);
+			}
+		}
+	}
+
+	void enableAttrib(int index, boolean en) {
+		if(en) {
+			enabled |= (1 << index);
+		}else {
+			enabled &= ~(1 << index);
+		}
+		enabledCnt = 32 - Integer.numberOfLeadingZeros(enabled);
+	}
+
+	void setIndexBuffer(IBufferGL buffer) {
+		indexBuffer = buffer;
+	}
+
+	void transitionToState(SoftGLBufferState previousState, boolean elements) {
+		int oldEnabled = previousState.oldEnabled;
+		int oldEnabledCnt = previousState.oldEnabledCnt;
+		int[] oldAttribDivisors = previousState.attribDivisors;
+		int oldHasAttribDivisorMask = previousState.hasAttribDivisorMask;
+		Attrib[] oldAttrs = previousState.attribs;
+		boolean instancingCapable = EaglercraftGPU.checkInstancingCapable();
+		int enCnt = enabledCnt;
+		int en = enabled;
+		Attrib[] attrs = attribs;
+		int[] divs = attribDivisors;
+		int hasDivs = hasAttribDivisorMask;
+		if(oldEnabledCnt >= 0) {
+			int enMax = Math.max(enCnt, oldEnabledCnt);
+			for(int i = 0, ii; i < enMax; ++i) {
+				ii = (1 << i);
+				boolean old = i < oldEnabledCnt && (oldEnabled & ii) != 0;
+				boolean _new = i < enCnt && (en & ii) != 0;
+				if(_new) {
+					if(!old) {
+						_wglEnableVertexAttribArray(i);
+					}
+					Attrib attr = i < attrs.length ? attrs[i] : null;
+					if(attr != null) {
+						Attrib oldAttr = oldAttrs[i];
+						if(oldAttr == null || !oldAttr.equalsExplicit(attr)) {
+							EaglercraftGPU.bindGLArrayBuffer(attr.buffer);
+							_wglVertexAttribPointer(i, attr.size, attr.format, attr.normalized, attr.stride, attr.offset);
+							oldAttrs[i] = attr;
+						}
+					}else {
+						oldAttrs[i] = null;
+					}
+					if(instancingCapable) {
+						// instancing is uncommon
+						if((hasDivs & ii) != 0) {
+							int newDivisor = divs[i];
+							if((oldHasAttribDivisorMask & ii) == 0 || newDivisor != oldAttribDivisors[i]) {
+								_wglVertexAttribDivisor(i, newDivisor);
+								oldAttribDivisors[i] = newDivisor;
+								previousState.hasAttribDivisorMask |= ii;
+							}
+						}else {
+							if((oldHasAttribDivisorMask & ii) != 0) {
+								_wglVertexAttribDivisor(i, 0);
+								oldAttribDivisors[i] = 0;
+								previousState.hasAttribDivisorMask &= ~ii;
+							}
+						}
+					}
+				}else if(old) {
+					_wglDisableVertexAttribArray(i);
+				}
+			}
+		}else {
+			// Bootstrap code for the emulator's first draw
+			for(int i = 0; i < enCnt; ++i) {
+				int ii = (1 << i);
+				if((en & ii) != 0) {
+					_wglEnableVertexAttribArray(i);
+					Attrib attr = attrs[i];
+					if(attr != null) {
+						EaglercraftGPU.bindGLArrayBuffer(attr.buffer);
+						_wglVertexAttribPointer(i, attr.size, attr.format, attr.normalized, attr.stride, attr.offset);
+						oldAttrs[i] = attr;
+					}else {
+						oldAttrs[i] = null;
+					}
+					if(instancingCapable) {
+						if((hasDivs & ii) != 0) {
+							int newDivisor = divs[i];
+							_wglVertexAttribDivisor(i, newDivisor);
+							oldAttribDivisors[i] = newDivisor;
+							previousState.hasAttribDivisorMask |= ii;
+						}else {
+							_wglVertexAttribDivisor(i, 0);
+							oldAttribDivisors[i] = 0;
+						}
+					}
+				}
+			}
+		}
+		if(elements) {
+			IBufferGL indexBufferL = indexBuffer;
+			if(indexBufferL != null) {
+				EaglercraftGPU.bindEmulatedVAOIndexBuffer(indexBufferL);
+			}
+		}
+		previousState.oldEnabled = en & ((1 << enCnt) - 1);
+		previousState.oldEnabledCnt = enCnt;
+	}
+
+	@Override
+	public void free() {
+	}
+
+	static class Attrib {
+
+		final IBufferGL buffer;
+		final int size;
+		final int format;
+		final boolean normalized;
+		final int stride;
+		final int offset;
+		final int hash;
+		final int checkVal;
+
+		Attrib(IBufferGL buffer, int size, int format, boolean normalized, int stride, int offset) {
+			this.buffer = buffer;
+			this.size = size;
+			this.format = format;
+			this.normalized = normalized;
+			this.stride = stride;
+			this.offset = offset;
+			this.checkVal = ((size - 1) & 3) | (normalized ? 4 : 0) | (format << 4);
+			this.hash = (((((31 + buffer.hashCode()) * 31 + size) * 31 + format) * 31 + (normalized ? 1 : 0)) * 31
+					+ stride) * 31 + offset;
+		}
+
+		public int hashCode() {
+			return hash;
+		}
+
+		public boolean equals(Object obj) {
+			if(obj == this) return true;
+			if(!(obj instanceof Attrib)) return false;
+			Attrib o2 = (Attrib)obj;
+			return o2.hash == hash && o2.buffer == buffer && o2.checkVal == checkVal && o2.stride == stride && o2.offset == offset;
+		}
+
+		public boolean equalsExplicit(Attrib o2) {
+			return o2 == this || (o2.hash == hash && o2.buffer == buffer && o2.checkVal == checkVal && o2.stride == stride && o2.offset == offset);
+		}
+
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SoftGLBufferState.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SoftGLBufferState.java
new file mode 100755
index 0000000..615a411
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SoftGLBufferState.java
@@ -0,0 +1,31 @@
+package net.lax1dude.eaglercraft.v1_8.opengl;
+
+import net.lax1dude.eaglercraft.v1_8.opengl.SoftGLBufferArray.Attrib;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+class SoftGLBufferState {
+
+	final Attrib[] attribs = new Attrib[24];
+	int[] attribDivisors = new int[24];
+	int hasAttribDivisorMask = 0;
+	int oldEnabled = 0;
+	int oldEnabledCnt = -1;
+
+	SoftGLBufferState() {
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SpriteLevelMixer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SpriteLevelMixer.java
index 75eea72..814543f 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SpriteLevelMixer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SpriteLevelMixer.java
@@ -10,7 +10,6 @@ import net.lax1dude.eaglercraft.v1_8.internal.IUniformGL;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader.FixedFunctionConstants;
 import net.lax1dude.eaglercraft.v1_8.vector.Matrix3f;
 
 /**
@@ -33,6 +32,7 @@ public class SpriteLevelMixer {
 	private static final Logger LOGGER = LogManager.getLogger("SpriteLevelMixer");
 
 	public static final String fragmentShaderPath = "/assets/eagler/glsl/texture_mix.fsh";
+	public static final String fragmentShaderPrecision = "precision lowp int;\nprecision highp float;\nprecision highp sampler2D;\n";
 
 	private static IProgramGL shaderProgram = null;
 
@@ -61,15 +61,11 @@ public class SpriteLevelMixer {
 	private static final Matrix3f identityMatrix = new Matrix3f();
 
 	static void initialize() {
-
-		String fragmentSource = EagRuntime.getResourceString(fragmentShaderPath);
-		if(fragmentSource == null) {
-			throw new RuntimeException("SpriteLevelMixer shader \"" + fragmentShaderPath + "\" is missing!");
-		}
+		String fragmentSource = EagRuntime.getRequiredResourceString(fragmentShaderPath);
 
 		IShaderGL frag = _wglCreateShader(GL_FRAGMENT_SHADER);
 
-		_wglShaderSource(frag, FixedFunctionConstants.VERSION + "\n" + fragmentSource);
+		_wglShaderSource(frag, GLSLHeader.getFragmentHeaderCompat(fragmentSource, fragmentShaderPrecision));
 		_wglCompileShader(frag);
 
 		if(_wglGetShaderi(frag, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -89,6 +85,10 @@ public class SpriteLevelMixer {
 		_wglAttachShader(shaderProgram, DrawUtils.vshLocal);
 		_wglAttachShader(shaderProgram, frag);
 
+		if(EaglercraftGPU.checkOpenGLESVersion() == 200) {
+			VSHInputLayoutParser.applyLayout(shaderProgram, DrawUtils.vshLocalLayout);
+		}
+
 		_wglLinkProgram(shaderProgram);
 
 		_wglDetachShader(shaderProgram, DrawUtils.vshLocal);
@@ -155,7 +155,14 @@ public class SpriteLevelMixer {
 	public static void drawSprite(float level) {
 		EaglercraftGPU.bindGLShaderProgram(shaderProgram);
 		
-		_wglUniform1f(u_textureLod1f, level);
+		if(EaglercraftGPU.checkTextureLODCapable()) {
+			_wglUniform1f(u_textureLod1f, level);
+		}else {
+			if(level != 0.0f) {
+				LOGGER.error("Tried to copy from mipmap level {}, but this GPU does not support textureLod!", level);
+			}
+			_wglUniform1f(u_textureLod1f, 0.0f);
+		}
 		
 		if(blendColorChanged) {
 			_wglUniform4f(u_blendFactor4f, blendColorR, blendColorG, blendColorB, blendColorA);
@@ -178,4 +185,19 @@ public class SpriteLevelMixer {
 		DrawUtils.drawStandardQuad2D();
 	}
 
+	public static void destroy() {
+		if(matrixCopyBuffer != null) {
+			EagRuntime.freeFloatBuffer(matrixCopyBuffer);
+			matrixCopyBuffer = null;
+		}
+		if(shaderProgram != null) {
+			_wglDeleteProgram(shaderProgram);
+			shaderProgram = null;
+		}
+		u_textureLod1f = null;
+		u_blendFactor4f = null;
+		u_blendBias4f = null;
+		u_matrixTransform = null;
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/StreamBuffer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/StreamBuffer.java
index 7ca668b..f92d5f3 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/StreamBuffer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/StreamBuffer.java
@@ -74,7 +74,7 @@ public class StreamBuffer {
 			next.vertexBuffer = _wglGenBuffers();
 		}
 		if(next.vertexArray == null) {
-			next.vertexArray = _wglGenVertexArrays();
+			next.vertexArray = EaglercraftGPU.createGLBufferArray();
 			initializer.initialize(next.vertexArray, next.vertexBuffer);
 		}
 		if(next.vertexBufferSize < requiredMemory) {
@@ -100,7 +100,7 @@ public class StreamBuffer {
 						newArray[i] = buffers[i];
 					}else {
 						if(buffers[i].vertexArray != null) {
-							_wglDeleteVertexArrays(buffers[i].vertexArray);
+							EaglercraftGPU.destroyGLBufferArray(buffers[i].vertexArray);
 						}
 						if(buffers[i].vertexBuffer != null) {
 							_wglDeleteBuffers(buffers[i].vertexBuffer);
@@ -135,7 +135,7 @@ public class StreamBuffer {
 		for(int i = 0; i < buffers.length; ++i) {
 			StreamBufferInstance next = buffers[i];
 			if(next.vertexArray != null) {
-				_wglDeleteVertexArrays(next.vertexArray);
+				EaglercraftGPU.destroyGLBufferArray(next.vertexArray);
 			}
 			if(next.vertexBuffer != null) {
 				_wglDeleteBuffers(next.vertexBuffer);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/TextureCopyUtil.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/TextureCopyUtil.java
index 7ebe093..4819cc9 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/TextureCopyUtil.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/TextureCopyUtil.java
@@ -3,16 +3,17 @@ package net.lax1dude.eaglercraft.v1_8.opengl;
 import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
+import java.util.List;
+
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.IProgramGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IShaderGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IUniformGL;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader.FixedFunctionConstants;
 
 /**
- * Copyright (c) 2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2023-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -31,9 +32,13 @@ public class TextureCopyUtil {
 	private static final Logger LOGGER = LogManager.getLogger("TextureCopyUtil");
 
 	public static final String vertexShaderPath = "/assets/eagler/glsl/texture_blit.vsh";
+	public static final String vertexShaderPrecision = "precision lowp int;\nprecision highp float;\nprecision highp sampler2D;\n";
+
 	public static final String fragmentShaderPath = "/assets/eagler/glsl/texture_blit.fsh";
+	public static final String fragmentShaderPrecision = "precision lowp int;\nprecision highp float;\nprecision highp sampler2D;\n";
 
 	private static String vshSource = null;
+	private static List<VSHInputLayoutParser.ShaderInput> vshSourceLayout = null;
 	private static String fshSource = null;
 
 	private static IShaderGL vshShader = null;
@@ -54,6 +59,17 @@ public class TextureCopyUtil {
 			this.u_pixelAlignmentSizes4f = _wglGetUniformLocation(shaderProgram, "u_pixelAlignmentSizes4f");
 			this.u_pixelAlignmentOffset2f = _wglGetUniformLocation(shaderProgram, "u_pixelAlignmentOffset2f");
 		}
+		private void destroy() {
+			if(shaderProgram != null) {
+				_wglDeleteProgram(shaderProgram);
+				shaderProgram = null;
+			}
+			u_srcCoords4f = null;
+			u_dstCoords4f = null;
+			u_textureLod1f = null;
+			u_pixelAlignmentSizes4f = null;
+			u_pixelAlignmentOffset2f = null;
+		}
 	}
 
 	private static TextureCopyShader textureBlit = null;
@@ -74,19 +90,12 @@ public class TextureCopyUtil {
 	private static float alignOffsetY = 0.0f;
 
 	static void initialize() {
-		vshSource = EagRuntime.getResourceString(vertexShaderPath);
-		if(vshSource == null) {
-			throw new RuntimeException("TextureCopyUtil shader \"" + vertexShaderPath + "\" is missing!");
-		}
-
-		fshSource = EagRuntime.getResourceString(fragmentShaderPath);
-		if(fshSource == null) {
-			throw new RuntimeException("TextureCopyUtil shader \"" + fragmentShaderPath + "\" is missing!");
-		}
+		vshSource = EagRuntime.getRequiredResourceString(vertexShaderPath);
+		fshSource = EagRuntime.getRequiredResourceString(fragmentShaderPath);
 
 		vshShader = _wglCreateShader(GL_VERTEX_SHADER);
 
-		_wglShaderSource(vshShader, FixedFunctionConstants.VERSION + "\n" + vshSource);
+		_wglShaderSource(vshShader, GLSLHeader.getVertexHeaderCompat(vshSource, vertexShaderPrecision));
 		_wglCompileShader(vshShader);
 
 		if(_wglGetShaderi(vshShader, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -100,14 +109,17 @@ public class TextureCopyUtil {
 			}
 			throw new IllegalStateException("Vertex shader \"" + vertexShaderPath + "\" could not be compiled!");
 		}
+		
+		if(EaglercraftGPU.checkOpenGLESVersion() == 200) {
+			vshSourceLayout = VSHInputLayoutParser.getShaderInputs(vshSource);
+		}
 	}
 
 	private static TextureCopyShader compileShader(boolean align, boolean depth) {
 		IShaderGL frag = _wglCreateShader(GL_FRAGMENT_SHADER);
 
-		_wglShaderSource(frag,
-				FixedFunctionConstants.VERSION + "\n" + (align ? "#define COMPILE_PIXEL_ALIGNMENT\n" : "")
-						+ (depth ? "#define COMPILE_BLIT_DEPTH\n" : "") + fshSource);
+		_wglShaderSource(frag, GLSLHeader.getFragmentHeaderCompat(fshSource, fragmentShaderPrecision
+				+ (align ? "#define COMPILE_PIXEL_ALIGNMENT\n" : "") + (depth ? "#define COMPILE_BLIT_DEPTH\n" : "")));
 		_wglCompileShader(frag);
 
 		if(_wglGetShaderi(frag, GL_COMPILE_STATUS) != GL_TRUE) {
@@ -127,6 +139,10 @@ public class TextureCopyUtil {
 		_wglAttachShader(shaderProgram, vshShader);
 		_wglAttachShader(shaderProgram, frag);
 
+		if(EaglercraftGPU.checkOpenGLESVersion() == 200) {
+			VSHInputLayoutParser.applyLayout(shaderProgram, vshSourceLayout);
+		}
+
 		_wglLinkProgram(shaderProgram);
 
 		_wglDetachShader(shaderProgram, vshShader);
@@ -226,7 +242,14 @@ public class TextureCopyUtil {
 		_wglUniform4f(shaderObj.u_srcCoords4f, (float)srcX / srcViewW, (float)srcY / srcViewH, (float)srcW / srcViewW, (float)srcH / srcViewH);
 		_wglUniform4f(shaderObj.u_dstCoords4f, (float) dstX / dstViewW - 1.0f, (float) dstY / dstViewH - 1.0f,
 				(float) dstW / dstViewW, (float) dstH / dstViewH);
-		_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		if(EaglercraftGPU.checkTextureLODCapable()) {
+			_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		}else {
+			if(lvl != 0.0f) {
+				LOGGER.error("Tried to copy from mipmap level {}, but this GPU does not support textureLod!", lvl);
+			}
+			_wglUniform1f(shaderObj.u_textureLod1f, 0.0f);
+		}
 		if(isAligned) {
 			_wglUniform4f(shaderObj.u_pixelAlignmentSizes4f, alignW, alignH, 1.0f / alignW, 1.0f / alignH);
 			_wglUniform2f(shaderObj.u_pixelAlignmentOffset2f, alignOffsetX, alignOffsetY);
@@ -244,7 +267,14 @@ public class TextureCopyUtil {
 		EaglercraftGPU.bindGLShaderProgram(shaderObj.shaderProgram);
 		_wglUniform4f(shaderObj.u_srcCoords4f, 0.0f, 0.0f, 1.0f, 1.0f);
 		_wglUniform4f(shaderObj.u_dstCoords4f, -1.0f, -1.0f, 2.0f, 2.0f);
-		_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		if(EaglercraftGPU.checkTextureLODCapable()) {
+			_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		}else {
+			if(lvl != 0.0f) {
+				LOGGER.error("Tried to copy from mipmap level {}, but this GPU does not support textureLod!", lvl);
+			}
+			_wglUniform1f(shaderObj.u_textureLod1f, 0.0f);
+		}
 		if(isAligned) {
 			_wglUniform4f(shaderObj.u_pixelAlignmentSizes4f, alignW, alignH, 1.0f / alignW, 1.0f / alignH);
 			_wglUniform2f(shaderObj.u_pixelAlignmentOffset2f, alignOffsetX, alignOffsetY);
@@ -271,7 +301,14 @@ public class TextureCopyUtil {
 		GlStateManager.viewport(dstX, dstY, dstW, dstH);
 		_wglUniform4f(shaderObj.u_srcCoords4f, (float)srcX / srcViewW, (float)srcY / srcViewH, (float)srcW / srcViewW, (float)srcH / srcViewH);
 		_wglUniform4f(shaderObj.u_dstCoords4f, -1.0f, -1.0f, 2.0f, 2.0f);
-		_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		if(EaglercraftGPU.checkTextureLODCapable()) {
+			_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		}else {
+			if(lvl != 0.0f) {
+				LOGGER.error("Tried to copy from mipmap level {}, but this GPU does not support textureLod!", lvl);
+			}
+			_wglUniform1f(shaderObj.u_textureLod1f, 0.0f);
+		}
 		if(isAligned) {
 			_wglUniform4f(shaderObj.u_pixelAlignmentSizes4f, alignW, alignH, 1.0f / alignW, 1.0f / alignH);
 			_wglUniform2f(shaderObj.u_pixelAlignmentOffset2f, alignOffsetX, alignOffsetY);
@@ -298,7 +335,14 @@ public class TextureCopyUtil {
 		_wglUniform4f(shaderObj.u_srcCoords4f, (float)srcX / srcViewW, (float)srcY / srcViewH, (float)srcW / srcViewW, (float)srcH / srcViewH);
 		_wglUniform4f(shaderObj.u_dstCoords4f, (float) dstX / dstViewW - 1.0f, (float) dstY / dstViewH - 1.0f,
 				(float) dstW / dstViewW, (float) dstH / dstViewH);
-		_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		if(EaglercraftGPU.checkTextureLODCapable()) {
+			_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		}else {
+			if(lvl != 0.0f) {
+				LOGGER.error("Tried to copy from mipmap level {}, but this GPU does not support textureLod!", lvl);
+			}
+			_wglUniform1f(shaderObj.u_textureLod1f, 0.0f);
+		}
 		if(isAligned) {
 			_wglUniform4f(shaderObj.u_pixelAlignmentSizes4f, alignW, alignH, 1.0f / alignW, 1.0f / alignH);
 			_wglUniform2f(shaderObj.u_pixelAlignmentOffset2f, alignOffsetX, alignOffsetY);
@@ -316,7 +360,14 @@ public class TextureCopyUtil {
 		EaglercraftGPU.bindGLShaderProgram(shaderObj.shaderProgram);
 		_wglUniform4f(shaderObj.u_srcCoords4f, 0.0f, 0.0f, 1.0f, 1.0f);
 		_wglUniform4f(shaderObj.u_dstCoords4f, -1.0f, -1.0f, 2.0f, 2.0f);
-		_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		if(EaglercraftGPU.checkTextureLODCapable()) {
+			_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		}else {
+			if(lvl != 0.0f) {
+				LOGGER.error("Tried to copy from mipmap level {}, but this GPU does not support textureLod!", lvl);
+			}
+			_wglUniform1f(shaderObj.u_textureLod1f, 0.0f);
+		}
 		if(isAligned) {
 			_wglUniform4f(shaderObj.u_pixelAlignmentSizes4f, alignW, alignH, 1.0f / alignW, 1.0f / alignH);
 			_wglUniform2f(shaderObj.u_pixelAlignmentOffset2f, alignOffsetX, alignOffsetY);
@@ -343,7 +394,14 @@ public class TextureCopyUtil {
 		GlStateManager.viewport(dstX, dstY, dstW, dstH);
 		_wglUniform4f(shaderObj.u_srcCoords4f, (float)srcX / srcViewW, (float)srcY / srcViewH, (float)srcW / srcViewW, (float)srcH / srcViewH);
 		_wglUniform4f(shaderObj.u_dstCoords4f, -1.0f, -1.0f, 2.0f, 2.0f);
-		_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		if(EaglercraftGPU.checkTextureLODCapable()) {
+			_wglUniform1f(shaderObj.u_textureLod1f, lvl);
+		}else {
+			if(lvl != 0.0f) {
+				LOGGER.error("Tried to copy from mipmap level {}, but this GPU does not support textureLod!", lvl);
+			}
+			_wglUniform1f(shaderObj.u_textureLod1f, 0.0f);
+		}
 		if(isAligned) {
 			_wglUniform4f(shaderObj.u_pixelAlignmentSizes4f, alignW, alignH, 1.0f / alignW, 1.0f / alignH);
 			_wglUniform2f(shaderObj.u_pixelAlignmentOffset2f, alignOffsetX, alignOffsetY);
@@ -351,4 +409,27 @@ public class TextureCopyUtil {
 		}
 		DrawUtils.drawStandardQuad2D();
 	}
+
+	public static void destroy() {
+		if(vshShader != null) {
+			_wglDeleteShader(vshShader);
+			vshShader = null;
+		}
+		if(textureBlit != null) {
+			textureBlit.destroy();
+			textureBlit = null;
+		}
+		if(textureBlitAligned != null) {
+			textureBlitAligned.destroy();
+			textureBlitAligned = null;
+		}
+		if(textureBlitDepth != null) {
+			textureBlitDepth.destroy();
+			textureBlitDepth = null;
+		}
+		if(textureBlitDepthAligned != null) {
+			textureBlitDepthAligned.destroy();
+			textureBlitDepthAligned = null;
+		}
+	}
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/TextureFormatHelper.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/TextureFormatHelper.java
new file mode 100755
index 0000000..c8bb39b
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/TextureFormatHelper.java
@@ -0,0 +1,81 @@
+package net.lax1dude.eaglercraft.v1_8.opengl;
+
+import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
+import static net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ExtGLEnums.*;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TextureFormatHelper {
+
+	public static int getFormatFromInternal(int internalFormat) {
+		switch(internalFormat) {
+		case _GL_R8:
+		case 0x822D: // GL_R16F
+		case 0x822E: // GL_R32F
+			return GL_RED;
+		case _GL_RG8:
+		case 0x822F: // GL_RG16F
+		case 0x8230: // GL_RG32F
+			return _GL_RG;
+		case GL_RGB8:
+		case _GL_RGB16F:
+		case 0x8815: // GL_RGB32F
+			return GL_RGB;
+		case GL_RGBA8:
+		case 0x881A: // GL_RGBA16F
+		case 0x8814: // GL_RGBA32F
+			return GL_RGBA;
+		default:
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	public static int getTypeFromInternal(int internalFormat) {
+		switch(internalFormat) {
+		case _GL_R8:
+		case _GL_RG8:
+		case GL_RGB8:
+		case GL_RGBA8:
+			return GL_UNSIGNED_BYTE;
+		case 0x822D: // GL_R16F
+		case 0x822F: // GL_RG16F
+		case _GL_RGB16F:
+		case 0x881A: // GL_RGBA16F
+			return _GL_HALF_FLOAT;
+		case 0x822E: // GL_R32F
+		case 0x8230: // GL_RG32F
+		case 0x8815: // GL_RGB32F
+		case 0x8814: // GL_RGBA32F
+			return GL_FLOAT;
+		default:
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	public static int trivializeInternalFormatToGLES20(int internalFormat) {
+		switch(internalFormat) {
+		case _GL_R8:
+			return GL_LUMINANCE;
+		case GL_RGB8:
+			return GL_RGB;
+		case GL_RGBA8:
+			return GL_RGBA;
+		default:
+			throw new UnsupportedOperationException();
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/VSHInputLayoutParser.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/VSHInputLayoutParser.java
new file mode 100755
index 0000000..72fbabd
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/VSHInputLayoutParser.java
@@ -0,0 +1,91 @@
+package net.lax1dude.eaglercraft.v1_8.opengl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.internal.IProgramGL;
+
+import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class VSHInputLayoutParser {
+
+	public static class ShaderInput {
+
+		public final int index;
+		public final String type;
+		public final String name;
+
+		public ShaderInput(int index, String type, String name) {
+			this.index = index;
+			this.type = type;
+			this.name = name;
+		}
+
+	}
+
+	public static class ShaderLayoutParseException extends RuntimeException {
+
+		public ShaderLayoutParseException(String message, Throwable cause) {
+			super(message, cause);
+		}
+
+		public ShaderLayoutParseException(String message) {
+			super(message);
+		}
+
+	}
+
+	public static List<ShaderInput> getShaderInputs(String vshSource) {
+		int idx1 = vshSource.indexOf("EAGLER_VSH_LAYOUT_BEGIN()");
+		if(idx1 == -1) {
+			throw new ShaderLayoutParseException("Could not find \"EAGLER_VSH_LAYOUT_BEGIN()\" delimiter!");
+		}
+		int idx2 = vshSource.indexOf("EAGLER_VSH_LAYOUT_END()", idx1 + 25);
+		if(idx2 == -1) {
+			throw new ShaderLayoutParseException("Could not find \"EAGLER_VSH_LAYOUT_END()\" delimiter!");
+		}
+		List<String> lines = EagUtils.linesList(vshSource.substring(idx1 + 25, idx2));
+		List<ShaderInput> ret = new ArrayList<>();
+		for(int i = 0, l = lines.size(); i < l; ++i) {
+			String ln = lines.get(i);
+			ln = ln.trim();
+			if(ln.startsWith("EAGLER_IN(") && ln.endsWith(")")) {
+				String[] tokens = ln.substring(10, ln.length() - 1).split(",", 3);
+				if(tokens.length == 3) {
+					int idx;
+					try {
+						idx = Integer.parseInt(tokens[0].trim());
+					}catch(NumberFormatException ex) {
+						continue;
+					}
+					ret.add(new ShaderInput(idx, tokens[1].trim(), tokens[2].trim()));
+				}
+			}
+		}
+		return ret;
+	}
+
+	public static void applyLayout(IProgramGL program, List<ShaderInput> layout) {
+		for(int i = 0, l = layout.size(); i < l; ++i) {
+			ShaderInput itm = layout.get(i);
+			_wglBindAttribLocation(program, itm.index, itm.name);
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/WorldRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/WorldRenderer.java
index 42b10e9..066650e 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/WorldRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/WorldRenderer.java
@@ -8,7 +8,6 @@ import java.util.BitSet;
 import java.util.Comparator;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformBufferFunctions;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
 import net.minecraft.client.renderer.GLAllocation;
@@ -121,7 +120,7 @@ public class WorldRenderer {
 				for (int k1 = ainteger[i1].intValue(); j1 != l1; k1 = ainteger[k1].intValue()) {
 					this.intBuffer.limit(k1 * l + l);
 					this.intBuffer.position(k1 * l);
-					IntBuffer intbuffer = this.intBuffer.slice();
+					IntBuffer intbuffer = this.intBuffer.duplicate();
 					this.intBuffer.limit(j1 * l + l);
 					this.intBuffer.position(j1 * l);
 					this.intBuffer.put(intbuffer);
@@ -178,7 +177,10 @@ public class WorldRenderer {
 	 */
 	public void setVertexState(WorldRenderer.State state) {
 		this.grow(state.getRawBuffer().length);
-		PlatformBufferFunctions.put(this.intBuffer, 0, state.getRawBuffer());
+		int p = intBuffer.position();
+		this.intBuffer.position(0);
+		this.intBuffer.put(state.getRawBuffer());
+		this.intBuffer.position(p);
 		this.vertexCount = state.getVertexCount();
 		this.vertexFormat = state.getVertexFormat();
 	}
@@ -339,7 +341,10 @@ public class WorldRenderer {
 	 */
 	public void addVertexData(int[] vertexData) {
 		this.grow(vertexData.length);
-		PlatformBufferFunctions.put(this.intBuffer, (this.vertexCount * this.vertexFormat.attribStride) >> 2, vertexData);
+		int p = this.intBuffer.position();
+		this.intBuffer.position((this.vertexCount * this.vertexFormat.attribStride) >> 2);
+		this.intBuffer.put(vertexData);
+		this.intBuffer.position(p);
 		this.vertexCount += vertexData.length / (this.vertexFormat.attribStride >> 2); 
 	}
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/BlockVertexIDs.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/BlockVertexIDs.java
index 044d59a..5f6bcff 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/BlockVertexIDs.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/BlockVertexIDs.java
@@ -32,7 +32,7 @@ public class BlockVertexIDs implements IResourceManagerReloadListener {
 
 	private static final Logger logger = LogManager.getLogger("BlockVertexIDsCSV");
 
-	public static final Map<String,Integer> modelToID = new HashMap();
+	public static final Map<String,Integer> modelToID = new HashMap<>();
 
 	public static int builtin_water_still_vertex_id = 0;
 	public static int builtin_water_flow_vertex_id = 0;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/CloudRenderWorker.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/CloudRenderWorker.java
index dc8f6c4..8b11644 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/CloudRenderWorker.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/CloudRenderWorker.java
@@ -103,7 +103,7 @@ public class CloudRenderWorker {
 	static void initialize() {
 		destroy();
 
-		cloudStartTimer = System.currentTimeMillis();
+		cloudStartTimer = EagRuntime.steadyTimeMillis();
 		cloudRenderProgress = 0;
 		cloudRenderPeriod = 500;
 		cloudRenderPhase = 0;
@@ -168,7 +168,7 @@ public class CloudRenderWorker {
 		_wglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
 		_wglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 		_wglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		byte[] cloudShapeTexture = EagRuntime.getResourceBytes("/assets/eagler/glsl/deferred/clouds_shapes.bmp");
+		byte[] cloudShapeTexture = EagRuntime.getRequiredResourceBytes("/assets/eagler/glsl/deferred/clouds_shapes.bmp");
 		cloudNoiseDatBuffer = EagRuntime.allocateByteBuffer(cloudShapeTexture.length);
 		cloudNoiseDatBuffer.put(cloudShapeTexture);
 		cloudNoiseDatBuffer.flip();
@@ -207,7 +207,7 @@ public class CloudRenderWorker {
 	}
 
 	static void update() {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		int cloudProgress = (int)(millis - cloudStartTimer);
 		int totalCloudSteps = 32 + 32 - 1;
 		int currentCloudStep = cloudProgress * totalCloudSteps / cloudRenderPeriod;
@@ -268,7 +268,7 @@ public class CloudRenderWorker {
 			cloudColorB += (currentSunAngle.z - cloudColorB) * 0.1f;
 			_wglUniform3f(shader_clouds_sample.uniforms.u_sunColor3f, cloudColorR, cloudColorG, cloudColorB);
 			
-			float cloudDensityTimer = (float)((System.currentTimeMillis() % 10000000l) * 0.001);
+			float cloudDensityTimer = (float)((EagRuntime.steadyTimeMillis() % 10000000l) * 0.001);
 			cloudDensityTimer += MathHelper.sin(cloudDensityTimer * 1.5f) * 1.5f;
 			float x = cloudDensityTimer * 0.004f;
 			float f1 = MathHelper.sin(x + 0.322f) * 0.544f + MathHelper.sin(x * 4.5f + 1.843f) * 0.69f + MathHelper.sin(x * 3.4f + 0.8f) * 0.6f + MathHelper.sin(x * 6.1f + 1.72f) * 0.7f;
@@ -404,7 +404,7 @@ public class CloudRenderWorker {
 		
 		if(b) {
 			cloudRenderProgress = 0;
-			cloudStartTimer = System.currentTimeMillis();
+			cloudStartTimer = EagRuntime.steadyTimeMillis();
 			cloudProgress = 0;
 			cloudRenderPhase = (cloudRenderPhase + 1) % 3;
 		}else {
@@ -539,7 +539,7 @@ public class CloudRenderWorker {
 	}
 
 	private static void updateShape() {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		float dt = (float)((millis - shapeUpdateTimer) * 0.001);
 		shapeUpdateTimer = millis;
 		if(millis > nextShapeAppearance) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DebugFramebufferView.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DebugFramebufferView.java
index d48d1a1..848208e 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DebugFramebufferView.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DebugFramebufferView.java
@@ -4,12 +4,12 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.function.Consumer;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.opengl.DrawUtils;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.program.PipelineShaderGBufferDebugView;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.ScaledResolution;
 
 import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
@@ -249,7 +249,7 @@ public class DebugFramebufferView {
 				PipelineShaderGBufferDebugView dbg = pipeline.useDebugViewShader(18);
 				GlStateManager.setActiveTexture(GL_TEXTURE0);
 				GlStateManager.bindTexture3D(CloudRenderWorker.cloud3DSamplesTexture);
-				_wglUniform1f(_wglGetUniformLocation(dbg.program, "u_fuckU1f"), (float)((System.currentTimeMillis() % 5000l) / 5000.0));
+				_wglUniform1f(_wglGetUniformLocation(dbg.program, "u_fuckU1f"), (float)((EagRuntime.steadyTimeMillis() % 5000l) / 5000.0));
 				DrawUtils.drawStandardQuad2D();
 			})),
 			(new DebugFramebufferView("Clouds Back Buffer", (pipeline) -> {
@@ -449,19 +449,18 @@ public class DebugFramebufferView {
 			GlStateManager.clear(GL_COLOR_BUFFER_BIT);
 			noData = true;
 		}
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		long elapsed = millis - debugViewNameTimer;
 		if(elapsed < 2000l || noData) {
 			GlStateManager.matrixMode(GL_PROJECTION);
 			GlStateManager.pushMatrix();
 			GlStateManager.matrixMode(GL_MODELVIEW);
 			GlStateManager.pushMatrix();
-			ScaledResolution scaledresolution = new ScaledResolution(mc);
-			int w = scaledresolution.getScaledWidth();
+			int w = mc.scaledResolution.getScaledWidth();
 			mc.entityRenderer.setupOverlayRendering();
 			GlStateManager.enableBlend();
 			GlStateManager.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			int h = scaledresolution.getScaledHeight() / 2;
+			int h = mc.scaledResolution.getScaledHeight() / 2;
 			
 			if(noData) {
 				String noDataTxt = "No Data";
@@ -507,13 +506,13 @@ public class DebugFramebufferView {
 	public static void toggleDebugView() {
 		debugViewShown = !debugViewShown;
 		if(debugViewShown) {
-			debugViewNameTimer = System.currentTimeMillis();
+			debugViewNameTimer = EagRuntime.steadyTimeMillis();
 		}
 	}
 
 	public static void switchView(int dir) {
 		if(!debugViewShown) return;
-		debugViewNameTimer = System.currentTimeMillis();
+		debugViewNameTimer = EagRuntime.steadyTimeMillis();
 		currentDebugView += dir;
 		if(currentDebugView < 0) currentDebugView = views.size() - 1;
 		if(currentDebugView >= views.size()) currentDebugView = 0;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DeferredStateManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DeferredStateManager.java
index 9d615ee..c0fca89 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DeferredStateManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DeferredStateManager.java
@@ -148,7 +148,7 @@ public class DeferredStateManager {
 			if(!cfg.is_rendering_dynamicLights || !cfg.shaderPackInfo.DYNAMIC_LIGHTS) {
 				return;
 			}
-			instance.loadLightSourceBucket(centerX, centerY, centerZ);
+			instance.bindLightSourceBucket(centerX, centerY, centerZ, 1);
 		}
 	}
 
@@ -162,7 +162,7 @@ public class DeferredStateManager {
 			float posX = (float)((x + TileEntityRendererDispatcher.staticPlayerX) - (MathHelper.floor_double(TileEntityRendererDispatcher.staticPlayerX / 16.0) << 4));
 			float posY = (float)((y + TileEntityRendererDispatcher.staticPlayerY) - (MathHelper.floor_double(TileEntityRendererDispatcher.staticPlayerY / 16.0) << 4));
 			float posZ = (float)((z + TileEntityRendererDispatcher.staticPlayerZ) - (MathHelper.floor_double(TileEntityRendererDispatcher.staticPlayerZ / 16.0) << 4));
-			instance.loadLightSourceBucket((int)posX, (int)posY, (int)posZ);
+			instance.bindLightSourceBucket((int)posX, (int)posY, (int)posZ, 1);
 		}
 	}
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DynamicLightInstance.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DynamicLightInstance.java
index 432aa60..f270868 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DynamicLightInstance.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DynamicLightInstance.java
@@ -1,5 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+
 /**
  * Copyright (c) 2023 lax1dude. All Rights Reserved.
  * 
@@ -35,7 +37,7 @@ class DynamicLightInstance {
 	}
 
 	public void updateLight(double posX, double posY, double posZ, float red, float green, float blue) {
-		this.lastCacheHit = System.currentTimeMillis();
+		this.lastCacheHit = EagRuntime.steadyTimeMillis();
 		this.posX = posX;
 		this.posY = posY;
 		this.posZ = posZ;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DynamicLightManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DynamicLightManager.java
index 2d90e21..bfccf16 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DynamicLightManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DynamicLightManager.java
@@ -6,6 +6,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+
 /**
  * Copyright (c) 2023 lax1dude. All Rights Reserved.
  * 
@@ -23,8 +25,8 @@ import java.util.Map;
  */
 public class DynamicLightManager {
 
-	static final Map<String, DynamicLightInstance> lightRenderers = new HashMap();
-	static final List<DynamicLightInstance> lightRenderList = new LinkedList();
+	static final Map<String, DynamicLightInstance> lightRenderers = new HashMap<>();
+	static final List<DynamicLightInstance> lightRenderList = new LinkedList<>();
 	static long renderTimeout = 5000l;
 	static boolean isRenderLightsPass = false;
 
@@ -51,7 +53,7 @@ public class DynamicLightManager {
 	}
 
 	static void updateTimers() {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		if(millis - lastTick > 1000l) {
 			lastTick = millis;
 			Iterator<DynamicLightInstance> itr = lightRenderers.values().iterator();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java
index 4e880a8..ea12feb 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java
@@ -71,7 +71,7 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * Copyright (c) 2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2023-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -112,6 +112,7 @@ public class EaglerDeferredPipeline {
 	public double currentRenderX = 0.0;
 	public double currentRenderY = 0.0;
 	public double currentRenderZ = 0.0;
+	public int currentRenderPosSerial = 0;
 
 	public IFramebufferGL gBufferFramebuffer = null;
 
@@ -307,6 +308,7 @@ public class EaglerDeferredPipeline {
 	private ByteBuffer worldLightingDataCopyBuffer;
 
 	public IBufferGL buffer_chunkLightingData;
+	public IBufferGL buffer_chunkLightingDataZero;
 	private ByteBuffer chunkLightingDataCopyBuffer;
 	private boolean isChunkLightingEnabled = false;
 	public ListSerial<DynamicLightInstance> currentBoundLightSourceBucket;
@@ -336,9 +338,20 @@ public class EaglerDeferredPipeline {
 	public static final Vector3f tmpVector4 = new Vector3f();
 
 	public final ListSerial<DynamicLightInstance>[] lightSourceBuckets;
+	private final int[] lightSourceBucketSerials;
+	private final int[] lightSourceRenderPosSerials;
 	public ListSerial<DynamicLightInstance> currentLightSourceBucket;
+	private int currentLightSourceBucketId = -1;
+	private int lightingBufferSliceLength = -1;
 
 	public static final int MAX_LIGHTS_PER_CHUNK = 12;
+	public static final int LIGHTING_BUFFER_LENGTH = 32 * MAX_LIGHTS_PER_CHUNK + 16;
+
+	private int uniformBufferOffsetAlignment = -1;
+
+	private int uboAlign(int offset) {
+		return MathHelper.ceiling_float_int((float)offset / (float)uniformBufferOffsetAlignment) * uniformBufferOffsetAlignment;
+	}
 
 	private final int lightSourceBucketsWidth;
 	private final int lightSourceBucketsHeight;
@@ -372,13 +385,18 @@ public class EaglerDeferredPipeline {
 		this.lightSourceBucketsHeight = 3;
 		int cnt = 5 * 3 * 5;
 		this.lightSourceBuckets = new ListSerial[cnt];
+		this.lightSourceBucketSerials = new int[cnt];
+		this.lightSourceRenderPosSerials = new int[cnt];
 		for(int i = 0; i < cnt; ++i) {
-			this.lightSourceBuckets[i] = new ArrayListSerial(16);
+			this.lightSourceBuckets[i] = new ArrayListSerial<>(16);
+			this.lightSourceBucketSerials[i] = -1;
+			this.lightSourceRenderPosSerials[i] = -1;
 		}
 	}
 
 	public void rebuild(EaglerDeferredConfig config) {
 		destroy();
+		uniformBufferOffsetAlignment = EaglercraftGPU.getUniformBufferOffsetAlignment();
 		DeferredStateManager.doCheckErrors = EagRuntime.getConfiguration().isCheckShaderGLErrors();
 		DeferredStateManager.checkGLError("Pre: rebuild pipeline");
 		this.config = config;
@@ -544,7 +562,7 @@ public class EaglerDeferredPipeline {
 			GlStateManager.bindTexture(ssaoNoiseTexture);
 			setNearest();
 			int noiseTexSize = 64, noiseTexLen = 16384;
-			byte[] noiseTexDat = EagRuntime.getResourceBytes("assets/eagler/glsl/deferred/ssao_noise.bmp");
+			byte[] noiseTexDat = EagRuntime.getRequiredResourceBytes("assets/eagler/glsl/deferred/ssao_noise.bmp");
 			if(noiseTexDat == null || noiseTexDat.length != noiseTexLen) {
 				noiseTexDat = new byte[noiseTexLen];
 				for(int i = 0; i < 4096; ++i) {
@@ -592,7 +610,7 @@ public class EaglerDeferredPipeline {
 		GlStateManager.bindTexture(brdfTexture);
 		setLinear();
 		int brdfLutW = 64, brdfLutH = 64, brdfLutLen = 8192;
-		byte[] brdfLutDat = EagRuntime.getResourceBytes("assets/eagler/glsl/deferred/brdf_lut.bmp");
+		byte[] brdfLutDat = EagRuntime.getRequiredResourceBytes("assets/eagler/glsl/deferred/brdf_lut.bmp");
 		if(brdfLutDat == null || brdfLutDat.length != brdfLutLen) {
 			brdfLutDat = new byte[brdfLutLen];
 			for(int i = 0; i < 4096; ++i) {
@@ -748,7 +766,9 @@ public class EaglerDeferredPipeline {
 		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		ByteBuffer copyBuffer = EagRuntime.allocateByteBuffer(262144);
 		int mip = 0;
-		try(DataInputStream dis = new DataInputStream(EagRuntime.getResourceStream("/assets/eagler/glsl/deferred/eagler_moon.bmp"))) {
+		
+		try (DataInputStream dis = new DataInputStream(mc.getResourceManager()
+				.getResource(new ResourceLocation("eagler:glsl/deferred/eagler_moon.bmp")).getInputStream())) {
 			while(dis.read() == 'E') {
 				int w = dis.readShort();
 				int h = dis.readShort();
@@ -873,7 +893,7 @@ public class EaglerDeferredPipeline {
 			_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 			_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 			String realistic_water_noise_filename = "assets/eagler/glsl/deferred/realistic_water_noise.bmp";
-			byte[] bitmapBytes = EagRuntime.getResourceBytes(realistic_water_noise_filename);
+			byte[] bitmapBytes = EagRuntime.getRequiredResourceBytes(realistic_water_noise_filename);
 			try {
 				if(bitmapBytes.length != 32768) {
 					throw new IOException("File is length " + bitmapBytes.length + ", expected " + 32768);
@@ -1008,15 +1028,22 @@ public class EaglerDeferredPipeline {
 			shader_lighting_point = PipelineShaderLightingPoint.compile(false);
 			shader_lighting_point.loadUniforms();
 
-			buffer_chunkLightingData = _wglGenBuffers();
-			EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
-			int lightingDataLength = 8 * MAX_LIGHTS_PER_CHUNK + 4;
-			chunkLightingDataCopyBuffer = EagRuntime.allocateByteBuffer(lightingDataLength << 2);
-			for(int i = 0; i < lightingDataLength; ++i) {
+			lightingBufferSliceLength = uboAlign(LIGHTING_BUFFER_LENGTH);
+
+			chunkLightingDataCopyBuffer = EagRuntime.allocateByteBuffer(LIGHTING_BUFFER_LENGTH);
+			for(int i = 0; i < LIGHTING_BUFFER_LENGTH; i += 4) {
 				chunkLightingDataCopyBuffer.putInt(0);
 			}
 			chunkLightingDataCopyBuffer.flip();
-			_wglBufferData(_GL_UNIFORM_BUFFER, chunkLightingDataCopyBuffer, GL_DYNAMIC_DRAW);
+			
+			buffer_chunkLightingData = _wglGenBuffers();
+			EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
+			int cnt = lightSourceBucketsWidth * lightSourceBucketsHeight * lightSourceBucketsWidth;
+			_wglBufferData(_GL_UNIFORM_BUFFER, cnt * lightingBufferSliceLength, GL_DYNAMIC_DRAW);
+			
+			buffer_chunkLightingDataZero = _wglGenBuffers();
+			EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingDataZero);
+			_wglBufferData(_GL_UNIFORM_BUFFER, chunkLightingDataCopyBuffer, GL_STATIC_DRAW);
 
 			DeferredStateManager.checkGLError("Post: rebuild pipeline: dynamic lights");
 		}
@@ -1042,6 +1069,16 @@ public class EaglerDeferredPipeline {
 		DeferredStateManager.checkGLError("Post: rebuild pipeline");
 	}
 
+	public void setRenderPosGlobal(double renderPosX, double renderPosY, double renderPosZ) {
+		if (renderPosX != currentRenderX || renderPosY != currentRenderY || renderPosZ != currentRenderZ
+				|| currentRenderPosSerial == 0) {
+			currentRenderX = renderPosX;
+			currentRenderY = renderPosY;
+			currentRenderZ = renderPosZ;
+			++currentRenderPosSerial;
+		}
+	}
+
 	public void updateReprojectionCoordinates(double worldX, double worldY, double worldZ) {
 		double distX = worldX - reprojectionOriginCoordinateX;
 		double distY = worldY - reprojectionOriginCoordinateY;
@@ -1467,7 +1504,7 @@ public class EaglerDeferredPipeline {
 		float sunKelvin = 1500.0f + (2500.0f * Math.max(-currentSunAngle.y, 0.0f));
 		float fff = mc.theWorld.getRainStrength(partialTicks);
 		float ff2 = mc.theWorld.getThunderStrength(partialTicks);
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		int dim = Minecraft.getMinecraft().theWorld.provider.getDimensionId();
 
 		// ==================== UPDATE CLOUD RENDERER ===================== //
@@ -2172,7 +2209,7 @@ public class EaglerDeferredPipeline {
 		GlStateManager.disableBlend();
 	}
 
-	public void loadLightSourceBucket(int relativeBlockX, int relativeBlockY, int relativeBlockZ) {
+	public void bindLightSourceBucket(int relativeBlockX, int relativeBlockY, int relativeBlockZ, int uboIndex) {
 		int hw = lightSourceBucketsWidth / 2;
 		int hh = lightSourceBucketsHeight / 2;
 		int bucketX = (relativeBlockX >> 4) + hw;
@@ -2180,12 +2217,51 @@ public class EaglerDeferredPipeline {
 		int bucketZ = (relativeBlockZ >> 4) + hw;
 		if(bucketX >= 0 && bucketY >= 0 && bucketZ >= 0 && bucketX < lightSourceBucketsWidth
 				&& bucketY < lightSourceBucketsHeight && bucketZ < lightSourceBucketsWidth) {
-			currentLightSourceBucket = lightSourceBuckets[bucketY * lightSourceBucketsWidth * lightSourceBucketsWidth
-					+ bucketZ * lightSourceBucketsWidth + bucketX];
+			currentLightSourceBucketId = bucketY * lightSourceBucketsWidth * lightSourceBucketsWidth
+					+ bucketZ * lightSourceBucketsWidth + bucketX;
+			currentLightSourceBucket = lightSourceBuckets[currentLightSourceBucketId];
+			int ser = currentLightSourceBucket.getEaglerSerial();
+			int max = currentLightSourceBucket.size();
+			if(max > 0) {
+				EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
+				int offset = currentLightSourceBucketId * lightingBufferSliceLength;
+				if (lightSourceBucketSerials[currentLightSourceBucketId] != ser
+						|| lightSourceRenderPosSerials[currentLightSourceBucketId] != currentRenderPosSerial) {
+					lightSourceBucketSerials[currentLightSourceBucketId] = ser;
+					lightSourceRenderPosSerials[currentLightSourceBucketId] = currentRenderPosSerial;
+					if(max > MAX_LIGHTS_PER_CHUNK) {
+						max = MAX_LIGHTS_PER_CHUNK;
+					}
+					chunkLightingDataCopyBuffer.clear();
+					chunkLightingDataCopyBuffer.putInt(max);
+					chunkLightingDataCopyBuffer.putInt(0); //padding
+					chunkLightingDataCopyBuffer.putInt(0); //padding
+					chunkLightingDataCopyBuffer.putInt(0); //padding
+					for(int i = 0; i < max; ++i) {
+						DynamicLightInstance dl = currentLightSourceBucket.get(i);
+						chunkLightingDataCopyBuffer.putFloat((float)(dl.posX - currentRenderX));
+						chunkLightingDataCopyBuffer.putFloat((float)(dl.posY - currentRenderY));
+						chunkLightingDataCopyBuffer.putFloat((float)(dl.posZ - currentRenderZ));
+						chunkLightingDataCopyBuffer.putInt(0); //padding
+						chunkLightingDataCopyBuffer.putFloat(dl.red);
+						chunkLightingDataCopyBuffer.putFloat(dl.green);
+						chunkLightingDataCopyBuffer.putFloat(dl.blue);
+						chunkLightingDataCopyBuffer.putInt(0); //padding
+					}
+					chunkLightingDataCopyBuffer.flip();
+					_wglBufferSubData(_GL_UNIFORM_BUFFER, offset, chunkLightingDataCopyBuffer);
+				}
+				EaglercraftGPU.bindUniformBufferRange(uboIndex, buffer_chunkLightingData, offset, LIGHTING_BUFFER_LENGTH);
+			}else {
+				EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingDataZero);
+				EaglercraftGPU.bindUniformBufferRange(uboIndex, buffer_chunkLightingDataZero, 0, LIGHTING_BUFFER_LENGTH);
+			}
 		}else {
+			currentLightSourceBucketId = -1;
 			currentLightSourceBucket = null;
+			EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingDataZero);
+			EaglercraftGPU.bindUniformBufferRange(uboIndex, buffer_chunkLightingDataZero, 0, LIGHTING_BUFFER_LENGTH);
 		}
-		updateLightSourceUBO();
 	}
 
 	public ListSerial<DynamicLightInstance> getLightSourceBucketRelativeChunkCoords(int cx, int cy, int cz) {
@@ -2319,65 +2395,10 @@ public class EaglerDeferredPipeline {
 		}
 	}
 
-	public void updateLightSourceUBO() {
-		if(currentLightSourceBucket == null) {
-			currentBoundLightSourceBucket = null;
-			if(isChunkLightingEnabled) {
-				isChunkLightingEnabled = false;
-				EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
-				chunkLightingDataCopyBuffer.clear();
-				chunkLightingDataCopyBuffer.putInt(0);
-				chunkLightingDataCopyBuffer.flip();
-				_wglBufferSubData(_GL_UNIFORM_BUFFER, 0, chunkLightingDataCopyBuffer);
-			}
-		}else {
-			boolean isNew;
-			if(!isChunkLightingEnabled) {
-				isChunkLightingEnabled = true;
-				isNew = true;
-			}else {
-				isNew = currentLightSourceBucket != currentBoundLightSourceBucket;
-			}
-			currentBoundLightSourceBucket = currentLightSourceBucket;
-			if(isNew || currentBoundLightSourceBucket.eaglerCheck()) {
-				populateLightSourceUBOFromBucket(currentBoundLightSourceBucket);
-				currentBoundLightSourceBucket.eaglerResetCheck();
-			}
-		}
-	}
-
 	private static final Comparator<DynamicLightInstance> comparatorLightRadius = (l1, l2) -> {
 		return l1.radius < l2.radius ? 1 : -1;
 	};
 
-	private void populateLightSourceUBOFromBucket(List<DynamicLightInstance> lights) {
-		int max = lights.size();
-		if(max > MAX_LIGHTS_PER_CHUNK) {
-			max = MAX_LIGHTS_PER_CHUNK;
-		}
-		chunkLightingDataCopyBuffer.clear();
-		chunkLightingDataCopyBuffer.putInt(max);
-		if(max > 0) {
-			chunkLightingDataCopyBuffer.putInt(0); //padding
-			chunkLightingDataCopyBuffer.putInt(0); //padding
-			chunkLightingDataCopyBuffer.putInt(0); //padding
-			for(int i = 0; i < max; ++i) {
-				DynamicLightInstance dl = lights.get(i);
-				chunkLightingDataCopyBuffer.putFloat((float)(dl.posX - currentRenderX));
-				chunkLightingDataCopyBuffer.putFloat((float)(dl.posY - currentRenderY));
-				chunkLightingDataCopyBuffer.putFloat((float)(dl.posZ - currentRenderZ));
-				chunkLightingDataCopyBuffer.putInt(0); //padding
-				chunkLightingDataCopyBuffer.putFloat(dl.red);
-				chunkLightingDataCopyBuffer.putFloat(dl.green);
-				chunkLightingDataCopyBuffer.putFloat(dl.blue);
-				chunkLightingDataCopyBuffer.putInt(0); //padding
-			}
-		}
-		chunkLightingDataCopyBuffer.flip();
-		EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
-		_wglBufferSubData(_GL_UNIFORM_BUFFER, 0, chunkLightingDataCopyBuffer);
-	}
-
 	public void beginDrawEnvMap() {
 		DeferredStateManager.checkGLError("Pre: beginDrawEnvMap()");
 		GlStateManager.enableDepth();
@@ -2797,7 +2818,7 @@ public class EaglerDeferredPipeline {
 		GlStateManager.bindTexture(realisticWaterNoiseMap);
 
 		shader_realistic_water_noise.useProgram();
-		float waveTimer = (float)((System.currentTimeMillis() % 600000l) * 0.001);
+		float waveTimer = (float)((EagRuntime.steadyTimeMillis() % 600000l) * 0.001);
 		_wglUniform4f(shader_realistic_water_noise.uniforms.u_waveTimer4f, waveTimer, 0.0f, 0.0f, 0.0f);
 
 		DrawUtils.drawStandardQuad2D();
@@ -3147,7 +3168,7 @@ public class EaglerDeferredPipeline {
 
 		// ================ DOWNSCALE AND AVERAGE LUMA =============== //
 
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		if(millis - lastExposureUpdate > 33l) {
 			if(lumaAvgDownscaleFramebuffers.length == 0) {
 				_wglBindFramebuffer(_GL_FRAMEBUFFER, exposureBlendFramebuffer);
@@ -3925,6 +3946,10 @@ public class EaglerDeferredPipeline {
 			_wglDeleteBuffers(buffer_chunkLightingData);
 			buffer_chunkLightingData = null;
 		}
+		if(buffer_chunkLightingDataZero != null) {
+			_wglDeleteBuffers(buffer_chunkLightingDataZero);
+			buffer_chunkLightingDataZero = null;
+		}
 		if(buffer_worldLightingData != null) {
 			_wglDeleteBuffers(buffer_worldLightingData);
 			buffer_worldLightingData = null;
@@ -3939,8 +3964,11 @@ public class EaglerDeferredPipeline {
 		}
 		for(int i = 0; i < lightSourceBuckets.length; ++i) {
 			lightSourceBuckets[i].clear();
+			lightSourceBucketSerials[i] = -1;
+			lightSourceRenderPosSerials[i] = -1;
 		}
 		currentLightSourceBucket = null;
+		currentLightSourceBucketId = -1;
 		currentBoundLightSourceBucket = null;
 		isChunkLightingEnabled = false;
 		for(int i = 0; i < shader_gbuffer_debug_view.length; ++i) {
@@ -3993,11 +4021,13 @@ public class EaglerDeferredPipeline {
 	}
 
 	public static final boolean isSupported() {
-		return EaglercraftGPU.checkHasHDRFramebufferSupportWithFilter();
+		return EaglercraftGPU.checkOpenGLESVersion() >= 300 && EaglercraftGPU.checkHasHDRFramebufferSupportWithFilter();
 	}
 
 	public static final String getReasonUnsupported() {
-		if(!EaglercraftGPU.checkHasHDRFramebufferSupportWithFilter()) {
+		if(EaglercraftGPU.checkOpenGLESVersion() < 300) {
+			return I18n.format("shaders.gui.unsupported.reason.oldOpenGLVersion");
+		}else if(!EaglercraftGPU.checkHasHDRFramebufferSupportWithFilter()) {
 			return I18n.format("shaders.gui.unsupported.reason.hdrFramebuffer");
 		}else {
 			return null;
@@ -4015,7 +4045,7 @@ public class EaglerDeferredPipeline {
 		GlStateManager.pushMatrix();
 		GlStateManager.matrixMode(GL_MODELVIEW);
 		GlStateManager.pushMatrix();
-		ScaledResolution scaledresolution = new ScaledResolution(mc);
+		ScaledResolution scaledresolution = mc.scaledResolution;
 		int w = scaledresolution.getScaledWidth();
 		mc.entityRenderer.setupOverlayRendering();
 		GlStateManager.enableAlpha();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardRenderCallbackHandler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardRenderCallbackHandler.java
index 5494059..c15531b 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardRenderCallbackHandler.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardRenderCallbackHandler.java
@@ -22,7 +22,7 @@ import java.util.List;
  */
 public class ForwardRenderCallbackHandler {
 
-	public final List<ShadersRenderPassFuture> renderPassList = new ArrayList(1024);
+	public final List<ShadersRenderPassFuture> renderPassList = new ArrayList<>(1024);
 
 	public void push(ShadersRenderPassFuture f) {
 		renderPassList.add(f);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java
index 3f3e924..e1cc7b1 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java
@@ -8,7 +8,6 @@ import java.io.DataInputStream;
 import java.io.IOException;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.IBufferArrayGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IBufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
@@ -20,6 +19,7 @@ import net.lax1dude.eaglercraft.v1_8.vector.Matrix3f;
 import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
 
 /**
  * Copyright (c) 2023 lax1dude. All Rights Reserved.
@@ -38,8 +38,8 @@ import net.minecraft.util.MathHelper;
  */
 public class LensFlareMeshRenderer {
 
-	public static final String streaksTextureLocation ="assets/eagler/glsl/deferred/lens_streaks.bmp";
-	public static final String ghostsTextureLocation = "assets/eagler/glsl/deferred/lens_ghosts.bmp";
+	public static final ResourceLocation streaksTextureLocation = new ResourceLocation("eagler:glsl/deferred/lens_streaks.bmp");
+	public static final ResourceLocation ghostsTextureLocation = new ResourceLocation("eagler:glsl/deferred/lens_ghosts.bmp");
 	public static final int ghostsSpriteCount = 4;
 
 	static IBufferArrayGL streaksVertexArray = null;
@@ -157,11 +157,8 @@ public class LensFlareMeshRenderer {
 
 		streaksTexture = GlStateManager.generateTexture();
 		GlStateManager.bindTexture(streaksTexture);
-		byte[] flareTex = EagRuntime.getResourceBytes(streaksTextureLocation);
-		if(flareTex == null) {
-			throw new RuntimeException("Could not locate: " + streaksTextureLocation);
-		}
-		try(DataInputStream dis = new DataInputStream(new EaglerInputStream(flareTex))) {
+		try (DataInputStream dis = new DataInputStream(
+				Minecraft.getMinecraft().getResourceManager().getResource(streaksTextureLocation).getInputStream())) {
 			loadFlareTexture(copyBuffer, dis);
 		}catch(IOException ex) {
 			EagRuntime.freeByteBuffer(copyBuffer);
@@ -170,11 +167,8 @@ public class LensFlareMeshRenderer {
 
 		ghostsTexture = GlStateManager.generateTexture();
 		GlStateManager.bindTexture(ghostsTexture);
-		flareTex = EagRuntime.getResourceBytes(ghostsTextureLocation);
-		if(flareTex == null) {
-			throw new RuntimeException("Could not locate: " + ghostsTextureLocation);
-		}
-		try(DataInputStream dis = new DataInputStream(new EaglerInputStream(flareTex))) {
+		try (DataInputStream dis = new DataInputStream(
+				Minecraft.getMinecraft().getResourceManager().getResource(ghostsTextureLocation).getInputStream())) {
 			loadFlareTexture(copyBuffer, dis);
 		}catch(IOException ex) {
 			EagRuntime.freeByteBuffer(copyBuffer);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ShaderPackInfo.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ShaderPackInfo.java
index 975b902..c781bec 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ShaderPackInfo.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ShaderPackInfo.java
@@ -52,7 +52,7 @@ public class ShaderPackInfo {
 		vers = json.optString("vers", "Unknown");
 		author = json.optString("author", "Unknown");
 		apiVers = json.optInt("api_vers", -1);
-		supportedFeatures = new HashSet();
+		supportedFeatures = new HashSet<>();
 		JSONArray features = json.getJSONArray("features");
 		if(features.length() == 0) {
 			throw new JSONException("No supported features list has been defined for this shader pack!");
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/gui/GuiShaderConfig.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/gui/GuiShaderConfig.java
index 8178b17..4d8b481 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/gui/GuiShaderConfig.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/gui/GuiShaderConfig.java
@@ -103,6 +103,11 @@ public class GuiShaderConfig extends GuiScreen {
 		listView.handleMouseInput();
 	}
 
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		listView.handleTouchInput();
+	}
+
 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 		super.mouseClicked(parInt1, parInt2, parInt3);
 		listView.mouseClicked(parInt1, parInt2, parInt3);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/gui/GuiShaderConfigList.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/gui/GuiShaderConfigList.java
index 41c4e14..72f167f 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/gui/GuiShaderConfigList.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/gui/GuiShaderConfigList.java
@@ -35,7 +35,7 @@ public class GuiShaderConfigList extends GuiListExtended {
 
 	private final GuiShaderConfig screen;
 
-	private final List<IGuiListEntry> list = new ArrayList();
+	private final List<IGuiListEntry> list = new ArrayList<>();
 
 	private static abstract class ShaderOption {
 
@@ -56,7 +56,7 @@ public class GuiShaderConfigList extends GuiListExtended {
 	}
 
 	private static List<String> loadDescription(String key) {
-		List<String> ret = new ArrayList();
+		List<String> ret = new ArrayList<>();
 		String msg;
 		int i = 0;
 		while(true) {
@@ -112,7 +112,7 @@ public class GuiShaderConfigList extends GuiListExtended {
 		this.list.add(new ListEntrySpacing());
 		this.list.add(new ListEntrySpacing());
 		this.list.add(new ListEntryHeader(I18n.format("shaders.gui.headerTier1")));
-		List<ShaderOption> opts = new ArrayList();
+		List<ShaderOption> opts = new ArrayList<>();
 		EaglerDeferredConfig conf = mcIn.gameSettings.deferredShaderConf;
 		if(conf.shaderPackInfo.WAVING_BLOCKS) {
 			opts.add(new ShaderOption(loadShaderLbl("WAVING_BLOCKS"), loadShaderDesc("WAVING_BLOCKS")) {
@@ -550,6 +550,7 @@ public class GuiShaderConfigList extends GuiListExtended {
 
 		@Override
 		public boolean mousePressed(int var1, int var2, int var3, int var4, int var5, int var6) {
+			if(var4 != 0) return false;
 			if(this.button1 != null) {
 				if(this.button1.yPosition + 15 < bottom && this.button1.yPosition + 5 > top) {
 					if(this.button1.mousePressed(mc, var2, var3)) {
@@ -610,7 +611,7 @@ public class GuiShaderConfigList extends GuiListExtended {
 	}
 
 	private void renderTooltip(int x, int y, int width, List<String> msg) {
-		ArrayList tooltipList = new ArrayList(msg.size() * 2);
+		List<String> tooltipList = new ArrayList<>(msg.size() * 2);
 		for(int i = 0, l = msg.size(); i < l; ++i) {
 			String s = msg.get(i);
 			if(s.length() > 0) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderAccelParticleForward.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderAccelParticleForward.java
index 6856eb9..330a71a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderAccelParticleForward.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderAccelParticleForward.java
@@ -32,7 +32,7 @@ public class PipelineShaderAccelParticleForward extends ShaderProgram<PipelineSh
 				ShaderSource.accel_particle_vsh, "COMPILE_FORWARD_VSH");
 		IShaderGL accelParticleFSH = null;
 		try {
-			List<String> lst = new ArrayList(2);
+			List<String> lst = new ArrayList<>(2);
 			if(dynamicLights) {
 				lst.add("COMPILE_DYNAMIC_LIGHTS");
 			}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderGBufferCombine.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderGBufferCombine.java
index cf9936f..c2298b4 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderGBufferCombine.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderGBufferCombine.java
@@ -30,7 +30,7 @@ public class PipelineShaderGBufferCombine extends ShaderProgram<PipelineShaderGB
 
 	public static PipelineShaderGBufferCombine compile(boolean ssao, boolean env, boolean ssr) throws ShaderException {
 		IShaderGL coreGBuffer = null;
-		List<String> compileFlags = new ArrayList(2);
+		List<String> compileFlags = new ArrayList<>(2);
 		if(ssao) {
 			compileFlags.add("COMPILE_GLOBAL_AMBIENT_OCCLUSION");
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderGBufferFog.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderGBufferFog.java
index bcc4e5a..0bc103a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderGBufferFog.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderGBufferFog.java
@@ -28,7 +28,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.IUniformGL;
 public class PipelineShaderGBufferFog extends ShaderProgram<PipelineShaderGBufferFog.Uniforms> {
 
 	public static PipelineShaderGBufferFog compile(boolean linear, boolean atmosphere, boolean lightShafts) {
-		List<String> macros = new ArrayList(3);
+		List<String> macros = new ArrayList<>(3);
 		if(linear) {
 			macros.add("COMPILE_FOG_LINEAR");
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderLightingPoint.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderLightingPoint.java
index 2dd1e45..2488f62 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderLightingPoint.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderLightingPoint.java
@@ -29,7 +29,7 @@ public class PipelineShaderLightingPoint extends ShaderProgram<PipelineShaderLig
 
 	public static PipelineShaderLightingPoint compile(boolean shadows)
 			throws ShaderException {
-		List<String> compileFlags = new ArrayList(2);
+		List<String> compileFlags = new ArrayList<>(2);
 		if(shadows) {
 			compileFlags.add("COMPILE_PARABOLOID_SHADOW");
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderLightingSun.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderLightingSun.java
index 34125b8..e0339a1 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderLightingSun.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderLightingSun.java
@@ -29,7 +29,7 @@ public class PipelineShaderLightingSun extends ShaderProgram<PipelineShaderLight
 
 	public static PipelineShaderLightingSun compile(int shadowsSun, boolean coloredShadows) throws ShaderException {
 		IShaderGL sunShader = null;
-		List<String> compileFlags = new ArrayList(1);
+		List<String> compileFlags = new ArrayList<>(1);
 		if(shadowsSun > 0) {
 			compileFlags.add("COMPILE_SUN_SHADOW");
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderPostExposureAvg.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderPostExposureAvg.java
index eb97b90..04ec03a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderPostExposureAvg.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderPostExposureAvg.java
@@ -28,7 +28,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.IUniformGL;
 public class PipelineShaderPostExposureAvg extends ShaderProgram<PipelineShaderPostExposureAvg.Uniforms> {
 
 	public static PipelineShaderPostExposureAvg compile(boolean luma) throws ShaderException {
-		List<String> compileFlags = new ArrayList(1);
+		List<String> compileFlags = new ArrayList<>(1);
 		if(luma) {
 			compileFlags.add("CALCULATE_LUMINANCE");
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderReprojControl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderReprojControl.java
index c924217..fc549e3 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderReprojControl.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderReprojControl.java
@@ -28,7 +28,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.IUniformGL;
 public class PipelineShaderReprojControl extends ShaderProgram<PipelineShaderReprojControl.Uniforms> {
 
 	public static PipelineShaderReprojControl compile(boolean ssao, boolean ssr) throws ShaderException {
-		List<String> compileFlags = new ArrayList(2);
+		List<String> compileFlags = new ArrayList<>(2);
 		if(ssao) {
 			compileFlags.add("COMPILE_REPROJECT_SSAO");
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderShadowsSun.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderShadowsSun.java
index 5cfe49b..1851932 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderShadowsSun.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderShadowsSun.java
@@ -30,7 +30,7 @@ public class PipelineShaderShadowsSun extends ShaderProgram<PipelineShaderShadow
 	public static PipelineShaderShadowsSun compile(int shadowsSun, boolean shadowsSunSmooth, boolean coloredShadows)
 			throws ShaderException {
 		IShaderGL shadowShader = null;
-		List<String> compileFlags = new ArrayList(2);
+		List<String> compileFlags = new ArrayList<>(2);
 		if(shadowsSun == 0) {
 			throw new IllegalStateException("Enable shadows to compile this shader");
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderSkyboxRender.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderSkyboxRender.java
index ce72382..1c22143 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderSkyboxRender.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/PipelineShaderSkyboxRender.java
@@ -28,7 +28,7 @@ import java.util.List;
 public class PipelineShaderSkyboxRender extends ShaderProgram<PipelineShaderSkyboxRender.Uniforms> {
 
 	public static PipelineShaderSkyboxRender compile(boolean paraboloid, boolean clouds) throws ShaderException {
-		List<String> compileFlags = new ArrayList();
+		List<String> compileFlags = new ArrayList<>();
 		if(paraboloid) {
 			compileFlags.add("COMPILE_PARABOLOID_SKY");
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/ShaderCompiler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/ShaderCompiler.java
index 26ea37d..5f0d324 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/ShaderCompiler.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/ShaderCompiler.java
@@ -10,7 +10,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.IProgramGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IShaderGL;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader;
+import net.lax1dude.eaglercraft.v1_8.opengl.GLSLHeader;
 import net.minecraft.util.ResourceLocation;
 
 /**
@@ -47,7 +47,7 @@ public class ShaderCompiler {
 	public static IShaderGL compileShader(String name, int stage, String filename, String source, List<String> compileFlags) throws ShaderCompileException {
 		logger.info("Compiling Shader: " + filename);
 		StringBuilder srcCat = new StringBuilder();
-		srcCat.append(FixedFunctionShader.FixedFunctionConstants.VERSION).append('\n');
+		srcCat.append(GLSLHeader.getHeader()).append('\n');
 		
 		if(compileFlags != null && compileFlags.size() > 0) {
 			for(int i = 0, l = compileFlags.size(); i < l; ++i) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/ShaderSource.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/ShaderSource.java
index ef8c496..c0fa936 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/ShaderSource.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/program/ShaderSource.java
@@ -97,7 +97,7 @@ public class ShaderSource {
 	public static final ResourceLocation accel_particle_dynamiclights_vsh = new ResourceLocation("eagler:glsl/dynamiclights/accel_particle_dynamiclights.vsh");
 	public static final ResourceLocation accel_particle_dynamiclights_fsh = new ResourceLocation("eagler:glsl/dynamiclights/accel_particle_dynamiclights.fsh");
 
-	private static final Map<ResourceLocation, String> sourceCache = new HashMap();
+	private static final Map<ResourceLocation, String> sourceCache = new HashMap<>();
 
 	private static boolean isHighP = false;
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EaglerTextureAtlasSpritePBR.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EaglerTextureAtlasSpritePBR.java
index d23fae5..9032dfd 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EaglerTextureAtlasSpritePBR.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EaglerTextureAtlasSpritePBR.java
@@ -1,7 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -121,7 +120,7 @@ public class EaglerTextureAtlasSpritePBR extends EaglerTextureAtlasSprite {
 
 				this.animationMetadata = meta;
 			} else {
-				ArrayList arraylist = Lists.newArrayList();
+				List<AnimationFrame> arraylist = Lists.newArrayList();
 
 				for (int l1 = 0; l1 < j1; ++l1) {
 					this.frameTextureDataPBR[0].add(getFrameTextureData(aint[0], k1, l, l1));
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EmissiveItems.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EmissiveItems.java
index 2eeac37..d07cef4 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EmissiveItems.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EmissiveItems.java
@@ -34,7 +34,7 @@ public class EmissiveItems implements IResourceManagerReloadListener {
 
 	private static final Logger logger = LogManager.getLogger("EmissiveItemsCSV");
 
-	private static final Map<String,float[]> entries = new HashMap();
+	private static final Map<String,float[]> entries = new HashMap<>();
 
 	public static float[] getItemEmission(ItemStack itemStack) {
 		return getItemEmission(itemStack.getItem(), itemStack.getItemDamage());
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/PBRMaterialConstants.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/PBRMaterialConstants.java
index f43d6c8..8096586 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/PBRMaterialConstants.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/PBRMaterialConstants.java
@@ -34,7 +34,7 @@ public class PBRMaterialConstants implements IResourceManagerReloadListener {
 	public static final Logger logger = LogManager.getLogger("PBRMaterialConstants");
 
 	public final ResourceLocation resourceLocation;
-	public final Map<String,Integer> spriteNameToMaterialConstants = new HashMap();
+	public final Map<String,Integer> spriteNameToMaterialConstants = new HashMap<>();
 
 	public int defaultMaterial = 0x00000A77;
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightBucketLoader.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightBucketLoader.java
index 9e77655..2ebc802 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightBucketLoader.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightBucketLoader.java
@@ -34,14 +34,19 @@ import net.minecraft.util.MathHelper;
 public class DynamicLightBucketLoader {
 
 	public IBufferGL buffer_chunkLightingData;
+	public IBufferGL buffer_chunkLightingDataZero;
 	private ByteBuffer chunkLightingDataCopyBuffer;
-	private boolean isChunkLightingEnabled = false;
 	public ListSerial<DynamicLightInstance> currentBoundLightSourceBucket;
 
 	public final ListSerial<DynamicLightInstance>[] lightSourceBuckets;
+	private final int[] lightSourceBucketsSerials;
+	private final int[] lightSourceRenderPosSerials;
 	public ListSerial<DynamicLightInstance> currentLightSourceBucket;
+	private int currentLightSourceBucketId = -1;
+	private int lightingBufferSliceLength = -1;
 
 	public static final int MAX_LIGHTS_PER_CHUNK = 12;
+	public static final int LIGHTING_BUFFER_LENGTH = 16 * MAX_LIGHTS_PER_CHUNK + 16;
 
 	private final int lightSourceBucketsWidth;
 	private final int lightSourceBucketsHeight;
@@ -49,29 +54,42 @@ public class DynamicLightBucketLoader {
 	private double currentRenderX = 0.0;
 	private double currentRenderY = 0.0;
 	private double currentRenderZ = 0.0;
+	private int currentRenderPosSerial = 0;
 
 	public DynamicLightBucketLoader() {
 		this.lightSourceBucketsWidth = 5;
 		this.lightSourceBucketsHeight = 3;
 		int cnt = 5 * 3 * 5;
 		this.lightSourceBuckets = new ListSerial[cnt];
+		this.lightSourceBucketsSerials = new int[cnt];
+		this.lightSourceRenderPosSerials = new int[cnt];
 	}
 
 	public void initialize() {
 		destroy();
 		
-		buffer_chunkLightingData = _wglGenBuffers();
-		EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
-		int lightingDataLength = 4 * MAX_LIGHTS_PER_CHUNK + 4;
-		chunkLightingDataCopyBuffer = EagRuntime.allocateByteBuffer(lightingDataLength << 2);
-		for(int i = 0; i < lightingDataLength; ++i) {
+		int alignment = EaglercraftGPU.getUniformBufferOffsetAlignment();
+		lightingBufferSliceLength = MathHelper.ceiling_float_int((float)LIGHTING_BUFFER_LENGTH / (float)alignment) * alignment;
+		
+		chunkLightingDataCopyBuffer = EagRuntime.allocateByteBuffer(LIGHTING_BUFFER_LENGTH);
+		for(int i = 0; i < LIGHTING_BUFFER_LENGTH; i += 4) {
 			chunkLightingDataCopyBuffer.putInt(0);
 		}
 		chunkLightingDataCopyBuffer.flip();
-		_wglBufferData(_GL_UNIFORM_BUFFER, chunkLightingDataCopyBuffer, GL_DYNAMIC_DRAW);
+		
+		buffer_chunkLightingData = _wglGenBuffers();
+		EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
+		int cnt = lightSourceBucketsWidth * lightSourceBucketsHeight * lightSourceBucketsWidth;
+		_wglBufferData(_GL_UNIFORM_BUFFER, cnt * lightingBufferSliceLength, GL_DYNAMIC_DRAW);
+		
+		buffer_chunkLightingDataZero = _wglGenBuffers();
+		EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingDataZero);
+		_wglBufferData(_GL_UNIFORM_BUFFER, chunkLightingDataCopyBuffer, GL_STATIC_DRAW);
 		
 		for(int i = 0; i < this.lightSourceBuckets.length; ++i) {
-			this.lightSourceBuckets[i] = new ArrayListSerial(16);
+			this.lightSourceBuckets[i] = new ArrayListSerial<>(16);
+			this.lightSourceBucketsSerials[i] = -1;
+			this.lightSourceRenderPosSerials[i] = -1;
 		}
 	}
 
@@ -81,7 +99,7 @@ public class DynamicLightBucketLoader {
 		}
 	}
 
-	public void loadLightSourceBucket(int relativeBlockX, int relativeBlockY, int relativeBlockZ) {
+	public void bindLightSourceBucket(int relativeBlockX, int relativeBlockY, int relativeBlockZ, int uboIndex) {
 		int hw = lightSourceBucketsWidth / 2;
 		int hh = lightSourceBucketsHeight / 2;
 		int bucketX = (relativeBlockX >> 4) + hw;
@@ -89,12 +107,47 @@ public class DynamicLightBucketLoader {
 		int bucketZ = (relativeBlockZ >> 4) + hw;
 		if(bucketX >= 0 && bucketY >= 0 && bucketZ >= 0 && bucketX < lightSourceBucketsWidth
 				&& bucketY < lightSourceBucketsHeight && bucketZ < lightSourceBucketsWidth) {
-			currentLightSourceBucket = lightSourceBuckets[bucketY * lightSourceBucketsWidth * lightSourceBucketsWidth
-					+ bucketZ * lightSourceBucketsWidth + bucketX];
+			currentLightSourceBucketId = bucketY * lightSourceBucketsWidth * lightSourceBucketsWidth
+					+ bucketZ * lightSourceBucketsWidth + bucketX;
+			currentLightSourceBucket = lightSourceBuckets[currentLightSourceBucketId];
+			int ser = currentLightSourceBucket.getEaglerSerial();
+			int max = currentLightSourceBucket.size();
+			if(max > 0) {
+				EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
+				int offset = currentLightSourceBucketId * lightingBufferSliceLength;
+				if (lightSourceBucketsSerials[currentLightSourceBucketId] != ser
+						|| lightSourceRenderPosSerials[currentLightSourceBucketId] != currentRenderPosSerial) {
+					lightSourceBucketsSerials[currentLightSourceBucketId] = ser;
+					lightSourceRenderPosSerials[currentLightSourceBucketId] = currentRenderPosSerial;
+					if(max > MAX_LIGHTS_PER_CHUNK) {
+						max = MAX_LIGHTS_PER_CHUNK;
+					}
+					chunkLightingDataCopyBuffer.clear();
+					chunkLightingDataCopyBuffer.putInt(max);
+					chunkLightingDataCopyBuffer.putInt(0); //padding
+					chunkLightingDataCopyBuffer.putInt(0); //padding
+					chunkLightingDataCopyBuffer.putInt(0); //padding
+					for(int i = 0; i < max; ++i) {
+						DynamicLightInstance dl = currentLightSourceBucket.get(i);
+						chunkLightingDataCopyBuffer.putFloat((float)(dl.posX - currentRenderX));
+						chunkLightingDataCopyBuffer.putFloat((float)(dl.posY - currentRenderY));
+						chunkLightingDataCopyBuffer.putFloat((float)(dl.posZ - currentRenderZ));
+						chunkLightingDataCopyBuffer.putFloat(dl.radius);
+					}
+					chunkLightingDataCopyBuffer.flip();
+					_wglBufferSubData(_GL_UNIFORM_BUFFER, offset, chunkLightingDataCopyBuffer);
+				}
+				EaglercraftGPU.bindUniformBufferRange(uboIndex, buffer_chunkLightingData, offset, LIGHTING_BUFFER_LENGTH);
+			}else {
+				EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingDataZero);
+				EaglercraftGPU.bindUniformBufferRange(uboIndex, buffer_chunkLightingDataZero, 0, LIGHTING_BUFFER_LENGTH);
+			}
 		}else {
+			currentLightSourceBucketId = -1;
 			currentLightSourceBucket = null;
+			EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingDataZero);
+			EaglercraftGPU.bindUniformBufferRange(uboIndex, buffer_chunkLightingDataZero, 0, LIGHTING_BUFFER_LENGTH);
 		}
-		updateLightSourceUBO();
 	}
 
 	public ListSerial<DynamicLightInstance> getLightSourceBucketRelativeChunkCoords(int cx, int cy, int cz) {
@@ -188,8 +241,8 @@ public class DynamicLightBucketLoader {
 	}
 
 	public void truncateOverflowingBuffers() {
-		for(int i = 0; i < this.lightSourceBuckets.length; ++i) {
-			List<DynamicLightInstance> lst = this.lightSourceBuckets[i];
+		for(int i = 0; i < lightSourceBuckets.length; ++i) {
+			List<DynamicLightInstance> lst = lightSourceBuckets[i];
 			int k = lst.size();
 			if(k > MAX_LIGHTS_PER_CHUNK) {
 				lst.sort(comparatorLightRadius);
@@ -200,74 +253,18 @@ public class DynamicLightBucketLoader {
 		}
 	}
 
-	public void updateLightSourceUBO() {
-		if(currentLightSourceBucket == null) {
-			currentBoundLightSourceBucket = null;
-			if(isChunkLightingEnabled) {
-				isChunkLightingEnabled = false;
-				EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
-				chunkLightingDataCopyBuffer.clear();
-				chunkLightingDataCopyBuffer.putInt(0);
-				chunkLightingDataCopyBuffer.flip();
-				_wglBufferSubData(_GL_UNIFORM_BUFFER, 0, chunkLightingDataCopyBuffer);
-			}
-		}else {
-			boolean isNew;
-			if(!isChunkLightingEnabled) {
-				isChunkLightingEnabled = true;
-				isNew = true;
-			}else {
-				isNew = currentLightSourceBucket != currentBoundLightSourceBucket;
-			}
-			currentBoundLightSourceBucket = currentLightSourceBucket;
-			if(isNew || currentBoundLightSourceBucket.eaglerCheck()) {
-				populateLightSourceUBOFromBucket(currentBoundLightSourceBucket);
-				currentBoundLightSourceBucket.eaglerResetCheck();
-			}
-		}
-	}
-
 	private static final Comparator<DynamicLightInstance> comparatorLightRadius = (l1, l2) -> {
 		return l1.radius < l2.radius ? 1 : -1;
 	};
 
-	private void populateLightSourceUBOFromBucket(List<DynamicLightInstance> lights) {
-		int max = lights.size();
-		if(max > MAX_LIGHTS_PER_CHUNK) {
-			//tmpListLights.clear();
-			//tmpListLights.addAll(lights);
-			//lights = tmpListLights;
-			//lights.sort(comparatorLightRadius);
-			max = MAX_LIGHTS_PER_CHUNK;
-		}
-		chunkLightingDataCopyBuffer.clear();
-		chunkLightingDataCopyBuffer.putInt(max);
-		if(max > 0) {
-			chunkLightingDataCopyBuffer.putInt(0); //padding
-			chunkLightingDataCopyBuffer.putInt(0); //padding
-			chunkLightingDataCopyBuffer.putInt(0); //padding
-			for(int i = 0; i < max; ++i) {
-				DynamicLightInstance dl = lights.get(i);
-				chunkLightingDataCopyBuffer.putFloat((float)(dl.posX - currentRenderX));
-				chunkLightingDataCopyBuffer.putFloat((float)(dl.posY - currentRenderY));
-				chunkLightingDataCopyBuffer.putFloat((float)(dl.posZ - currentRenderZ));
-				chunkLightingDataCopyBuffer.putFloat(dl.radius);
-			}
-		}
-		chunkLightingDataCopyBuffer.flip();
-		EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
-		_wglBufferSubData(_GL_UNIFORM_BUFFER, 0, chunkLightingDataCopyBuffer);
-	}
-
 	public void setRenderPos(double currentRenderX, double currentRenderY, double currentRenderZ) {
-		this.currentRenderX = currentRenderX;
-		this.currentRenderY = currentRenderY;
-		this.currentRenderZ = currentRenderZ;
-	}
-
-	public void bindUniformBuffer(int index) {
-		EaglercraftGPU.bindGLUniformBuffer(buffer_chunkLightingData);
-		EaglercraftGPU.bindUniformBufferRange(index, buffer_chunkLightingData, 0, chunkLightingDataCopyBuffer.capacity());
+		if (this.currentRenderX != currentRenderX || this.currentRenderY != currentRenderY
+				|| this.currentRenderZ != currentRenderZ || this.currentRenderPosSerial == 0) {
+			this.currentRenderX = currentRenderX;
+			this.currentRenderY = currentRenderY;
+			this.currentRenderZ = currentRenderZ;
+			++this.currentRenderPosSerial;
+		}
 	}
 
 	public void destroy() {
@@ -279,8 +276,16 @@ public class DynamicLightBucketLoader {
 			_wglDeleteBuffers(buffer_chunkLightingData);
 			buffer_chunkLightingData = null;
 		}
-		for(int i = 0; i < this.lightSourceBuckets.length; ++i) {
-			this.lightSourceBuckets[i] = null;
+		if(buffer_chunkLightingDataZero != null) {
+			_wglDeleteBuffers(buffer_chunkLightingDataZero);
+			buffer_chunkLightingDataZero = null;
 		}
+		for(int i = 0; i < lightSourceBuckets.length; ++i) {
+			lightSourceBuckets[i] = null;
+			lightSourceBucketsSerials[i] = -1;
+			lightSourceRenderPosSerials[i] = -1;
+		}
+		currentLightSourceBucket = null;
+		currentLightSourceBucketId = -1;
 	}
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsStateManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsStateManager.java
index d253c51..aee2f0f 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsStateManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsStateManager.java
@@ -5,6 +5,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionPipeline;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f;
@@ -30,10 +32,10 @@ import net.minecraft.util.MathHelper;
 public class DynamicLightsStateManager {
 
 	static final DynamicLightsPipelineCompiler deferredExtPipeline = new DynamicLightsPipelineCompiler();
-	private static List<DynamicLightInstance> lightInstancePool = new ArrayList();
+	private static List<DynamicLightInstance> lightInstancePool = new ArrayList<>();
 	private static int instancePoolIndex = 0;
 	private static int maxListLengthTracker = 0;
-	static final List<DynamicLightInstance> lightRenderList = new LinkedList();
+	static final List<DynamicLightInstance> lightRenderList = new LinkedList<>();
 	static final Matrix4f inverseViewMatrix = new Matrix4f();
 	static int inverseViewMatrixSerial = 0;
 	static DynamicLightBucketLoader bucketLoader = null;
@@ -45,7 +47,7 @@ public class DynamicLightsStateManager {
 		if(bucketLoader == null) {
 			bucketLoader = new DynamicLightBucketLoader();
 			bucketLoader.initialize();
-			bucketLoader.bindUniformBuffer(0);
+			bucketLoader.bindLightSourceBucket(-999, -999, -999, 0);
 			FixedFunctionPipeline.loadExtensionPipeline(deferredExtPipeline);
 		}
 		if(accelParticleRenderer == null) {
@@ -89,7 +91,7 @@ public class DynamicLightsStateManager {
 
 	public static final void reportForwardRenderObjectPosition(int centerX, int centerY, int centerZ) {
 		if(bucketLoader != null) {
-			bucketLoader.loadLightSourceBucket(centerX, centerY, centerZ);
+			bucketLoader.bindLightSourceBucket(centerX, centerY, centerZ, 0);
 		}
 	}
 
@@ -98,7 +100,7 @@ public class DynamicLightsStateManager {
 			float posX = (float)((x + TileEntityRendererDispatcher.staticPlayerX) - (MathHelper.floor_double(TileEntityRendererDispatcher.staticPlayerX / 16.0) << 4));
 			float posY = (float)((y + TileEntityRendererDispatcher.staticPlayerY) - (MathHelper.floor_double(TileEntityRendererDispatcher.staticPlayerY / 16.0) << 4));
 			float posZ = (float)((z + TileEntityRendererDispatcher.staticPlayerZ) - (MathHelper.floor_double(TileEntityRendererDispatcher.staticPlayerZ / 16.0) << 4));
-			bucketLoader.loadLightSourceBucket((int)posX, (int)posY, (int)posZ);
+			bucketLoader.bindLightSourceBucket((int)posX, (int)posY, (int)posZ, 0);
 		}
 	}
 
@@ -152,11 +154,11 @@ public class DynamicLightsStateManager {
 	}
 
 	private static final void updateTimers() {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		if(millis - lastTick > 5000l) {
 			lastTick = millis;
 			if(maxListLengthTracker < (lightInstancePool.size() >> 1)) {
-				List<DynamicLightInstance> newPool = new ArrayList(Math.max(maxListLengthTracker, 16));
+				List<DynamicLightInstance> newPool = new ArrayList<>(Math.max(maxListLengthTracker, 16));
 				for(int i = 0; i < maxListLengthTracker; ++i) {
 					newPool.add(lightInstancePool.get(i));
 				}
@@ -167,11 +169,15 @@ public class DynamicLightsStateManager {
 	}
 
 	public static final void destroyAll() {
-		lightInstancePool = new ArrayList();
+		lightInstancePool = new ArrayList<>();
 	}
 
 	public static String getF3String() {
 		return "DynamicLightsTotal: " + lastTotal;
 	}
 
+	public static boolean isSupported() {
+		return EaglercraftGPU.checkOpenGLESVersion() >= 300;
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profanity_filter/GuiScreenContentWarning.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profanity_filter/GuiScreenContentWarning.java
new file mode 100755
index 0000000..efb2636
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profanity_filter/GuiScreenContentWarning.java
@@ -0,0 +1,63 @@
+package net.lax1dude.eaglercraft.v1_8.profanity_filter;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.EnumChatFormatting;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenContentWarning extends GuiScreen {
+
+	private final GuiScreen cont;
+	private boolean enableState;
+	private GuiButton optButton;
+
+	public GuiScreenContentWarning(GuiScreen cont) {
+		this.cont = cont;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		enableState = mc.gameSettings.enableProfanityFilter;
+		this.buttonList.add(optButton = new GuiButton(1, this.width / 2 - 100, this.height / 6 + 108, I18n.format("options.profanityFilterButton") + ": " + I18n.format(enableState ? "gui.yes" : "gui.no")));
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 138, I18n.format("gui.done")));
+	}
+
+	@Override
+	protected void actionPerformed(GuiButton parGuiButton) {
+		if(parGuiButton.id == 0) {
+			mc.gameSettings.enableProfanityFilter = enableState;
+			mc.gameSettings.hasShownProfanityFilter = true;
+			mc.gameSettings.saveOptions();
+			mc.displayGuiScreen(cont);
+		}else if(parGuiButton.id == 1) {
+			enableState = !enableState;
+			optButton.displayString = I18n.format("options.profanityFilterButton") + ": " + I18n.format(enableState ? "gui.yes" : "gui.no");
+		}
+	}
+
+	public void drawScreen(int mx, int my, float pt) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, EnumChatFormatting.BOLD + I18n.format("profanityFilterWarning.title"), this.width / 2, 50, 0xFF4444);
+		this.drawCenteredString(fontRendererObj, I18n.format("profanityFilterWarning.text0"), this.width / 2, 70, 16777215);
+		this.drawCenteredString(fontRendererObj, I18n.format("profanityFilterWarning.text1"), this.width / 2, 82, 16777215);
+		this.drawCenteredString(fontRendererObj, I18n.format("profanityFilterWarning.text2"), this.width / 2, 94, 16777215);
+		this.drawCenteredString(fontRendererObj, I18n.format("profanityFilterWarning.text4"), this.width / 2, 116, 0xCCCCCC);
+		super.drawScreen(mx, my, pt);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profanity_filter/LookAlikeUnicodeConv.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profanity_filter/LookAlikeUnicodeConv.java
new file mode 100755
index 0000000..b2fd8af
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profanity_filter/LookAlikeUnicodeConv.java
@@ -0,0 +1,1028 @@
+package net.lax1dude.eaglercraft.v1_8.profanity_filter;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class LookAlikeUnicodeConv {
+
+	public static String convertString(String stringIn) {
+		char[] ret = null;
+		char c1, c2;
+		for(int i = 0, l = stringIn.length(); i < l; ++i) {
+			c1 = stringIn.charAt(i);
+			c2 = convertChar(c1);
+			if(c2 != 0) {
+				if(ret == null) {
+					ret = stringIn.toCharArray();
+				}
+				ret[i] = c2;
+			}
+		}
+		return ret != null ? new String(ret) : stringIn;
+	}
+
+	public static char convertChar(char charIn) {
+		switch (charIn) {
+		case 9313:
+		case 9333:
+		case 65298:
+			return '2';
+		case 9315:
+		case 9335:
+		case 65300:
+			return '4';
+		case 9316:
+		case 9336:
+		case 65301:
+			return '5';
+		case 9317:
+		case 9337:
+		case 65302:
+			return '6';
+		case 9319:
+		case 9339:
+		case 65304:
+			return '8';
+		case 9320:
+		case 9340:
+		case 65305:
+			return '9';
+		case 192:
+		case 193:
+		case 194:
+		case 195:
+		case 196:
+		case 197:
+		case 256:
+		case 258:
+		case 260:
+		case 461:
+		case 478:
+		case 480:
+		case 506:
+		case 512:
+		case 514:
+		case 550:
+		case 570:
+		case 913:
+		case 1040:
+		case 1232:
+		case 1234:
+		case 7680:
+		case 7840:
+		case 7842:
+		case 7844:
+		case 7846:
+		case 7848:
+		case 7850:
+		case 7852:
+		case 7854:
+		case 7856:
+		case 7858:
+		case 7860:
+		case 7862:
+		case 7944:
+		case 7945:
+		case 7946:
+		case 7947:
+		case 7948:
+		case 7949:
+		case 7950:
+		case 7951:
+		case 8072:
+		case 8073:
+		case 8074:
+		case 8075:
+		case 8076:
+		case 8077:
+		case 8078:
+		case 8079:
+		case 8120:
+		case 8121:
+		case 8122:
+		case 8123:
+		case 8124:
+		case 9424:
+		case 65313:
+			return 'A';
+		case 385:
+		case 386:
+		case 579:
+		case 914:
+		case 1042:
+		case 7682:
+		case 7684:
+		case 7686:
+		case 9425:
+		case 65314:
+			return 'B';
+		case 199:
+		case 262:
+		case 264:
+		case 266:
+		case 268:
+		case 391:
+		case 571:
+		case 1057:
+		case 1194:
+		case 7688:
+		case 9426:
+		case 65315:
+			return 'C';
+		case 270:
+		case 272:
+		case 393:
+		case 394:
+		case 7690:
+		case 7692:
+		case 7694:
+		case 7696:
+		case 7698:
+		case 9427:
+		case 65316:
+			return 'D';
+		case 200:
+		case 201:
+		case 202:
+		case 203:
+		case 274:
+		case 276:
+		case 278:
+		case 280:
+		case 282:
+		case 516:
+		case 518:
+		case 552:
+		case 582:
+		case 904:
+		case 917:
+		case 7700:
+		case 7702:
+		case 7704:
+		case 7706:
+		case 7708:
+		case 7864:
+		case 7866:
+		case 7868:
+		case 7870:
+		case 7872:
+		case 7874:
+		case 7876:
+		case 7878:
+		case 7960:
+		case 7961:
+		case 7962:
+		case 7963:
+		case 7964:
+		case 7965:
+		case 8136:
+		case 8137:
+		case 9428:
+		case 65317:
+			return 'E';
+		case 401:
+		case 7710:
+		case 9429:
+		case 65318:
+			return 'F';
+		case 284:
+		case 286:
+		case 288:
+		case 290:
+		case 403:
+		case 484:
+		case 486:
+		case 500:
+		case 7712:
+		case 9430:
+		case 65319:
+			return 'G';
+		case 292:
+		case 294:
+		case 542:
+		case 7714:
+		case 7716:
+		case 7718:
+		case 7720:
+		case 7722:
+		case 7976:
+		case 7977:
+		case 7978:
+		case 7979:
+		case 7980:
+		case 7981:
+		case 7982:
+		case 7983:
+		case 9431:
+		case 65320:
+			return 'H';
+		case 204:
+		case 205:
+		case 206:
+		case 207:
+		case 296:
+		case 298:
+		case 300:
+		case 302:
+		case 304:
+		case 406:
+		case 407:
+		case 463:
+		case 520:
+		case 522:
+		case 906:
+		case 921:
+		case 938:
+		case 1030:
+		case 7724:
+		case 7726:
+		case 7880:
+		case 7882:
+		case 7992:
+		case 7993:
+		case 7994:
+		case 7995:
+		case 7996:
+		case 7997:
+		case 7998:
+		case 7999:
+		case 9432:
+		case 65321:
+			return 'I';
+		case 308:
+		case 584:
+		case 1032:
+		case 9433:
+		case 65322:
+			return 'J';
+		case 310:
+		case 408:
+		case 488:
+		case 922:
+		case 1036:
+		case 1050:
+		case 1178:
+		case 1180:
+		case 1182:
+		case 7728:
+		case 7730:
+		case 7732:
+		case 9434:
+		case 65323:
+			return 'K';
+		case 313:
+		case 315:
+		case 317:
+		case 319:
+		case 321:
+		case 573:
+		case 7734:
+		case 7736:
+		case 7738:
+		case 7740:
+		case 9435:
+		case 65324:
+			return 'L';
+		case 924:
+		case 7742:
+		case 7744:
+		case 7746:
+		case 9436:
+		case 65325:
+			return 'M';
+		case 209:
+		case 323:
+		case 325:
+		case 327:
+		case 413:
+		case 504:
+		case 544:
+		case 925:
+		case 7748:
+		case 7750:
+		case 7752:
+		case 7754:
+		case 9437:
+		case 65326:
+			return 'N';
+		case 48:
+		case 210:
+		case 211:
+		case 212:
+		case 213:
+		case 214:
+		case 332:
+		case 334:
+		case 336:
+		case 416:
+		case 465:
+		case 490:
+		case 492:
+		case 510:
+		case 524:
+		case 526:
+		case 554:
+		case 556:
+		case 558:
+		case 560:
+		case 908:
+		case 927:
+		case 1054:
+		case 1254:
+		case 7756:
+		case 7758:
+		case 7760:
+		case 7762:
+		case 7884:
+		case 7886:
+		case 7888:
+		case 7890:
+		case 7892:
+		case 7894:
+		case 7896:
+		case 7898:
+		case 7900:
+		case 7902:
+		case 7904:
+		case 7906:
+		case 8008:
+		case 8009:
+		case 8010:
+		case 8011:
+		case 8012:
+		case 8013:
+		case 8184:
+		case 8185:
+		case 9438:
+		case 65296:
+		case 65327:
+			return 'O';
+		case 420:
+		case 929:
+		case 7764:
+		case 7766:
+		case 8172:
+		case 9439:
+		case 65328:
+			return 'P';
+		case 9440:
+		case 65329:
+			return 'Q';
+		case 340:
+		case 342:
+		case 344:
+		case 528:
+		case 530:
+		case 588:
+		case 7768:
+		case 7770:
+		case 7772:
+		case 7774:
+		case 9441:
+		case 65330:
+			return 'R';
+		case 36:
+		case 346:
+		case 348:
+		case 350:
+		case 352:
+		case 536:
+		case 1029:
+		case 7776:
+		case 7778:
+		case 7780:
+		case 7782:
+		case 7784:
+		case 9442:
+		case 65331:
+			return 'S';
+		case 354:
+		case 356:
+		case 358:
+		case 428:
+		case 430:
+		case 538:
+		case 574:
+		case 932:
+		case 7786:
+		case 7788:
+		case 7790:
+		case 7792:
+		case 9443:
+		case 65332:
+			return 'T';
+		case 217:
+		case 218:
+		case 219:
+		case 220:
+		case 360:
+		case 362:
+		case 364:
+		case 366:
+		case 368:
+		case 370:
+		case 431:
+		case 467:
+		case 469:
+		case 471:
+		case 473:
+		case 475:
+		case 532:
+		case 534:
+		case 580:
+		case 1329:
+		case 1357:
+		case 7794:
+		case 7796:
+		case 7798:
+		case 7800:
+		case 7802:
+		case 7908:
+		case 7910:
+		case 7912:
+		case 7914:
+		case 7916:
+		case 7918:
+		case 7920:
+		case 9444:
+		case 65333:
+			return 'U';
+		case 1140:
+		case 1142:
+		case 7804:
+		case 7806:
+		case 9445:
+		case 65334:
+			return 'V';
+		case 372:
+		case 7808:
+		case 7810:
+		case 7812:
+		case 7814:
+		case 7816:
+		case 9446:
+		case 65335:
+			return 'W';
+		case 935:
+		case 1061:
+		case 1202:
+		case 1276:
+		case 1278:
+		case 7818:
+		case 7820:
+		case 9447:
+		case 65336:
+			return 'X';
+		case 221:
+		case 374:
+		case 376:
+		case 435:
+		case 562:
+		case 590:
+		case 933:
+		case 939:
+		case 7822:
+		case 7922:
+		case 7924:
+		case 7926:
+		case 7928:
+		case 8025:
+		case 8027:
+		case 8029:
+		case 8031:
+		case 8168:
+		case 8169:
+		case 8170:
+		case 8171:
+		case 9448:
+		case 65337:
+			return 'Y';
+		case 377:
+		case 379:
+		case 381:
+		case 437:
+		case 548:
+		case 918:
+		case 7824:
+		case 7826:
+		case 7828:
+		case 9449:
+		case 65338:
+			return 'Z';
+		case 64:
+		case 224:
+		case 225:
+		case 226:
+		case 227:
+		case 228:
+		case 229:
+		case 257:
+		case 259:
+		case 261:
+		case 462:
+		case 479:
+		case 481:
+		case 507:
+		case 513:
+		case 515:
+		case 551:
+		case 940:
+		case 945:
+		case 1072:
+		case 1233:
+		case 1235:
+		case 7681:
+		case 7834:
+		case 7841:
+		case 7843:
+		case 7845:
+		case 7847:
+		case 7849:
+		case 7851:
+		case 7853:
+		case 7855:
+		case 7857:
+		case 7859:
+		case 7861:
+		case 7863:
+		case 7936:
+		case 7937:
+		case 7938:
+		case 7939:
+		case 7940:
+		case 7941:
+		case 7942:
+		case 7943:
+		case 8048:
+		case 8049:
+		case 8064:
+		case 8065:
+		case 8066:
+		case 8067:
+		case 8068:
+		case 8069:
+		case 8070:
+		case 8071:
+		case 8112:
+		case 8113:
+		case 8114:
+		case 8115:
+		case 8116:
+		case 8118:
+		case 8119:
+		case 9372:
+		case 9398:
+		case 65345:
+			return 'a';
+		case 384:
+		case 387:
+		case 388:
+		case 389:
+		case 595:
+		case 946:
+		case 7683:
+		case 7685:
+		case 7687:
+		case 9373:
+		case 9399:
+		case 65346:
+			return 'b';
+		case 231:
+		case 263:
+		case 265:
+		case 267:
+		case 269:
+		case 392:
+		case 572:
+		case 1089:
+		case 7689:
+		case 9374:
+		case 9400:
+		case 65347:
+			return 'c';
+		case 271:
+		case 273:
+		case 396:
+		case 598:
+		case 599:
+		case 7691:
+		case 7693:
+		case 7695:
+		case 7697:
+		case 7699:
+		case 9375:
+		case 9401:
+		case 65348:
+			return 'd';
+		case 51:
+		case 232:
+		case 233:
+		case 234:
+		case 235:
+		case 275:
+		case 277:
+		case 279:
+		case 281:
+		case 283:
+		case 517:
+		case 519:
+		case 553:
+		case 583:
+		case 1239:
+		case 7701:
+		case 7703:
+		case 7705:
+		case 7707:
+		case 7709:
+		case 7865:
+		case 7867:
+		case 7869:
+		case 7871:
+		case 7873:
+		case 7875:
+		case 7877:
+		case 7879:
+		case 9314:
+		case 9334:
+		case 9376:
+		case 9402:
+		case 65299:
+		case 65349:
+			return 'e';
+		case 402:
+		case 7711:
+		case 9377:
+		case 9403:
+		case 65350:
+			return 'f';
+		case 285:
+		case 287:
+		case 289:
+		case 291:
+		case 485:
+		case 487:
+		case 7713:
+		case 9378:
+		case 9404:
+		case 65351:
+			return 'g';
+		case 293:
+		case 295:
+		case 543:
+		case 614:
+		case 7715:
+		case 7717:
+		case 7719:
+		case 7721:
+		case 7723:
+		case 7830:
+		case 9379:
+		case 9405:
+		case 65352:
+			return 'h';
+		case 33:
+		case 49:
+		case 236:
+		case 237:
+		case 238:
+		case 239:
+		case 297:
+		case 299:
+		case 301:
+		case 303:
+		case 464:
+		case 521:
+		case 523:
+		case 616:
+		case 617:
+		case 943:
+		case 953:
+		case 970:
+		case 1110:
+		case 7725:
+		case 7727:
+		case 7881:
+		case 7883:
+		case 9312:
+		case 9332:
+		case 9380:
+		case 9406:
+		case 65297:
+		case 65353:
+			return 'i';
+		case 309:
+		case 496:
+		case 585:
+		case 669:
+		case 1112:
+		case 9381:
+		case 9407:
+		case 65354:
+			return 'j';
+		case 311:
+		case 312:
+		case 409:
+		case 489:
+		case 954:
+		case 1116:
+		case 1179:
+		case 1181:
+		case 1183:
+		case 7729:
+		case 7731:
+		case 7733:
+		case 9382:
+		case 9408:
+		case 65355:
+			return 'k';
+		case 314:
+		case 316:
+		case 318:
+		case 320:
+		case 322:
+		case 410:
+		case 619:
+		case 620:
+		case 621:
+		case 7735:
+		case 7737:
+		case 7739:
+		case 7741:
+		case 9383:
+		case 9409:
+		case 65356:
+			return 'l';
+		case 625:
+		case 7743:
+		case 7745:
+		case 7747:
+		case 9384:
+		case 9410:
+		case 65357:
+			return 'm';
+		case 241:
+		case 324:
+		case 326:
+		case 328:
+		case 329:
+		case 414:
+		case 505:
+		case 565:
+		case 626:
+		case 627:
+		case 7749:
+		case 7751:
+		case 7753:
+		case 7755:
+		case 9385:
+		case 9411:
+		case 65358:
+			return 'n';
+		case 242:
+		case 243:
+		case 244:
+		case 245:
+		case 246:
+		case 248:
+		case 333:
+		case 335:
+		case 337:
+		case 417:
+		case 466:
+		case 491:
+		case 493:
+		case 511:
+		case 525:
+		case 527:
+		case 555:
+		case 557:
+		case 559:
+		case 561:
+		case 959:
+		case 972:
+		case 1086:
+		case 1255:
+		case 7757:
+		case 7759:
+		case 7761:
+		case 7763:
+		case 7885:
+		case 7887:
+		case 7889:
+		case 7891:
+		case 7893:
+		case 7895:
+		case 7897:
+		case 7899:
+		case 7901:
+		case 7903:
+		case 7905:
+		case 7907:
+		case 8000:
+		case 8001:
+		case 8002:
+		case 8003:
+		case 8004:
+		case 8005:
+		case 9386:
+		case 9412:
+		case 65359:
+			return 'o';
+		case 421:
+		case 961:
+		case 7765:
+		case 7767:
+		case 9387:
+		case 9413:
+		case 65360:
+			return 'p';
+		case 587:
+		case 672:
+		case 9388:
+		case 9414:
+		case 65361:
+			return 'q';
+		case 341:
+		case 343:
+		case 345:
+		case 529:
+		case 531:
+		case 589:
+		case 7769:
+		case 7771:
+		case 7773:
+		case 7775:
+		case 9389:
+		case 9415:
+		case 65362:
+			return 'r';
+		case 347:
+		case 349:
+		case 351:
+		case 353:
+		case 537:
+		case 575:
+		case 1109:
+		case 7777:
+		case 7779:
+		case 7781:
+		case 7783:
+		case 7785:
+		case 9390:
+		case 9416:
+		case 65363:
+			return 's';
+		case 55:
+		case 355:
+		case 357:
+		case 359:
+		case 427:
+		case 429:
+		case 539:
+		case 566:
+		case 964:
+		case 1090:
+		case 1197:
+		case 7787:
+		case 7789:
+		case 7791:
+		case 7793:
+		case 7831:
+		case 9318:
+		case 9338:
+		case 9391:
+		case 9417:
+		case 65303:
+		case 65364:
+			return 't';
+		case 249:
+		case 250:
+		case 251:
+		case 252:
+		case 361:
+		case 363:
+		case 365:
+		case 367:
+		case 369:
+		case 371:
+		case 432:
+		case 468:
+		case 470:
+		case 472:
+		case 474:
+		case 476:
+		case 533:
+		case 535:
+		case 649:
+		case 965:
+		case 973:
+		case 7795:
+		case 7797:
+		case 7799:
+		case 7801:
+		case 7803:
+		case 7909:
+		case 7911:
+		case 7913:
+		case 7915:
+		case 7917:
+		case 7919:
+		case 7921:
+		case 8016:
+		case 8017:
+		case 8018:
+		case 8019:
+		case 8020:
+		case 8021:
+		case 8022:
+		case 8023:
+		case 8160:
+		case 8161:
+		case 8162:
+		case 8163:
+		case 9392:
+		case 9418:
+		case 65365:
+			return 'u';
+		case 1141:
+		case 1143:
+		case 7805:
+		case 7807:
+		case 9393:
+		case 9419:
+		case 65366:
+			return 'v';
+		case 373:
+		case 7809:
+		case 7811:
+		case 7813:
+		case 7815:
+		case 7817:
+		case 7832:
+		case 9394:
+		case 9420:
+		case 65367:
+			return 'w';
+		case 215:
+		case 967:
+		case 1093:
+		case 1203:
+		case 1277:
+		case 1279:
+		case 7819:
+		case 7821:
+		case 9395:
+		case 9421:
+		case 65368:
+			return 'x';
+		case 253:
+		case 255:
+		case 375:
+		case 436:
+		case 563:
+		case 591:
+		case 947:
+		case 1118:
+		case 7823:
+		case 7833:
+		case 7923:
+		case 7925:
+		case 7927:
+		case 7929:
+		case 7935:
+		case 9396:
+		case 9422:
+		case 65369:
+			return 'y';
+		case 378:
+		case 380:
+		case 382:
+		case 438:
+		case 549:
+		case 576:
+		case 656:
+		case 657:
+		case 7825:
+		case 7827:
+		case 7829:
+		case 9397:
+		case 9423:
+		case 65370:
+			return 'z';
+		}
+		return 0;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profanity_filter/ProfanityFilter.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profanity_filter/ProfanityFilter.java
new file mode 100755
index 0000000..2504e5b
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profanity_filter/ProfanityFilter.java
@@ -0,0 +1,534 @@
+package net.lax1dude.eaglercraft.v1_8.profanity_filter;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.minecraft.event.HoverEvent;
+import net.minecraft.util.ChatComponentScore;
+import net.minecraft.util.ChatComponentSelector;
+import net.minecraft.util.ChatComponentStyle;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ProfanityFilter {
+
+	private static final Logger logger = LogManager.getLogger("ProfanityFilter");
+
+	protected final Set<String>[] bannedWords;
+
+	private static ProfanityFilter instance = null;
+
+	public static ProfanityFilter getInstance() {
+		if(instance == null) {
+			instance = new ProfanityFilter();
+		}
+		return instance;
+	}
+
+	private ProfanityFilter() {
+		logger.info("Loading profanity filter hash set...");
+		List<String> strs = EagRuntime.getResourceLines("profanity_filter.wlist");
+		if(strs == null) {
+			throw new RuntimeException("File is missing: profanity_filter.wlist");
+		}
+		long start = EagRuntime.steadyTimeMillis();
+		Set<String>[] sets = new Set[0];
+		int j = 0;
+		for(String str : strs) {
+			if(nextDelimiter(str, 0) != -1) continue;
+			str = LookAlikeUnicodeConv.convertString(str);
+			int l = str.length();
+			if(l == 0) continue;
+			if(sets.length < l) {
+				Set<String>[] setsNew = new Set[l];
+				System.arraycopy(sets, 0, setsNew, 0, sets.length);
+				sets = setsNew;
+			}
+			--l;
+			if(sets[l] == null) {
+				sets[l] = new HashSet();
+			}
+			if(sets[l].add(str)) {
+				++j;
+			}
+		}
+		bannedWords = sets;
+		logger.info("Processed {} entries after {}ms", j, (EagRuntime.steadyTimeMillis() - start));
+	}
+
+	public IChatComponent profanityFilterChatComponent(IChatComponent componentIn) {
+		if(componentIn == null) return null;
+		IChatComponent cmp = null;
+		//long start = System.nanoTime();
+		try {
+			cmp = profanityFilterChatComponent0(componentIn);
+		}catch(Throwable t) {
+			logger.error("Profanity filter raised an exception on chat component!");
+			logger.error(t);
+		}
+		//logger.info("Took: {}", ((System.nanoTime() - start) / 1000000.0));
+		return cmp != null ? cmp : componentIn;
+	}
+
+	protected IChatComponent profanityFilterChatComponent0(IChatComponent componentIn) {
+		if(componentIn instanceof ChatComponentStyle) {
+			boolean flag = false;
+			if(componentIn instanceof ChatComponentText) {
+				ChatComponentText comp = (ChatComponentText)componentIn;
+				String str = comp.getChatComponentText_TextValue();
+				if(StringUtils.isEmpty(str) && componentIn.getSiblings().isEmpty()) {
+					return componentIn;
+				}
+				str = profanityFilterString0(str);
+				if(str != null) {
+					IChatComponent replacedComponent = new ChatComponentText(str);
+					replacedComponent.setChatStyle(comp.getChatStyleIfPresent());
+					replacedComponent.getSiblings().addAll(componentIn.getSiblings());
+					componentIn = replacedComponent;
+					flag = true;
+				}
+			}else if(componentIn instanceof ChatComponentTranslation) {
+				ChatComponentTranslation comp = (ChatComponentTranslation)componentIn;
+				IChatComponent replacedComponent = new ChatComponentTranslation(comp.getKey(), profanityFilterFormatArgs(comp.getFormatArgs()));
+				replacedComponent.setChatStyle(comp.getChatStyleIfPresent());
+				replacedComponent.getSiblings().addAll(componentIn.getSiblings());
+				componentIn = replacedComponent;
+				flag = true;
+			}
+			List<IChatComponent> siblings = componentIn.getSiblings();
+			for(int i = 0, l = siblings.size(); i < l; ++i) {
+				IChatComponent cmp = profanityFilterChatComponent0(siblings.get(i));
+				if(cmp != null) {
+					if(!flag) {
+						componentIn = shallowCopy(componentIn);
+						siblings = componentIn.getSiblings();
+						flag = true;
+					}
+					siblings.set(i, cmp);
+				}
+			}
+			ChatStyle styleOpt = ((ChatComponentStyle)componentIn).getChatStyleIfPresent();
+			if(styleOpt != null) {
+				HoverEvent hoverEvent = styleOpt.getChatHoverEvent();
+				if(hoverEvent != null) {
+					HoverEvent filteredHoverEvent = profanityFilterHoverEvent(hoverEvent);
+					if(filteredHoverEvent != null) {
+						if(!flag) {
+							componentIn = shallowCopy(componentIn);
+							flag = true;
+						}
+						ChatStyle newStyle = styleOpt.createShallowCopy();
+						newStyle.setChatHoverEvent(filteredHoverEvent);
+						componentIn.setChatStyle(newStyle);
+					}
+				}
+			}
+			return flag ? componentIn : null;
+		}else {
+			return null;
+		}
+	}
+
+	private Object[] profanityFilterFormatArgs(Object[] formatArgs) {
+		Object[] ret = profanityFilterFormatArgs0(formatArgs);
+		return ret != null ? ret : formatArgs;
+	}
+
+	private Object[] profanityFilterFormatArgs0(Object[] formatArgs) {
+		Object[] ret = null;
+		for(int i = 0; i < formatArgs.length; ++i) {
+			if(formatArgs[i] != null) {
+				String arg = formatArgs[i].toString();
+				arg = profanityFilterString0(arg);
+				if(arg != null) {
+					if(ret == null) {
+						ret = new Object[formatArgs.length];
+						System.arraycopy(formatArgs, 0, ret, 0, ret.length);
+					}
+					ret[i] = arg;
+				}
+			}
+			
+		}
+		return ret;
+	}
+
+	protected HoverEvent profanityFilterHoverEvent(HoverEvent evtIn) {
+		if(evtIn.getAction() == HoverEvent.Action.SHOW_TEXT) {
+			IChatComponent filtered = evtIn.getValue();
+			if(filtered != null) {
+				filtered = profanityFilterChatComponent0(filtered);
+				if(filtered != null) {
+					return new HoverEvent(evtIn.getAction(), filtered);
+				}
+			}
+		}
+		return null;
+	}
+
+	private static IChatComponent shallowCopy(IChatComponent comp) {
+		if(comp instanceof ChatComponentStyle) {
+			if(comp instanceof ChatComponentText) {
+				ChatComponentText old = (ChatComponentText)comp;
+				IChatComponent ret = new ChatComponentText(old.getChatComponentText_TextValue());
+				ret.setChatStyle(old.getChatStyleIfPresent());
+				ret.getSiblings().addAll(comp.getSiblings());
+				return ret;
+			}else if(comp instanceof ChatComponentTranslation) {
+				ChatComponentTranslation old = (ChatComponentTranslation)comp;
+				IChatComponent ret = new ChatComponentTranslation(old.getKey(), old.getFormatArgs());
+				ret.setChatStyle(old.getChatStyleIfPresent());
+				ret.getSiblings().addAll(comp.getSiblings());
+				return ret;
+			}else if(comp instanceof ChatComponentScore) {
+				ChatComponentScore old = (ChatComponentScore)comp;
+				IChatComponent ret = new ChatComponentScore(old.getName(), old.getObjective());
+				ret.setChatStyle(old.getChatStyleIfPresent());
+				ret.getSiblings().addAll(comp.getSiblings());
+				return ret;
+			}else if(comp instanceof ChatComponentSelector) {
+				ChatComponentSelector old = (ChatComponentSelector)comp;
+				IChatComponent ret = new ChatComponentSelector(old.getSelector());
+				ret.setChatStyle(old.getChatStyleIfPresent());
+				ret.getSiblings().addAll(comp.getSiblings());
+				return ret;
+			}
+		}
+		return comp.createCopy();
+	}
+
+	private static final char[] stars = new char[] { '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*',
+			'*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*',
+			'*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*',
+			'*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*' };
+
+	public String profanityFilterString(String stringIn) {
+		if(stringIn == null) return null;
+		String str = null;
+		//long start = System.nanoTime();
+		try {
+			str = profanityFilterString0(stringIn);
+		}catch(Throwable t) {
+			logger.error("Profanity filter raised an exception on string!");
+			logger.error(t);
+		}
+		//logger.info("Took: {}", ((System.nanoTime() - start) / 1000000.0));
+		return str != null ? str : stringIn;
+	}
+
+	protected String profanityFilterString0(String stringIn) {
+		if(StringUtils.isAllBlank(stringIn)) {
+			return null;
+		}
+		int inLen = stringIn.length();
+		boolean flag = false;
+		int i = 0, j;
+		int k = -1;
+		StringBuilder b = null;
+		String str;
+		List<int[]> rangeList = new ArrayList(4);
+		int minCoverage = 40;
+		int pieceLen;
+		while((j = nextDelimiter(stringIn, i)) != -1) {
+			if(j - i > 2) {
+				if(b != null) {
+					str = LookAlikeUnicodeConv.convertString(stripColorCodes(b.toString())).toLowerCase();
+					pieceLen = str.length();
+					b = null;
+					//System.out.println("\"" + str + "\"");
+					rangeList.clear();
+					if(isBanned(str, rangeList) && evaluateCoverage(pieceLen, rangeList) > (pieceLen * minCoverage / 100)) {
+						flag = true;
+						for(int m = 0, n = rangeList.size(); m < n; ++m) {
+							stringIn = doStar(stringIn, k, i - 1, rangeList.get(m));
+						}
+					}
+					k = -1;
+				}
+				str = LookAlikeUnicodeConv.convertString(stripColorCodes(stringIn.substring(i, j))).toLowerCase();
+				pieceLen = str.length();
+				//System.out.println("\"" + str + "\"");
+				rangeList.clear();
+				if(isBanned(str, rangeList) && evaluateCoverage(pieceLen, rangeList) > (pieceLen * minCoverage / 100)) {
+					flag = true;
+					for(int m = 0, n = rangeList.size(); m < n; ++m) {
+						stringIn = doStar(stringIn, i, j, rangeList.get(m));
+					}
+				}
+			}else if(j - i > 0) {
+				if(b == null) {
+					k = i;
+					b = new StringBuilder(stringIn.substring(i, j));
+				}else {
+					b.append(stringIn.substring(i, j));
+				}
+			}
+			i = j + 1;
+		}
+		j = inLen;
+		if(j - i > 2) {
+			if(b != null) {
+				str = LookAlikeUnicodeConv.convertString(stripColorCodes(b.toString())).toLowerCase();
+				pieceLen = str.length();
+				b = null;
+				//System.out.println("\"" + str + "\"");
+				rangeList.clear();
+				if(isBanned(str, rangeList) && evaluateCoverage(pieceLen, rangeList) > (pieceLen * minCoverage / 100)) {
+					flag = true;
+					for(int m = 0, n = rangeList.size(); m < n; ++m) {
+						stringIn = doStar(stringIn, k, i - 1, rangeList.get(m));
+					}
+				}
+				k = -1;
+			}
+			str = LookAlikeUnicodeConv.convertString(stripColorCodes(stringIn.substring(i, j))).toLowerCase();
+			pieceLen = str.length();
+			//System.out.println("\"" + str + "\"");
+			rangeList.clear();
+			if(isBanned(str, rangeList) && evaluateCoverage(pieceLen, rangeList) > (pieceLen * minCoverage / 100)) {
+				flag = true;
+				for(int m = 0, n = rangeList.size(); m < n; ++m) {
+					stringIn = doStar(stringIn, i, j, rangeList.get(m));
+				}
+			}
+		}else if(j - i > 0) {
+			if(b == null) {
+				k = i;
+				b = new StringBuilder(stringIn.substring(i, j));
+			}else {
+				b.append(stringIn.substring(i, j));
+			}
+		}
+		if(b != null) {
+			str = LookAlikeUnicodeConv.convertString(stripColorCodes(b.toString())).toLowerCase();
+			pieceLen = str.length();
+			b = null;
+			//System.out.println("\"" + str + "\"");
+			rangeList.clear();
+			if(isBanned(str, rangeList) && evaluateCoverage(pieceLen, rangeList) > (pieceLen * minCoverage / 100)) {
+				flag = true;
+				for(int m = 0, n = rangeList.size(); m < n; ++m) {
+					stringIn = doStar(stringIn, k, stringIn.length(), rangeList.get(m));
+				}
+			}
+		}
+		return flag ? stringIn : null;
+	}
+
+	protected String doStar(String stringIn, int start, int end, int[] rangeReturn) {
+		int strlen = stringIn.length();
+		start += rangeReturn[0];
+		end -= rangeReturn[1];
+		int len = end - start;
+		if(len <= 0 || start < 0 || end > strlen) {
+			logger.warn("Profanity filter attempted out of bounds substring @ strlen: {}, start: {}, end: {}, len: {}", strlen, start, end, len);
+			return stringIn;
+		}
+		StringBuilder fixed = new StringBuilder(stringIn.substring(0, start));
+		fixed.append(stars, 0, MathHelper.clamp_int(len, 1, stars.length));
+		fixed.append(stringIn, end, stringIn.length());
+		return fixed.toString();
+	}
+
+	protected static final int[] zeroZero = new int[2];
+
+	protected boolean isBanned(String word, List<int[]> rangeReturn) {
+		int l = word.length();
+		if(l == 0) return false;
+		int i = bannedWords.length;
+		int k;
+		boolean flag = false;
+		for(int j = Math.min(l, i); j >= 3; --j) {
+			if(j == l) {
+				Set<String> set = bannedWords[j - 1];
+				//System.out.println(" - \"" + word + "\"");
+				if(set != null && set.contains(word)) {
+					rangeReturn.add(zeroZero);
+					return true;
+				}
+			}else {
+				Set<String> set = bannedWords[j - 1];
+				if(set != null) {
+					int m = l - j;
+					for(int n = 0; n <= m; ++n) {
+						if(overlaps(n, n + j, l, rangeReturn)) {
+							//System.out.println("Skipping overlap: " + n + " -> " + (n + j));
+							continue;
+						}
+						String ss = word.substring(n, n + j);
+						//System.out.println(" - \"" + ss + "\"");
+						if(set.contains(ss)) {
+							rangeReturn.add(new int[] { n, m - n });
+							flag = true;
+						}
+					}
+				}
+			}
+		}
+		return flag;
+	}
+
+	protected static boolean overlaps(int min, int max, int fullLen, List<int[]> rangeReturn) {
+		int[] ii;
+		int j, k;
+		for(int i = 0, l = rangeReturn.size(); i < l; ++i) {
+			ii = rangeReturn.get(i);
+			j = ii[0];
+			k = fullLen - ii[1];
+			if(min < k && j < max) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	protected static int evaluateCoverage(int fullLen, List<int[]> rangeReturn) {
+		int coverage = 0;
+		int[] ii;
+		for(int i = 0, l = rangeReturn.size(); i < l; ++i) {
+			ii = rangeReturn.get(i);
+			coverage += fullLen - ii[0] - ii[1] - 1;
+		}
+		return coverage;
+	}
+
+	protected static String stripColorCodes(String stringIn) {
+		int i = stringIn.indexOf('\u00a7');
+		if(i != -1) {
+			int j = 0;
+			int l = stringIn.length();
+			StringBuilder ret = new StringBuilder(l);
+			do {
+				if(i - j > 0) {
+					ret.append(stringIn, j, i);
+				}
+				j = i + 2;
+			}while(j < l && (i = stringIn.indexOf('\u00a7', j)) != -1);
+			if(l - j > 0) {
+				ret.append(stringIn, j, l);
+			}
+			return ret.toString();
+		}else {
+			return stringIn;
+		}
+	}
+
+	private static int nextDelimiter(String stringIn, int startIndex) {
+		int len = stringIn.length();
+		while(startIndex < len) {
+			char c = stringIn.charAt(startIndex);
+			switch(c) {
+			case ' ':
+			case '.':
+			case ',':
+			case '_':
+			case '+':
+			case '-':
+			case '=':
+			case '|':
+			case '?':
+			case '<':
+			case '>':
+			case '/':
+			case '\\':
+			case '\'':
+			case '\"':
+			case '@':
+			case '#':
+			case '%':
+			case '^':
+			case '&':
+			case '*':
+			case '(':
+			case ')':
+			case '{':
+			case '}':
+			case ':':
+			case ';':
+			case '`':
+			case '~':
+			case '\n':
+			case '\r':
+			case '\t':
+			case '\u00a0':
+				return startIndex;
+			case '!':
+				if (!(startIndex > 0 && !isDelimiter(stringIn.charAt(startIndex - 1)))
+						|| !(startIndex + 1 < len && !isDelimiter(stringIn.charAt(startIndex + 1)))) {
+					return startIndex;
+				}
+			default:
+				break;
+			}
+			++startIndex;
+		}
+		return -1;
+	}
+
+	private static boolean isDelimiter(char c) {
+		switch(c) {
+		case ' ':
+		case '.':
+		case ',':
+		case '_':
+		case '+':
+		case '-':
+		case '=':
+		case '|':
+		case '?':
+		case '!':
+		case '<':
+		case '>':
+		case '/':
+		case '\\':
+		case '\'':
+		case '\"':
+		case '@':
+		case '#':
+		case '%':
+		case '^':
+		case '&':
+		case '*':
+		case '(':
+		case ')':
+		case '{':
+		case '}':
+		case ':':
+		case ';':
+		case '`':
+		case '~':
+		case '\n':
+		case '\r':
+		case '\t':
+		case '\u00a0':
+			return true;
+		}
+		return false;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/CapePackets.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/CapePackets.java
index d5fba35..dfbde2b 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/CapePackets.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/CapePackets.java
@@ -1,11 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.profile;
 
-import java.io.IOException;
-
-import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
-import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
-import net.minecraft.network.PacketBuffer;
-
 /**
  * Copyright (c) 2024 lax1dude. All Rights Reserved.
  * 
@@ -25,42 +19,6 @@ public class CapePackets {
 
 	public static final int PACKET_MY_CAPE_PRESET = 0x01;
 	public static final int PACKET_MY_CAPE_CUSTOM = 0x02;
-	public static final int PACKET_GET_OTHER_CAPE = 0x03;
-	public static final int PACKET_OTHER_CAPE_PRESET = 0x04;
-	public static final int PACKET_OTHER_CAPE_CUSTOM = 0x05;
-
-	public static void readPluginMessage(PacketBuffer buffer, ServerCapeCache capeCache) throws IOException {
-		try {
-			int type = (int)buffer.readByte() & 0xFF;
-			switch(type) {
-			case PACKET_OTHER_CAPE_PRESET: {
-				EaglercraftUUID responseUUID = buffer.readUuid();
-				int responsePreset = buffer.readInt();
-				if(buffer.isReadable()) {
-					throw new IOException("PACKET_OTHER_CAPE_PRESET had " + buffer.readableBytes() + " remaining bytes!");
-				}
-				capeCache.cacheCapePreset(responseUUID, responsePreset);
-				break;
-			}
-			case PACKET_OTHER_CAPE_CUSTOM: {
-				EaglercraftUUID responseUUID = buffer.readUuid();
-				byte[] readCape = new byte[1173];
-				buffer.readBytes(readCape);
-				if(buffer.isReadable()) {
-					throw new IOException("PACKET_OTHER_CAPE_CUSTOM had " + buffer.readableBytes() + " remaining bytes!");
-				}
-				capeCache.cacheCapeCustom(responseUUID, readCape);
-				break;
-			}
-			default:
-				throw new IOException("Unknown skin packet type: " + type);
-			}
-		}catch(IOException ex) {
-			throw ex;
-		}catch(Throwable t) {
-			throw new IOException("Failed to parse cape packet!", t);
-		}
-	}
 
 	public static byte[] writeMyCapePreset(int capeId) {
 		return new byte[] { (byte) PACKET_MY_CAPE_PRESET, (byte) (capeId >>> 24), (byte) (capeId >>> 16),
@@ -74,10 +32,4 @@ public class CapePackets {
 		return packet;
 	}
 
-	public static PacketBuffer writeGetOtherCape(EaglercraftUUID playerId) throws IOException {
-		PacketBuffer ret = new PacketBuffer(Unpooled.buffer(17, 17));
-		ret.writeByte(PACKET_GET_OTHER_CAPE);
-		ret.writeUuid(playerId);
-		return ret;
-	}
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerProfile.java
index 81453e8..10d1918 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerProfile.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerProfile.java
@@ -40,12 +40,34 @@ public class EaglerProfile {
 	public static int presetCapeId;
 	public static int customCapeId;
 
-	public static final List<CustomSkin> customSkins = new ArrayList();
-	public static final List<CustomCape> customCapes = new ArrayList();
+	public static boolean isServerSkinOverride = false;
+	public static int overridePresetSkinId = -1;
+	public static final ResourceLocation overrideCustomSkinTexture = new ResourceLocation("eagler:skins/custom/tex_server_override");
+	public static EaglerSkinTexture overrideCustomSkin = null;
+	public static SkinModel overrideCustomSkinModel = SkinModel.STEVE;
+
+	public static boolean isServerCapeOverride = false;
+	public static int overridePresetCapeId = -1;
+	public static final ResourceLocation overrideCustomCapeTexture = new ResourceLocation("eagler:capes/custom/tex_server_override");
+	public static EaglerSkinTexture overrideCustomCape = null;
+
+	public static final List<CustomSkin> customSkins = new ArrayList<>();
+	public static final List<CustomCape> customCapes = new ArrayList<>();
 	
 	public static final EaglercraftRandom rand;
 	
 	public static ResourceLocation getActiveSkinResourceLocation() {
+		if(isServerSkinOverride) {
+			if(overridePresetSkinId == -1) {
+				return overrideCustomSkinTexture;
+			}else {
+				if(overridePresetSkinId >= 0 && overridePresetSkinId < DefaultSkins.defaultSkinsMap.length) {
+					return DefaultSkins.defaultSkinsMap[overridePresetSkinId].location;
+				}else {
+					return DefaultSkins.defaultSkinsMap[0].location;
+				}
+			}
+		}
 		if(presetSkinId == -1) {
 			if(customSkinId >= 0 && customSkinId < customSkins.size()) {
 				return customSkins.get(customSkinId).getResource();
@@ -65,6 +87,17 @@ public class EaglerProfile {
 	}
 	
 	public static SkinModel getActiveSkinModel() {
+		if(isServerSkinOverride) {
+			if(overridePresetSkinId == -1) {
+				return overrideCustomSkinModel;
+			}else {
+				if(overridePresetSkinId >= 0 && overridePresetSkinId < DefaultSkins.defaultSkinsMap.length) {
+					return DefaultSkins.defaultSkinsMap[overridePresetSkinId].model;
+				}else {
+					return DefaultSkins.defaultSkinsMap[0].model;
+				}
+			}
+		}
 		if(presetSkinId == -1) {
 			if(customSkinId >= 0 && customSkinId < customSkins.size()) {
 				return customSkins.get(customSkinId).model;
@@ -84,6 +117,17 @@ public class EaglerProfile {
 	}
 	
 	public static ResourceLocation getActiveCapeResourceLocation() {
+		if(isServerCapeOverride) {
+			if(overridePresetCapeId == -1) {
+				return overrideCustomCapeTexture;
+			}else {
+				if(overridePresetCapeId >= 0 && overridePresetCapeId < DefaultCapes.defaultCapesMap.length) {
+					return DefaultCapes.defaultCapesMap[overridePresetCapeId].location;
+				}else {
+					return DefaultCapes.defaultCapesMap[0].location;
+				}
+			}
+		}
 		if(presetCapeId == -1) {
 			if(customCapeId >= 0 && customCapeId < customCapes.size()) {
 				return customCapes.get(customCapeId).getResource();
@@ -118,10 +162,15 @@ public class EaglerProfile {
 		}
 	}
 
-	public static byte[] getSkinPacket() {
+	public static byte[] getSkinPacket(int vers) {
 		if(presetSkinId == -1) {
 			if(customSkinId >= 0 && customSkinId < customSkins.size()) {
-				return SkinPackets.writeMySkinCustom(customSkins.get(customSkinId));
+				CustomSkin toSend = customSkins.get(customSkinId);
+				if(vers <= 3) {
+					return SkinPackets.writeMySkinCustomV3(toSend);
+				}else {
+					return SkinPackets.writeMySkinCustomV4(toSend);
+				}
 			}else {
 				customSkinId = -1;
 				presetSkinId = 0;
@@ -156,6 +205,59 @@ public class EaglerProfile {
 		}
 	}
 
+	public static void handleForceSkinPreset(int preset) {
+		isServerSkinOverride = true;
+		overridePresetSkinId = preset;
+		ServerSkinCache.needReloadClientSkin = true;
+	}
+
+	public static void handleForceSkinCustom(int modelID, byte[] datav3) {
+		if(datav3.length != 16384) {
+			return;
+		}
+		isServerSkinOverride = true;
+		overridePresetSkinId = -1;
+		overrideCustomSkinModel = SkinModel.getModelFromId(modelID);
+		if(overrideCustomSkinModel.highPoly != null) {
+			overrideCustomSkinModel = SkinModel.STEVE;
+		}
+		if(overrideCustomSkin == null) {
+			overrideCustomSkin = new EaglerSkinTexture(datav3, 64, 64);
+			Minecraft.getMinecraft().getTextureManager().loadTexture(overrideCustomSkinTexture, overrideCustomSkin);
+		}else {
+			overrideCustomSkin.copyPixelsIn(datav3);
+		}
+		ServerSkinCache.needReloadClientSkin = true;
+	}
+
+	public static void handleForceCapePreset(int preset) {
+		isServerCapeOverride = true;
+		overridePresetCapeId = preset;
+		ServerCapeCache.needReloadClientCape = true;
+	}
+
+	public static void handleForceCapeCustom(byte[] custom) {
+		if(custom.length != 1173) {
+			return;
+		}
+		byte[] pixels32x32 = new byte[4096];
+		SkinConverter.convertCape23x17RGBto32x32RGBA(custom, pixels32x32);
+		isServerCapeOverride = true;
+		overridePresetCapeId = -1;
+		if(overrideCustomCape == null) {
+			overrideCustomCape = new EaglerSkinTexture(pixels32x32, 32, 32);
+			Minecraft.getMinecraft().getTextureManager().loadTexture(overrideCustomCapeTexture, overrideCustomCape);
+		}else {
+			overrideCustomCape.copyPixelsIn(pixels32x32);
+		}
+		ServerCapeCache.needReloadClientCape = true;
+	}
+
+	public static void clearServerSkinOverride() {
+		isServerSkinOverride = false;
+		isServerCapeOverride = false;
+	}
+
 	private static boolean doesSkinExist(String name) {
 		for(int i = 0, l = customSkins.size(); i < l; ++i) {
 			if(customSkins.get(i).name.equalsIgnoreCase(name)) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerSkinTexture.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerSkinTexture.java
index 54c796d..2ecc324 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerSkinTexture.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerSkinTexture.java
@@ -44,15 +44,23 @@ public class EaglerSkinTexture implements ITextureObject {
 		if(pixels.length != width * height * 4) {
 			throw new IllegalArgumentException("Wrong data length " + pixels.length + "  for " + width + "x" + height + " texture");
 		}
+		this.pixels = convertToInt(pixels);
+		this.width = width;
+		this.height = height;
+	}
+
+	public static int[] convertToInt(byte[] pixels) {
 		int[] p = new int[pixels.length >> 2];
 		for(int i = 0, j; i < p.length; ++i) {
 			j = i << 2;
 			p[i] = (((int) pixels[j] & 0xFF) << 24) | (((int) pixels[j + 1] & 0xFF) << 16)
 					| (((int) pixels[j + 2] & 0xFF) << 8) | ((int) pixels[j + 3] & 0xFF);
 		}
-		this.pixels = p;
-		this.width = width;
-		this.height = height;
+		return p;
+	}
+
+	public void copyPixelsIn(byte[] pixels) {
+		copyPixelsIn(convertToInt(pixels));
 	}
 
 	public void copyPixelsIn(int[] pixels) {
@@ -93,4 +101,16 @@ public class EaglerSkinTexture implements ITextureObject {
 		textureId = -1;
 	}
 
+	public int getWidth() {
+		return width;
+	}
+
+	public int getHeight() {
+		return height;
+	}
+
+	public int[] getData() {
+		return pixels;
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiAuthenticationScreen.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiAuthenticationScreen.java
index a479bc5..8e656ae 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiAuthenticationScreen.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiAuthenticationScreen.java
@@ -2,7 +2,7 @@ package net.lax1dude.eaglercraft.v1_8.profile;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformNetworking;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.socket.ConnectionHandshake;
 import net.lax1dude.eaglercraft.v1_8.socket.HandshakePacketTypes;
 import net.minecraft.client.gui.GuiButton;
@@ -92,9 +92,6 @@ public class GuiAuthenticationScreen extends GuiScreen {
 			this.mc.displayGuiScreen(new GuiConnecting(retAfterAuthScreen, password.getText()));
 		}else {
 			this.mc.displayGuiScreen(parent);
-			if (!PlatformNetworking.playConnectionState().isClosed()) {
-				PlatformNetworking.playDisconnect();
-			}
 		}
 	}
 
@@ -122,4 +119,14 @@ public class GuiAuthenticationScreen extends GuiScreen {
 		this.password.mouseClicked(parInt1, parInt2, parInt3);
 	}
 
+	@Override
+	public boolean showCopyPasteButtons() {
+		return password.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		password.fireInputEvent(event, param);
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditCape.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditCape.java
index 9186a90..5f8d625 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditCape.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditCape.java
@@ -3,6 +3,7 @@ package net.lax1dude.eaglercraft.v1_8.profile;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
 import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
@@ -51,7 +52,6 @@ public class GuiScreenEditCape extends GuiScreen {
 
 	public GuiScreenEditCape(GuiScreenEditProfile parent) {
 		this.parent = parent;
-		updateOptions();
 	}
 
 	public void initGui() {
@@ -61,6 +61,7 @@ public class GuiScreenEditCape extends GuiScreen {
 		buttonList.add(new GuiButton(0, width / 2 - 100, height / 6 + 168, I18n.format("gui.done")));
 		buttonList.add(new GuiButton(1, width / 2 - 21, height / 6 + 80, 71, 20, I18n.format("editCape.addCape")));
 		buttonList.add(new GuiButton(2, width / 2 - 21 + 71, height / 6 + 80, 72, 20, I18n.format("editCape.clearCape")));
+		updateOptions();
 	}
 
 	private void updateOptions() {
@@ -243,7 +244,7 @@ public class GuiScreenEditCape extends GuiScreen {
 		if(EagRuntime.fileChooserHasResult()) {
 			FileChooserResult result = EagRuntime.getFileChooserResult();
 			if(result != null) {
-				ImageData loadedCape = ImageData.loadImageFile(result.fileData);
+				ImageData loadedCape = ImageData.loadImageFile(result.fileData, ImageData.getMimeFromType(result.fileName));
 				if(loadedCape != null) {
 					if((loadedCape.width == 32 || loadedCape.width == 64) && loadedCape.height == 32) {
 						byte[] resized = new byte[1173];
@@ -258,12 +259,12 @@ public class GuiScreenEditCape extends GuiScreen {
 						EagRuntime.showPopup("The selected image '" + result.fileName + "' is not the right size!\nEaglercraft only supports 32x32 or 64x32 capes");
 					}
 				}else {
-					EagRuntime.showPopup("The selected file '" + result.fileName + "' is not a PNG file!");
+					EagRuntime.showPopup("The selected file '" + result.fileName + "' is not a supported format!");
 				}
 			}
 		}
 		if(dropDownOpen) {
-			if(Mouse.isButtonDown(0)) {
+			if(PointerInputAbstraction.getVCursorButtonDown(0)) {
 				int skinX = width / 2 - 20;
 				int skinY = height / 6 + 73;
 				int skinWidth = 140;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditProfile.java
index 24cac8e..5411c79 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditProfile.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditProfile.java
@@ -3,8 +3,10 @@ package net.lax1dude.eaglercraft.v1_8.profile;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
 import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 import net.minecraft.client.audio.PositionedSoundRecord;
@@ -57,7 +59,6 @@ public class GuiScreenEditProfile extends GuiScreen {
 
 	public GuiScreenEditProfile(GuiScreen parent) {
 		this.parent = parent;
-		updateOptions();
 	}
 
 	public void initGui() {
@@ -66,10 +67,12 @@ public class GuiScreenEditProfile extends GuiScreen {
 		usernameField = new GuiTextField(0, fontRendererObj, width / 2 - 20 + 1, height / 6 + 24 + 1, 138, 20);
 		usernameField.setFocused(true);
 		usernameField.setText(EaglerProfile.getName());
+		usernameField.setMaxStringLength(16);
 		selectedSlot = EaglerProfile.presetSkinId == -1 ? EaglerProfile.customSkinId : (EaglerProfile.presetSkinId + EaglerProfile.customSkins.size());
 		buttonList.add(new GuiButton(0, width / 2 - 100, height / 6 + 168, I18n.format("gui.done")));
 		buttonList.add(new GuiButton(1, width / 2 - 21, height / 6 + 110, 71, 20, I18n.format("editProfile.addSkin")));
 		buttonList.add(new GuiButton(2, width / 2 - 21 + 71, height / 6 + 110, 72, 20, I18n.format("editProfile.clearSkin")));
+		updateOptions();
 	}
 
 	private void updateOptions() {
@@ -330,7 +333,7 @@ public class GuiScreenEditProfile extends GuiScreen {
 		if(EagRuntime.fileChooserHasResult()) {
 			FileChooserResult result = EagRuntime.getFileChooserResult();
 			if(result != null) {
-				ImageData loadedSkin = ImageData.loadImageFile(result.fileData);
+				ImageData loadedSkin = ImageData.loadImageFile(result.fileData, ImageData.getMimeFromType(result.fileName));
 				if(loadedSkin != null) {
 					boolean isLegacy = loadedSkin.width == 64 && loadedSkin.height == 32;
 					boolean isModern = loadedSkin.width == 64 && loadedSkin.height == 64;
@@ -367,12 +370,12 @@ public class GuiScreenEditProfile extends GuiScreen {
 						EagRuntime.showPopup("The selected image '" + result.fileName + "' is not the right size!\nEaglercraft only supports 64x32 or 64x64 skins");
 					}
 				}else {
-					EagRuntime.showPopup("The selected file '" + result.fileName + "' is not a PNG file!");
+					EagRuntime.showPopup("The selected file '" + result.fileName + "' is not a supported format!");
 				}
 			}
 		}
 		if(dropDownOpen) {
-			if(Mouse.isButtonDown(0)) {
+			if(PointerInputAbstraction.getVCursorButtonDown(0)) {
 				int skinX = width / 2 - 20;
 				int skinY = height / 6 + 103;
 				int skinWidth = 140;
@@ -532,4 +535,14 @@ public class GuiScreenEditProfile extends GuiScreen {
 		EaglerProfile.setName(name);
 	}
 
+	@Override
+	public boolean showCopyPasteButtons() {
+		return usernameField.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		usernameField.fireInputEvent(event, param);
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java
index e46fd60..03d7467 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java
@@ -77,8 +77,8 @@ public class GuiScreenImportProfile extends GuiScreen {
 			}else {
 				mc.loadingScreen.eaglerShow(I18n.format("settingsBackup.importing.1"), I18n.format("settingsBackup.importing.2"));
 				try {
-					List<String> list1 = new ArrayList(mc.gameSettings.resourcePacks); 
-					List<String> list2 = new ArrayList(mc.gameSettings.field_183018_l);
+					List<String> list1 = new ArrayList<>(mc.gameSettings.resourcePacks); 
+					List<String> list2 = new ArrayList<>(mc.gameSettings.field_183018_l);
 					importer.importProfileAndSettings(doImportProfile, doImportSettings, doImportServers, doImportResourcePacks);
 					boolean resourcePacksChanged = !mc.gameSettings.resourcePacks.equals(list1) || !mc.gameSettings.field_183018_l.equals(list2);
 					if(resourcePacksChanged || (doImportResourcePacks && (list1.size() > 0 || list2.size() > 0))) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java
index 1422c4c..5203bf3 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java
@@ -2,6 +2,7 @@ package net.lax1dude.eaglercraft.v1_8.profile;
 
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglerMeshLoader;
@@ -158,7 +159,7 @@ public class RenderHighPoly extends RenderPlayer {
 				
 				if(highPolySkin.headModel != null) {
 					if(highPolySkin == HighPolySkin.BABY_CHARLES) {
-						long millis = System.currentTimeMillis();
+						long millis = EagRuntime.steadyTimeMillis();
 						float partialTicks = (float) ((millis - abstractclientplayer.eaglerHighPolyAnimationTick) * 0.02);
 						//long l50 = millis / 50l * 50l;
 						//boolean runTick = par1EntityPlayer.eaglerHighPolyAnimationTick < l50 && millis >= l50;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ServerCapeCache.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ServerCapeCache.java
index f55b13e..788e398 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ServerCapeCache.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ServerCapeCache.java
@@ -1,17 +1,16 @@
 package net.lax1dude.eaglercraft.v1_8.profile;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketGetOtherCapeEAG;
+import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.client.C17PacketCustomPayload;
 import net.minecraft.util.ResourceLocation;
 
 /**
@@ -39,7 +38,7 @@ public class ServerCapeCache {
 		protected final int presetCapeId;
 		protected final CacheCustomCape customCape;
 		
-		protected long lastCacheHit = System.currentTimeMillis();
+		protected long lastCacheHit = EagRuntime.steadyTimeMillis();
 		
 		protected CapeCacheEntry(EaglerSkinTexture textureInstance, ResourceLocation resourceLocation) {
 			this.isPresetCape = false;
@@ -96,26 +95,32 @@ public class ServerCapeCache {
 	}
 
 	private final CapeCacheEntry defaultCacheEntry = new CapeCacheEntry(0);
-	private final Map<EaglercraftUUID, CapeCacheEntry> capesCache = new HashMap();
-	private final Map<EaglercraftUUID, Long> waitingCapes = new HashMap();
-	private final Map<EaglercraftUUID, Long> evictedCapes = new HashMap();
+	private final Map<EaglercraftUUID, CapeCacheEntry> capesCache = new HashMap<>();
+	private final Map<EaglercraftUUID, Long> waitingCapes = new HashMap<>();
+	private final Map<EaglercraftUUID, Long> evictedCapes = new HashMap<>();
 
-	private final EaglercraftNetworkManager networkManager;
+	private final NetHandlerPlayClient netHandler;
 	protected final TextureManager textureManager;
 	
 	private final EaglercraftUUID clientPlayerId;
-	private final CapeCacheEntry clientPlayerCacheEntry;
+	private CapeCacheEntry clientPlayerCacheEntry;
 
-	private long lastFlush = System.currentTimeMillis();
-	private long lastFlushReq = System.currentTimeMillis();
-	private long lastFlushEvict = System.currentTimeMillis();
+	private long lastFlush = EagRuntime.steadyTimeMillis();
+	private long lastFlushReq = EagRuntime.steadyTimeMillis();
+	private long lastFlushEvict = EagRuntime.steadyTimeMillis();
 
 	private static int texId = 0;
+	public static boolean needReloadClientCape = false;
 
-	public ServerCapeCache(EaglercraftNetworkManager networkManager, TextureManager textureManager) {
-		this.networkManager = networkManager;
+	public ServerCapeCache(NetHandlerPlayClient netHandler, TextureManager textureManager) {
+		this.netHandler = netHandler;
 		this.textureManager = textureManager;
 		this.clientPlayerId = EaglerProfile.getPlayerUUID();
+		reloadClientPlayerCape();
+	}
+	
+	public void reloadClientPlayerCape() {
+		needReloadClientCape = false;
 		this.clientPlayerCacheEntry = new CapeCacheEntry(EaglerProfile.getActiveCapeResourceLocation());
 	}
 
@@ -130,20 +135,12 @@ public class ServerCapeCache {
 		CapeCacheEntry etr = capesCache.get(player);
 		if(etr == null) {
 			if(!waitingCapes.containsKey(player) && !evictedCapes.containsKey(player)) {
-				waitingCapes.put(player, System.currentTimeMillis());
-				PacketBuffer buffer;
-				try {
-					buffer = CapePackets.writeGetOtherCape(player);
-				}catch(IOException ex) {
-					logger.error("Could not write cape request packet!");
-					logger.error(ex);
-					return defaultCacheEntry;
-				}
-				networkManager.sendPacket(new C17PacketCustomPayload("EAG|Capes-1.8", buffer));
+				waitingCapes.put(player, EagRuntime.steadyTimeMillis());
+				netHandler.sendEaglerMessage(new CPacketGetOtherCapeEAG(player.msb, player.lsb));
 			}
 			return defaultCacheEntry;
 		}else {
-			etr.lastCacheHit = System.currentTimeMillis();
+			etr.lastCacheHit = EagRuntime.steadyTimeMillis();
 			return etr;
 		}
 	}
@@ -183,7 +180,7 @@ public class ServerCapeCache {
 	}
 
 	public void flush() {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		if(millis - lastFlushReq > 5000l) {
 			lastFlushReq = millis;
 			if(!waitingCapes.isEmpty()) {
@@ -219,6 +216,9 @@ public class ServerCapeCache {
 				}
 			}
 		}
+		if(needReloadClientCape) {
+			reloadClientPlayerCape();
+		}
 	}
 
 	public void destroy() {
@@ -232,7 +232,14 @@ public class ServerCapeCache {
 	}
 
 	public void evictCape(EaglercraftUUID uuid) {
-		evictedCapes.put(uuid, Long.valueOf(System.currentTimeMillis()));
+		evictedCapes.put(uuid, Long.valueOf(EagRuntime.steadyTimeMillis()));
+		CapeCacheEntry etr = capesCache.remove(uuid);
+		if(etr != null) {
+			etr.free();
+		}
+	}
+
+	public void handleInvalidate(EaglercraftUUID uuid) {
 		CapeCacheEntry etr = capesCache.remove(uuid);
 		if(etr != null) {
 			etr.free();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ServerSkinCache.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ServerSkinCache.java
index 26cc818..b98622c 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ServerSkinCache.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ServerSkinCache.java
@@ -1,19 +1,19 @@
 package net.lax1dude.eaglercraft.v1_8.profile;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 import net.lax1dude.eaglercraft.v1_8.mojang.authlib.TexturesProperty;
-import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketGetOtherSkinEAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketGetSkinByURLEAG;
+import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.client.C17PacketCustomPayload;
 import net.minecraft.util.ResourceLocation;
 
 /**
@@ -41,7 +41,7 @@ public class ServerSkinCache {
 		protected final int presetSkinId;
 		protected final CacheCustomSkin customSkin;
 		
-		protected long lastCacheHit = System.currentTimeMillis();
+		protected long lastCacheHit = EagRuntime.steadyTimeMillis();
 		
 		protected SkinCacheEntry(EaglerSkinTexture textureInstance, ResourceLocation resourceLocation, SkinModel model) {
 			this.isPresetSkin = false;
@@ -125,26 +125,32 @@ public class ServerSkinCache {
 
 	private final SkinCacheEntry defaultCacheEntry = new SkinCacheEntry(0);
 	private final SkinCacheEntry defaultSlimCacheEntry = new SkinCacheEntry(1);
-	private final Map<EaglercraftUUID, SkinCacheEntry> skinsCache = new HashMap();
-	private final Map<EaglercraftUUID, WaitingSkin> waitingSkins = new HashMap();
-	private final Map<EaglercraftUUID, Long> evictedSkins = new HashMap();
+	private final Map<EaglercraftUUID, SkinCacheEntry> skinsCache = new HashMap<>();
+	private final Map<EaglercraftUUID, WaitingSkin> waitingSkins = new HashMap<>();
+	private final Map<EaglercraftUUID, Long> evictedSkins = new HashMap<>();
 
-	private final EaglercraftNetworkManager networkManager;
+	private final NetHandlerPlayClient netHandler;
 	protected final TextureManager textureManager;
 	
 	private final EaglercraftUUID clientPlayerId;
-	private final SkinCacheEntry clientPlayerCacheEntry;
+	private SkinCacheEntry clientPlayerCacheEntry;
 
-	private long lastFlush = System.currentTimeMillis();
-	private long lastFlushReq = System.currentTimeMillis();
-	private long lastFlushEvict = System.currentTimeMillis();
+	private long lastFlush = EagRuntime.steadyTimeMillis();
+	private long lastFlushReq = EagRuntime.steadyTimeMillis();
+	private long lastFlushEvict = EagRuntime.steadyTimeMillis();
 
 	private static int texId = 0;
+	public static boolean needReloadClientSkin = false;
 
-	public ServerSkinCache(EaglercraftNetworkManager networkManager, TextureManager textureManager) {
-		this.networkManager = networkManager;
+	public ServerSkinCache(NetHandlerPlayClient netHandler, TextureManager textureManager) {
+		this.netHandler = netHandler;
 		this.textureManager = textureManager;
 		this.clientPlayerId = EaglerProfile.getPlayerUUID();
+		reloadClientPlayerSkin();
+	}
+
+	public void reloadClientPlayerSkin() {
+		needReloadClientSkin = false;
 		this.clientPlayerCacheEntry = new SkinCacheEntry(EaglerProfile.getActiveSkinResourceLocation(), EaglerProfile.getActiveSkinModel());
 	}
 
@@ -184,20 +190,12 @@ public class ServerSkinCache {
 		SkinCacheEntry etr = skinsCache.get(player);
 		if(etr == null) {
 			if(!waitingSkins.containsKey(player) && !evictedSkins.containsKey(player)) {
-				waitingSkins.put(player, new WaitingSkin(System.currentTimeMillis(), null));
-				PacketBuffer buffer;
-				try {
-					buffer = SkinPackets.writeGetOtherSkin(player);
-				}catch(IOException ex) {
-					logger.error("Could not write skin request packet!");
-					logger.error(ex);
-					return defaultCacheEntry;
-				}
-				networkManager.sendPacket(new C17PacketCustomPayload("EAG|Skins-1.8", buffer));
+				waitingSkins.put(player, new WaitingSkin(EagRuntime.steadyTimeMillis(), null));
+				netHandler.sendEaglerMessage(new CPacketGetOtherSkinEAG(player.msb, player.lsb));
 			}
 			return defaultCacheEntry;
 		}else {
-			etr.lastCacheHit = System.currentTimeMillis();
+			etr.lastCacheHit = EagRuntime.steadyTimeMillis();
 			return etr;
 		}
 	}
@@ -209,20 +207,12 @@ public class ServerSkinCache {
 		EaglercraftUUID generatedUUID = SkinPackets.createEaglerURLSkinUUID(url);
 		SkinCacheEntry etr = skinsCache.get(generatedUUID);
 		if(etr != null) {
-			etr.lastCacheHit = System.currentTimeMillis();
+			etr.lastCacheHit = EagRuntime.steadyTimeMillis();
 			return etr;
 		}else {
 			if(!waitingSkins.containsKey(generatedUUID) && !evictedSkins.containsKey(generatedUUID)) {
-				waitingSkins.put(generatedUUID, new WaitingSkin(System.currentTimeMillis(), skinModelResponse));
-				PacketBuffer buffer;
-				try {
-					buffer = SkinPackets.writeGetSkinByURL(generatedUUID, url);
-				}catch(IOException ex) {
-					logger.error("Could not write skin request packet!");
-					logger.error(ex);
-					return skinModelResponse == SkinModel.ALEX ? defaultSlimCacheEntry : defaultCacheEntry;
-				}
-				networkManager.sendPacket(new C17PacketCustomPayload("EAG|Skins-1.8", buffer));
+				waitingSkins.put(generatedUUID, new WaitingSkin(EagRuntime.steadyTimeMillis(), skinModelResponse));
+				netHandler.sendEaglerMessage(new CPacketGetSkinByURLEAG(generatedUUID.msb, generatedUUID.lsb, url));
 			}
 		}
 		return skinModelResponse == SkinModel.ALEX ? defaultSlimCacheEntry : defaultCacheEntry;
@@ -276,13 +266,13 @@ public class ServerSkinCache {
 	}
 	
 	public void flush() {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		if(millis - lastFlushReq > 5000l) {
 			lastFlushReq = millis;
 			if(!waitingSkins.isEmpty()) {
 				Iterator<WaitingSkin> waitingItr = waitingSkins.values().iterator();
 				while(waitingItr.hasNext()) {
-					if(millis - waitingItr.next().timeout > 30000l) {
+					if(millis - waitingItr.next().timeout > 20000l) {
 						waitingItr.remove();
 					}
 				}
@@ -312,6 +302,9 @@ public class ServerSkinCache {
 				}
 			}
 		}
+		if(needReloadClientSkin) {
+			reloadClientPlayerSkin();
+		}
 	}
 	
 	public void destroy() {
@@ -325,7 +318,14 @@ public class ServerSkinCache {
 	}
 	
 	public void evictSkin(EaglercraftUUID uuid) {
-		evictedSkins.put(uuid, Long.valueOf(System.currentTimeMillis()));
+		evictedSkins.put(uuid, Long.valueOf(EagRuntime.steadyTimeMillis()));
+		SkinCacheEntry etr = skinsCache.remove(uuid);
+		if(etr != null) {
+			etr.free();
+		}
+	}
+
+	public void handleInvalidate(EaglercraftUUID uuid) {
 		SkinCacheEntry etr = skinsCache.remove(uuid);
 		if(etr != null) {
 			etr.free();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinModel.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinModel.java
index d0d1d5f..7dbd147 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinModel.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinModel.java
@@ -32,7 +32,7 @@ public enum SkinModel {
 	public final HighPolySkin highPoly;
 	
 	public static final SkinModel[] skinModels = new SkinModel[8];
-	private static final Map<String, SkinModel> skinModelsByName = new HashMap();
+	private static final Map<String, SkinModel> skinModelsByName = new HashMap<>();
 	
 	private SkinModel(int id, int w, int h, String profileSkinType, boolean sanitize) {
 		this.id = id;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinPackets.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinPackets.java
index 8215fe1..0ad3526 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinPackets.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinPackets.java
@@ -1,12 +1,8 @@
 package net.lax1dude.eaglercraft.v1_8.profile;
 
-import java.io.IOException;
-
 import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.crypto.MD5Digest;
-import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
-import net.minecraft.network.PacketBuffer;
 
 /**
  * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
@@ -27,97 +23,33 @@ public class SkinPackets {
 
 	public static final int PACKET_MY_SKIN_PRESET = 0x01;
 	public static final int PACKET_MY_SKIN_CUSTOM = 0x02;
-	public static final int PACKET_GET_OTHER_SKIN = 0x03;
-	public static final int PACKET_OTHER_SKIN_PRESET = 0x04;
-	public static final int PACKET_OTHER_SKIN_CUSTOM = 0x05;
-	public static final int PACKET_GET_SKIN_BY_URL = 0x06;
-	public static final int PACKET_INSTALL_NEW_SKIN = 0x07;
-
-	public static void readPluginMessage(PacketBuffer buffer, ServerSkinCache skinCache) throws IOException {
-		try {
-			int type = (int)buffer.readByte() & 0xFF;
-			switch(type) {
-			case PACKET_OTHER_SKIN_PRESET: {
-				EaglercraftUUID responseUUID = buffer.readUuid();
-				int responsePreset = buffer.readInt();
-				if(buffer.isReadable()) {
-					throw new IOException("PACKET_OTHER_SKIN_PRESET had " + buffer.readableBytes() + " remaining bytes!");
-				}
-				skinCache.cacheSkinPreset(responseUUID, responsePreset);
-				break;
-			}
-			case PACKET_OTHER_SKIN_CUSTOM: {
-				EaglercraftUUID responseUUID = buffer.readUuid();
-				int model = (int)buffer.readByte() & 0xFF;
-				SkinModel modelId;
-				if(model == (byte)0xFF) {
-					modelId = skinCache.getRequestedSkinType(responseUUID);
-				}else {
-					modelId = SkinModel.getModelFromId(model & 0x7F);
-					if((model & 0x80) != 0 && modelId.sanitize) {
-						modelId = SkinModel.STEVE;
-					}
-				}
-				if(modelId.highPoly != null) {
-					modelId = SkinModel.STEVE;
-				}
-				int bytesToRead = modelId.width * modelId.height * 4;
-				byte[] readSkin = new byte[bytesToRead];
-				buffer.readBytes(readSkin);
-				if(buffer.isReadable()) {
-					throw new IOException("PACKET_MY_SKIN_CUSTOM had " + buffer.readableBytes() + " remaining bytes!");
-				}
-				skinCache.cacheSkinCustom(responseUUID, readSkin, modelId);
-				break;
-			}
-			default:
-				throw new IOException("Unknown skin packet type: " + type);
-			}
-		}catch(IOException ex) {
-			throw ex;
-		}catch(Throwable t) {
-			throw new IOException("Failed to parse skin packet!", t);
-		}
-	}
 
 	public static byte[] writeMySkinPreset(int skinId) {
 		return new byte[] { (byte) PACKET_MY_SKIN_PRESET, (byte) (skinId >>> 24), (byte) (skinId >>> 16),
 				(byte) (skinId >>> 8), (byte) (skinId & 0xFF) };
 	}
 
-	public static byte[] writeMySkinCustom(CustomSkin customSkin) {
-		byte[] packet = new byte[2 + customSkin.texture.length];
+	public static byte[] writeMySkinCustomV3(CustomSkin customSkin) {
+		byte[] packet = new byte[2 + 16384];
 		packet[0] = (byte) PACKET_MY_SKIN_CUSTOM;
 		packet[1] = (byte) customSkin.model.id;
-		System.arraycopy(customSkin.texture, 0, packet, 2, customSkin.texture.length);
+		System.arraycopy(customSkin.texture, 0, packet, 2, 16384);
 		return packet;
 	}
 
-	public static PacketBuffer writeCreateCustomSkull(byte[] customSkin) {
-		int len = 3 + customSkin.length;
-		PacketBuffer ret = new PacketBuffer(Unpooled.buffer(len, len));
-		ret.writeByte(PACKET_INSTALL_NEW_SKIN);
-		ret.writeShort(customSkin.length);
-		ret.writeBytes(customSkin);
-		return ret;
-	}
-
-	public static PacketBuffer writeGetOtherSkin(EaglercraftUUID skinId) throws IOException {
-		PacketBuffer ret = new PacketBuffer(Unpooled.buffer(17, 17));
-		ret.writeByte(PACKET_GET_OTHER_SKIN);
-		ret.writeUuid(skinId);
-		return ret;
-	}
-
-	public static PacketBuffer writeGetSkinByURL(EaglercraftUUID skinId, String skinUrl) throws IOException {
-		int len = 19 + skinUrl.length();
-		PacketBuffer ret = new PacketBuffer(Unpooled.buffer(len, len));
-		ret.writeByte(PACKET_GET_SKIN_BY_URL);
-		ret.writeUuid(skinId);
-		byte[] url = ArrayUtils.asciiString(skinUrl);
-		ret.writeShort((int)url.length);
-		ret.writeBytes(url);
-		return ret;
+	public static byte[] writeMySkinCustomV4(CustomSkin customSkin) {
+		byte[] packet = new byte[2 + 12288];
+		packet[0] = (byte) PACKET_MY_SKIN_CUSTOM;
+		packet[1] = (byte) customSkin.model.id;
+		byte[] v3data = customSkin.texture;
+		for(int i = 0, j, k; i < 4096; ++i) {
+			j = i << 2;
+			k = i * 3 + 2;
+			packet[k] = v3data[j + 1];
+			packet[k + 1] = v3data[j + 2];
+			packet[k + 2] = (byte)((v3data[j + 3] >>> 1) | (v3data[j] & 0x80));
+		}
+		return packet;
 	}
 
 	public static EaglercraftUUID createEaglerURLSkinUUID(String skinUrl){
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinPreviewRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinPreviewRenderer.java
index b70a768..90a39d5 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinPreviewRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/SkinPreviewRenderer.java
@@ -1,5 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.profile;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglerMeshLoader;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
@@ -98,7 +99,7 @@ public class SkinPreviewRenderer {
 			Minecraft.getMinecraft().getTextureManager().bindTexture(skinTexture);
 		}
 		
-		model.render(null, 0.0f, 0.0f, (float)(System.currentTimeMillis() % 2000000) / 50f, ((x - mx) * 0.06f), ((y - my) * -0.1f), 0.0625f);
+		model.render(null, 0.0f, 0.0f, (float)(EagRuntime.steadyTimeMillis() % 2000000) / 50f, ((x - mx) * 0.06f), ((y - my) * -0.1f), 0.0625f);
 		
 		if(capeTexture != null && model instanceof ModelPlayer) {
 			Minecraft.getMinecraft().getTextureManager().bindTexture(capeTexture);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/EnumScreenRecordingCodec.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/EnumScreenRecordingCodec.java
new file mode 100755
index 0000000..bcb9e3e
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/EnumScreenRecordingCodec.java
@@ -0,0 +1,152 @@
+package net.lax1dude.eaglercraft.v1_8.recording;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumScreenRecordingCodec {
+
+	CODEC_MP4_H264_GENERIC_AAC("MP4 (video: H.264 Default, audio: AAC LC)", "mp4", "video/mp4", "avc1", "mp4a.40.2", false),
+	CODEC_MP4_H264_GENERIC_OPUS("MP4 (video: H.264 Default, audio: Opus)", "mp4", "video/mp4", "avc1", "opus", false),
+	CODEC_MP4_H264_L40_AAC("MP4 (video: H.264 CBP L4.0, audio: AAC LC)", "mp4", "video/mp4", "avc1.424028", "mp4a.40.2", true),
+	CODEC_MP4_H264_L40_OPUS("MP4 (video: H.264 CBP L4.0, audio: Opus)", "mp4", "video/mp4", "avc1.424028", "opus", true),
+	CODEC_MP4_H264_L42_AAC("MP4 (video: H.264 CBP L4.2, audio: AAC LC)", "mp4", "video/mp4", "avc1.42402A", "mp4a.40.2", true),
+	CODEC_MP4_H264_L42_OPUS("MP4 (video: H.264 CBP L4.2, audio: Opus)", "mp4", "video/mp4", "avc1.42402A", "opus", true),
+	CODEC_MP4_H264_L50_AAC("MP4 (video: H.264 CBP L5.0, audio: AAC LC)", "mp4", "video/mp4", "avc1.424032", "mp4a.40.2", true),
+	CODEC_MP4_H264_L50_OPUS("MP4 (video: H.264 CBP L5.0, audio: Opus)", "mp4", "video/mp4", "avc1.424032", "opus", true),
+	CODEC_MP4_H264_L52_AAC("MP4 (video: H.264 CBP L5.2, audio: AAC LC)", "mp4", "video/mp4", "avc1.424034", "mp4a.40.2", true),
+	CODEC_MP4_H264_L52_OPUS("MP4 (video: H.264 CBP L5.2, audio: Opus)", "mp4", "video/mp4", "avc1.424034", "opus", true),
+
+	CODEC_MP4_VP9_GENERIC_AAC("MP4 (video: VP9 Default, audio: AAC LC)", "mp4", "video/mp4", "vp9", "mp4a.40.2", false),
+	CODEC_MP4_VP9_GENERIC_OPUS("MP4 (video: VP9 Default, audio: Opus)", "mp4", "video/mp4", "vp9", "opus", false),
+	CODEC_MP4_VP9_L40_AAC("MP4 (video: VP9 8-bit L4.0, audio: AAC LC)", "mp4", "video/mp4", "vp9.00.40.08", "mp4a.40.2", true),
+	CODEC_MP4_VP9_L40_OPUS("MP4 (video: VP9 8-bit L4.0, audio: Opus)", "mp4", "video/mp4", "vp9.00.40.08", "opus", true),
+	CODEC_MP4_VP9_L41_AAC("MP4 (video: VP9 8-bit L4.1, audio: AAC LC)", "mp4", "video/mp4", "vp9.00.41.08", "mp4a.40.2", true),
+	CODEC_MP4_VP9_L41_OPUS("MP4 (video: VP9 8-bit L4.1, audio: Opus)", "mp4", "video/mp4", "vp9.00.41.08", "opus", true),
+	CODEC_MP4_VP9_L50_AAC("MP4 (video: VP9 8-bit L5.0, audio: AAC LC)", "mp4", "video/mp4", "vp9.00.50.08", "mp4a.40.2", true),
+	CODEC_MP4_VP9_L50_OPUS("MP4 (video: VP9 8-bit L5.0, audio: Opus)", "mp4", "video/mp4", "vp9.00.50.08", "opus", true),
+	CODEC_MP4_VP9_L51_AAC("MP4 (video: VP9 8-bit L5.1, audio: AAC LC)", "mp4", "video/mp4", "vp9.00.51.08", "mp4a.40.2", true),
+	CODEC_MP4_VP9_L51_OPUS("MP4 (video: VP9 8-bit L5.1, audio: Opus)", "mp4", "video/mp4", "vp9.00.51.08", "opus", true),
+
+	CODEC_MP4_GENERIC("MP4 (Default Codecs)", "mp4", "video/mp4", null, null, false),
+
+	CODEC_WEBM_H264_GENERIC_OPUS("WEBM (video: H.264 Default, audio: Opus)", "webm", "video/webm", "avc1", "opus", false),
+	CODEC_WEBM_H264_GENERIC_VORBIS("WEBM (video: H.264 Default, audio: Vorbis)", "webm", "video/webm", "avc1", "vorbis", false),
+	CODEC_WEBM_H264_L40_OPUS("WEBM (video: H.264 CBP L4.0, audio: Opus)", "webm", "video/webm", "avc1.424028", "opus", true),
+	CODEC_WEBM_H264_L40_VORBIS("WEBM (video: H.264 CBP L4.0, audio: Vorbis)", "webm", "video/webm", "avc1.424028", "vorbis", true),
+	CODEC_WEBM_H264_L42_OPUS("WEBM (video: H.264 CBP L4.2, audio: Opus)", "webm", "video/webm", "avc1.42402A", "opus", true),
+	CODEC_WEBM_H264_L42_VORBIS("WEBM (video: H.264 CBP L4.2, audio: Vorbis)", "webm", "video/webm", "avc1.42402A", "vorbis", true),
+	CODEC_WEBM_H264_L50_OPUS("WEBM (video: H.264 CBP L5.0, audio: Opus)", "webm", "video/webm", "avc1.424032", "opus", true),
+	CODEC_WEBM_H264_L50_VORBIS("WEBM (video: H.264 CBP L5.0, audio: Vorbis)", "webm", "video/webm", "avc1.424032", "vorbis", true),
+	CODEC_WEBM_H264_L52_OPUS("WEBM (video: H.264 CBP L5.2, audio: Opus)", "webm", "video/webm", "avc1.424034", "opus", true),
+	CODEC_WEBM_H264_L52_VORBIS("WEBM (video: H.264 CBP L5.2, audio: Vorbis)", "webm", "video/webm", "avc1.424034", "vorbis", true),
+
+	CODEC_WEBM_VP9_GENERIC_OPUS("WEBM (video: VP9 Default, audio: Opus)", "webm", "video/webm", "vp9", "opus", false),
+	CODEC_WEBM_VP9_GENERIC_VORBIS("WEBM (video: VP9 Default, audio: Vorbis)", "webm", "video/webm", "vp9", "vorbis", false),
+	CODEC_WEBM_VP9_L40_OPUS("WEBM (video: VP9 8-bit L4.0, audio: Opus)", "webm", "video/webm", "vp9.00.40.08", "opus", true),
+	CODEC_WEBM_VP9_L40_VORBIS("WEBM (video: VP9 8-bit L4.0, audio: Vorbis)", "webm", "video/webm", "vp9.00.40.08", "vorbis", true),
+	CODEC_WEBM_VP9_L41_OPUS("WEBM (video: VP9 8-bit L4.1, audio: Opus)", "webm", "video/webm", "vp9.00.41.08", "opus", true),
+	CODEC_WEBM_VP9_L41_VORBIS("WEBM (video: VP9 8-bit L4.1, audio: Vorbis)", "webm", "video/webm", "vp9.00.41.08", "vorbis", true),
+	CODEC_WEBM_VP9_L50_OPUS("WEBM (video: VP9 8-bit L5.0, audio: Opus)", "webm", "video/webm", "vp9.00.50.08", "opus", true),
+	CODEC_WEBM_VP9_L50_VORBIS("WEBM (video: VP9 8-bit L5.0, audio: Vorbis)", "webm", "video/webm", "vp9.00.50.08", "vorbis", true),
+	CODEC_WEBM_VP9_L51_OPUS("WEBM (video: VP9 8-bit L5.1, audio: Opus)", "webm", "video/webm", "vp9.00.51.08", "opus", true),
+	CODEC_WEBM_VP9_L51_VORBIS("WEBM (video: VP9 8-bit L5.1, audio: Vorbis)", "webm", "video/webm", "vp9.00.51.08", "vorbis", true),
+
+	CODEC_WEBM_VP8_GENERIC_OPUS("WEBM (video: VP8 Default, audio: Opus)", "webm", "video/webm", "vp8", "opus", false),
+	CODEC_WEBM_VP8_GENERIC_VORBIS("WEBM (video: VP8 Default, audio: Vorbis)", "webm", "video/webm", "vp8", "vorbis", false),
+
+	CODEC_WEBM_GENERIC("WEBM (Default Codecs)", "webm", "video/webm", null, null, false);
+
+	public static final EnumScreenRecordingCodec[] preferred_codec_order = new EnumScreenRecordingCodec[] {
+			CODEC_MP4_H264_GENERIC_AAC,
+			CODEC_MP4_H264_L52_AAC,
+			CODEC_MP4_H264_L50_AAC,
+			CODEC_MP4_H264_L42_AAC,
+			CODEC_MP4_H264_L40_AAC,
+			CODEC_MP4_H264_GENERIC_OPUS,
+			CODEC_MP4_H264_L40_OPUS,
+			CODEC_MP4_H264_L42_OPUS,
+			CODEC_MP4_H264_L50_OPUS,
+			CODEC_MP4_H264_L52_OPUS,
+			CODEC_WEBM_H264_GENERIC_OPUS,
+			CODEC_WEBM_H264_L52_OPUS,
+			CODEC_WEBM_H264_L50_OPUS,
+			CODEC_WEBM_H264_L42_OPUS,
+			CODEC_WEBM_H264_L40_OPUS,
+			CODEC_WEBM_H264_GENERIC_VORBIS,
+			CODEC_WEBM_H264_L52_VORBIS,
+			CODEC_WEBM_H264_L50_VORBIS,
+			CODEC_WEBM_H264_L42_VORBIS,
+			CODEC_WEBM_H264_L40_VORBIS,
+			CODEC_MP4_VP9_GENERIC_AAC,
+			CODEC_MP4_VP9_L51_AAC,
+			CODEC_MP4_VP9_L50_AAC,
+			CODEC_MP4_VP9_L41_AAC,
+			CODEC_MP4_VP9_L40_AAC,
+			CODEC_MP4_VP9_GENERIC_OPUS,
+			CODEC_MP4_VP9_L51_OPUS,
+			CODEC_MP4_VP9_L50_OPUS,
+			CODEC_MP4_VP9_L41_OPUS,
+			CODEC_MP4_VP9_L40_OPUS,
+			CODEC_WEBM_VP9_GENERIC_OPUS,
+			CODEC_WEBM_VP9_L51_OPUS,
+			CODEC_WEBM_VP9_L50_OPUS,
+			CODEC_WEBM_VP9_L41_OPUS,
+			CODEC_WEBM_VP9_L40_OPUS,
+			CODEC_WEBM_VP9_GENERIC_VORBIS,
+			CODEC_WEBM_VP9_L51_VORBIS,
+			CODEC_WEBM_VP9_L50_VORBIS,
+			CODEC_WEBM_VP9_L41_VORBIS,
+			CODEC_WEBM_VP9_L40_VORBIS,
+			CODEC_WEBM_VP8_GENERIC_OPUS,
+			CODEC_WEBM_VP8_GENERIC_VORBIS,
+			CODEC_MP4_GENERIC,
+			CODEC_WEBM_GENERIC
+	};
+
+	public final String name;
+	public final String fileExt;
+	public final String container;
+	public final String videoCodec;
+	public final String audioCodec;
+	public final boolean advanced;
+	public final String mimeType;
+	
+	private EnumScreenRecordingCodec(String name, String fileExt, String container, String videoCodec, String audioCodec, boolean advanced) {
+		this.name = name;
+		this.fileExt = fileExt;
+		this.container = container;
+		this.videoCodec = videoCodec;
+		this.audioCodec = audioCodec;
+		this.advanced = advanced;
+		if(videoCodec != null || audioCodec != null) {
+			StringBuilder mimeBuilder = new StringBuilder(container);
+			mimeBuilder.append(";codecs=\"");
+			if(videoCodec != null) {
+				mimeBuilder.append(videoCodec);
+				if(audioCodec != null) {
+					mimeBuilder.append(',');
+				}
+			}
+			if(audioCodec != null) {
+				mimeBuilder.append(audioCodec);
+			}
+			mimeBuilder.append("\"");
+			this.mimeType = mimeBuilder.toString();
+		}else {
+			this.mimeType = container;
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiScreenRecordingNote.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiScreenRecordingNote.java
new file mode 100755
index 0000000..ab37074
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiScreenRecordingNote.java
@@ -0,0 +1,52 @@
+package net.lax1dude.eaglercraft.v1_8.recording;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenRecordingNote extends GuiScreen {
+
+	private GuiScreen cont;
+
+	public static boolean hasShown = false;
+
+	public GuiScreenRecordingNote(GuiScreen cont) {
+		this.cont = cont;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 108, I18n.format("gui.done")));
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, I18n.format("options.recordingNote.title"), this.width / 2, 70, 11184810);
+		this.drawCenteredString(fontRendererObj, I18n.format("options.recordingNote.text0"), this.width / 2, 90, 16777215);
+		this.drawCenteredString(fontRendererObj, I18n.format("options.recordingNote.text1"), this.width / 2, 102, 16777215);
+		super.drawScreen(par1, par2, par3);
+	}
+
+	protected void actionPerformed(GuiButton par1GuiButton) {
+		if(par1GuiButton.id == 0) {
+			hasShown = true;
+			this.mc.displayGuiScreen(cont);
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiScreenRecordingSettings.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiScreenRecordingSettings.java
new file mode 100755
index 0000000..2f810af
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiScreenRecordingSettings.java
@@ -0,0 +1,201 @@
+package net.lax1dude.eaglercraft.v1_8.recording;
+
+import net.lax1dude.eaglercraft.v1_8.HString;
+import net.lax1dude.eaglercraft.v1_8.internal.ScreenRecordParameters;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
+import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiSlider2;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.MathHelper;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenRecordingSettings extends GuiScreen {
+
+	private static final Logger logger = LogManager.getLogger("GuiScreenRecordingSettings");
+
+	protected final GuiScreen parent;
+
+	protected GuiButton recordButton;
+	protected GuiButton codecButton;
+	protected GuiSlider2 videoResolutionSlider;
+	protected GuiSlider2 videoFrameRateSlider;
+	protected GuiSlider2 audioBitrateSlider;
+	protected GuiSlider2 videoBitrateSlider;
+	protected GuiSlider2 microphoneVolumeSlider;
+	protected GuiSlider2 gameVolumeSlider;
+	protected boolean dirty = false;
+
+	public GuiScreenRecordingSettings(GuiScreen parent) {
+		this.parent = parent;
+	}
+
+	public void initGui() {
+		buttonList.clear();
+		buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 168, I18n.format("gui.done")));
+		buttonList.add(codecButton = new GuiButton(1, this.width / 2 + 65, this.height / 6 - 2, 75, 20, I18n.format("options.screenRecording.codecButton")));
+		boolean isRecording = ScreenRecordingController.isRecording();
+		buttonList.add(recordButton = new GuiButton(2, this.width / 2 + 15, this.height / 6 + 28, 125, 20,
+				I18n.format(isRecording ? "options.screenRecording.stop" : "options.screenRecording.start")));
+		buttonList.add(videoResolutionSlider = new GuiSlider2(3, this.width / 2 - 155, this.height / 6 + 64, 150, 20, (mc.gameSettings.screenRecordResolution - 1) / 3.999f, 1.0f) {
+			@Override
+			protected String updateDisplayString() {
+				int i = (int)(sliderValue * 3.999f);
+				return I18n.format("options.screenRecording.videoResolution") + ": x" + HString.format("%.2f", 1.0f / (int)Math.pow(2.0, i));
+			}
+			@Override
+			protected void onChange() {
+				mc.gameSettings.screenRecordResolution = 1 + (int)(sliderValue * 3.999f);
+				dirty = true;
+			}
+		});
+		buttonList.add(videoFrameRateSlider = new GuiSlider2(4, this.width / 2 + 5, this.height / 6 + 64, 150, 20, (Math.max(mc.gameSettings.screenRecordFPS, 9) - 9) / 51.999f, 1.0f) {
+			@Override
+			protected String updateDisplayString() {
+				int i = (int)(sliderValue * 51.999f);
+				return I18n.format("options.screenRecording.videoFPS") + ": " + (i <= 0 ? I18n.format("options.screenRecording.onVSync") : 9 + i);
+			}
+			@Override
+			protected void onChange() {
+				int i = (int)(sliderValue * 51.999f);
+				mc.gameSettings.screenRecordFPS = i <= 0 ? -1 : 9 + i;
+				dirty = true;
+			}
+		});
+		buttonList.add(videoBitrateSlider = new GuiSlider2(5, this.width / 2 - 155, this.height / 6 + 98, 150, 20, MathHelper.sqrt_float(MathHelper.clamp_float((mc.gameSettings.screenRecordVideoBitrate - 250) / 19750.999f, 0.0f, 1.0f)), 1.0f) {
+			@Override
+			protected String updateDisplayString() {
+				return I18n.format("options.screenRecording.videoBitrate") + ": " + (250 + (int)(sliderValue * sliderValue * 19750.999f)) + "kbps";
+			}
+			@Override
+			protected void onChange() {
+				mc.gameSettings.screenRecordVideoBitrate = 250 + (int)(sliderValue * sliderValue * 19750.999f);
+				dirty = true;
+			}
+		});
+		buttonList.add(audioBitrateSlider = new GuiSlider2(6, this.width / 2 + 5, this.height / 6 + 98, 150, 20, MathHelper.sqrt_float(MathHelper.clamp_float((mc.gameSettings.screenRecordAudioBitrate - 24) / 232.999f, 0.0f, 1.0f)), 1.0f) {
+			@Override
+			protected String updateDisplayString() {
+				return I18n.format("options.screenRecording.audioBitrate") + ": " + (24 + (int)(sliderValue * sliderValue * 232.999f)) + "kbps";
+			}
+			@Override
+			protected void onChange() {
+				mc.gameSettings.screenRecordAudioBitrate = 24 + (int)(sliderValue * sliderValue * 232.999f);
+				dirty = true;
+			}
+		});
+		buttonList.add(gameVolumeSlider = new GuiSlider2(7, this.width / 2 - 155, this.height / 6 + 130, 150, 20, mc.gameSettings.screenRecordGameVolume, 1.0f) {
+			@Override
+			protected String updateDisplayString() {
+				return I18n.format("options.screenRecording.gameVolume") + ": " + (int)(sliderValue * 100.999f) + "%";
+			}
+			@Override
+			protected void onChange() {
+				mc.gameSettings.screenRecordGameVolume = sliderValue;
+				ScreenRecordingController.setGameVolume(sliderValue);
+				dirty = true;
+			}
+		});
+		buttonList.add(microphoneVolumeSlider = new GuiSlider2(8, this.width / 2 + 5, this.height / 6 + 130, 150, 20, mc.gameSettings.screenRecordMicVolume, 1.0f) {
+			@Override
+			protected String updateDisplayString() {
+				return I18n.format("options.screenRecording.microphoneVolume") + ": " + (int)(sliderValue * 100.999f) + "%";
+			}
+			@Override
+			protected void onChange() {
+				mc.gameSettings.screenRecordMicVolume = sliderValue;
+				ScreenRecordingController.setMicrophoneVolume(sliderValue);
+				dirty = true;
+			}
+		});
+		codecButton.enabled = !isRecording;
+		videoResolutionSlider.enabled = !isRecording;
+		videoFrameRateSlider.enabled = !isRecording;
+		audioBitrateSlider.enabled = !isRecording;
+		videoBitrateSlider.enabled = !isRecording;
+		microphoneVolumeSlider.enabled = !ScreenRecordingController.isMicVolumeLocked();
+	}
+
+	protected void actionPerformed(GuiButton parGuiButton) {
+		if(parGuiButton.id == 0) {
+			if(dirty) {
+				mc.gameSettings.saveOptions();
+				dirty = false;
+			}
+			mc.displayGuiScreen(parent);
+		}else if(parGuiButton.id == 1) {
+			mc.displayGuiScreen(new GuiScreenSelectCodec(this, mc.gameSettings.screenRecordCodec));
+		}else if(parGuiButton.id == 2) {
+			if(!ScreenRecordingController.isRecording()) {
+				try {
+					ScreenRecordingController.startRecording(new ScreenRecordParameters(mc.gameSettings.screenRecordCodec,
+							mc.gameSettings.screenRecordResolution, mc.gameSettings.screenRecordVideoBitrate,
+							mc.gameSettings.screenRecordAudioBitrate, mc.gameSettings.screenRecordFPS));
+				}catch(Throwable t) {
+					logger.error("Failed to begin screen recording!");
+					logger.error(t);
+					mc.displayGuiScreen(new GuiScreenGenericErrorMessage("options.screenRecording.failed", t.toString(), parent));
+				}
+			}else {
+				ScreenRecordingController.endRecording();
+			}
+		}
+	}
+
+	public void drawScreen(int i, int j, float var3) {
+		drawDefaultBackground();
+		drawCenteredString(fontRendererObj, I18n.format("options.screenRecording.title"), this.width / 2, 15, 16777215);
+		if(mc.gameSettings.screenRecordCodec == null) {
+			mc.gameSettings.screenRecordCodec = ScreenRecordingController.getDefaultCodec();
+		}
+		
+		String codecString = mc.gameSettings.screenRecordCodec.name;
+		int codecStringWidth = fontRendererObj.getStringWidth(codecString);
+		drawString(fontRendererObj, codecString, this.width / 2 + 60 - codecStringWidth, this.height / 6 + 4, 0xFFFFFF);
+		
+		boolean isRecording = ScreenRecordingController.isRecording();
+		codecButton.enabled = !isRecording;
+		videoResolutionSlider.enabled = !isRecording;
+		videoFrameRateSlider.enabled = !isRecording;
+		audioBitrateSlider.enabled = !isRecording;
+		videoBitrateSlider.enabled = !isRecording;
+		microphoneVolumeSlider.enabled = !ScreenRecordingController.isMicVolumeLocked();
+		recordButton.displayString = I18n.format(isRecording ? "options.screenRecording.stop" : "options.screenRecording.start");
+		String statusString = I18n.format("options.screenRecording.status",
+				(isRecording ? EnumChatFormatting.GREEN : EnumChatFormatting.RED) + I18n.format(isRecording ? "options.screenRecording.status.1" : "options.screenRecording.status.0"));
+		int statusStringWidth = fontRendererObj.getStringWidth(statusString);
+		drawString(fontRendererObj, statusString, this.width / 2 + 10 - statusStringWidth, this.height / 6 + 34, 0xFFFFFF);
+		
+		super.drawScreen(i, j, var3);
+	}
+
+	protected void handleCodecCallback(EnumScreenRecordingCodec codec) {
+		EnumScreenRecordingCodec oldCodec = mc.gameSettings.screenRecordCodec;
+		if(ScreenRecordingController.codecs.contains(codec)) {
+			mc.gameSettings.screenRecordCodec = codec;
+		}else {
+			mc.gameSettings.screenRecordCodec = ScreenRecordingController.getDefaultCodec();
+		}
+		if(oldCodec != mc.gameSettings.screenRecordCodec) {
+			dirty = true;
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiScreenSelectCodec.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiScreenSelectCodec.java
new file mode 100755
index 0000000..32d67de
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiScreenSelectCodec.java
@@ -0,0 +1,92 @@
+package net.lax1dude.eaglercraft.v1_8.recording;
+
+import java.io.IOException;
+import java.util.List;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenSelectCodec extends GuiScreen {
+
+	protected final GuiScreenRecordingSettings parent;
+	protected List<EnumScreenRecordingCodec> codecs;
+	protected int selectedCodec;
+	protected GuiSlotSelectCodec slots;
+	protected GuiButton showAllButton;
+	protected boolean showAll;
+	protected EnumScreenRecordingCodec codec;
+
+	public GuiScreenSelectCodec(GuiScreenRecordingSettings parent, EnumScreenRecordingCodec codec) {
+		this.parent = parent;
+		this.codec = codec;
+	}
+
+	public void initGui() {
+		showAll = codec.advanced;
+		codecs = showAll ? ScreenRecordingController.advancedCodecsOrdered : ScreenRecordingController.simpleCodecsOrdered;
+		selectedCodec = codecs.indexOf(codec);
+		buttonList.clear();
+		buttonList.add(showAllButton = new GuiButton(0, this.width / 2 - 154, this.height - 38, 150, 20,
+				I18n.format("options.recordingCodec.showAdvancedCodecs", I18n.format(showAll ? "gui.yes" : "gui.no"))));
+		buttonList.add(new GuiButton(1, this.width / 2 + 4, this.height - 38, 150, 20, I18n.format("gui.done")));
+		slots = new GuiSlotSelectCodec(this, 32, height - 45);
+	}
+
+	protected void actionPerformed(GuiButton parGuiButton) {
+		if(parGuiButton.id == 0) {
+			changeStateShowAll(!showAll);
+			showAllButton.displayString = I18n.format("options.recordingCodec.showAdvancedCodecs", I18n.format(showAll ? "gui.yes" : "gui.no"));
+		}else if(parGuiButton.id == 1) {
+			if(selectedCodec >= 0 && selectedCodec < codecs.size()) {
+				parent.handleCodecCallback(codecs.get(selectedCodec));
+			}
+			mc.displayGuiScreen(parent);
+		}
+	}
+
+	protected void changeStateShowAll(boolean newShowAll) {
+		if(newShowAll == showAll) return;
+		EnumScreenRecordingCodec oldCodec = codecs.get(selectedCodec >= 0 && selectedCodec < codecs.size() ? selectedCodec : 0);
+		codecs = newShowAll ? ScreenRecordingController.advancedCodecsOrdered : ScreenRecordingController.simpleCodecsOrdered;
+		showAll = newShowAll;
+		selectedCodec = codecs.indexOf(oldCodec);
+	}
+
+	public void drawScreen(int i, int j, float var3) {
+		slots.drawScreen(i, j, var3);
+		this.drawCenteredString(this.fontRendererObj, I18n.format("options.recordingCodec.title"), this.width / 2, 16, 16777215);
+		super.drawScreen(i, j, var3);
+	}
+
+	public void handleMouseInput() throws IOException {
+		super.handleMouseInput();
+		slots.handleMouseInput();
+	}
+
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		slots.handleTouchInput();
+	}
+
+	static Minecraft getMC(GuiScreenSelectCodec screen) {
+		return screen.mc;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiSlotSelectCodec.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiSlotSelectCodec.java
new file mode 100755
index 0000000..3e2575b
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/GuiSlotSelectCodec.java
@@ -0,0 +1,58 @@
+package net.lax1dude.eaglercraft.v1_8.recording;
+
+import net.minecraft.client.gui.GuiSlot;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiSlotSelectCodec extends GuiSlot {
+
+	protected final GuiScreenSelectCodec screen;
+
+	public GuiSlotSelectCodec(GuiScreenSelectCodec screen, int topIn, int bottomIn) {
+		super(GuiScreenSelectCodec.getMC(screen), screen.width, screen.height, topIn, bottomIn, 18);
+		this.screen = screen;
+	}
+
+	@Override
+	protected int getSize() {
+		return screen.codecs.size();
+	}
+
+	@Override
+	protected void elementClicked(int var1, boolean var2, int var3, int var4) {
+		if(var1 < screen.codecs.size()) {
+			screen.selectedCodec = var1;
+		}
+	}
+
+	@Override
+	protected boolean isSelected(int var1) {
+		return screen.selectedCodec == var1;
+	}
+
+	@Override
+	protected void drawBackground() {
+		screen.drawDefaultBackground();
+	}
+
+	@Override
+	protected void drawSlot(int id, int xx, int yy, int width, int height, int ii) {
+		if(id < screen.codecs.size()) {
+			this.screen.drawString(mc.fontRendererObj, screen.codecs.get(id).name, xx + 4, yy + 3, 0xFFFFFF);
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/ScreenRecordingController.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/ScreenRecordingController.java
new file mode 100755
index 0000000..cf805c6
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/recording/ScreenRecordingController.java
@@ -0,0 +1,99 @@
+package net.lax1dude.eaglercraft.v1_8.recording;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformScreenRecord;
+import net.lax1dude.eaglercraft.v1_8.internal.ScreenRecordParameters;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ScreenRecordingController {
+
+	public static final int DEFAULT_FPS = 30;
+	public static final int DEFAULT_RESOLUTION = 1;
+	public static final int DEFAULT_AUDIO_BITRATE = 120;
+	public static final int DEFAULT_VIDEO_BITRATE = 2500;
+	public static final float DEFAULT_GAME_VOLUME = 1.0f;
+	public static final float DEFAULT_MIC_VOLUME = 0.0f;
+
+	public static final List<EnumScreenRecordingCodec> simpleCodecsOrdered = new ArrayList<>();
+	public static final List<EnumScreenRecordingCodec> advancedCodecsOrdered = new ArrayList<>();
+	public static final Set<EnumScreenRecordingCodec> codecs = new HashSet<>();
+	private static boolean supported = false;
+
+	public static void initialize() {
+		simpleCodecsOrdered.clear();
+		advancedCodecsOrdered.clear();
+		codecs.clear();
+		supported = PlatformScreenRecord.isSupported();
+		if(supported) {
+			EnumScreenRecordingCodec[] codecsOrdered = EnumScreenRecordingCodec.preferred_codec_order;
+			for(int i = 0; i < codecsOrdered.length; ++i) {
+				EnumScreenRecordingCodec codec = codecsOrdered[i];
+				if(PlatformScreenRecord.isCodecSupported(codec)) {
+					if(!codec.advanced) {
+						simpleCodecsOrdered.add(codec);
+					}
+					advancedCodecsOrdered.add(codec);
+					codecs.add(codec);
+				}
+			}
+		}
+		if(codecs.isEmpty()) {
+			supported = false;
+		}
+	}
+
+	public static boolean isSupported() {
+		return supported;
+	}
+
+	public static void setGameVolume(float volume) {
+		PlatformScreenRecord.setGameVolume(volume);
+	}
+
+	public static void setMicrophoneVolume(float volume) {
+		PlatformScreenRecord.setMicrophoneVolume(volume);
+	}
+
+	public static void startRecording(ScreenRecordParameters params) {
+		PlatformScreenRecord.startRecording(params);
+	}
+
+	public static void endRecording() {
+		PlatformScreenRecord.endRecording();
+	}
+
+	public static boolean isRecording() {
+		return PlatformScreenRecord.isRecording();
+	}
+
+	public static boolean isMicVolumeLocked() {
+		return PlatformScreenRecord.isMicVolumeLocked();
+	}
+
+	public static boolean isVSyncLocked() {
+		return PlatformScreenRecord.isVSyncLocked();
+	}
+
+	public static EnumScreenRecordingCodec getDefaultCodec() {
+		return simpleCodecsOrdered.isEmpty() ? (advancedCodecsOrdered.isEmpty() ? null : advancedCodecsOrdered.get(0)) : simpleCodecsOrdered.get(0);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java
index ddee305..2fdf6dc 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java
@@ -4,14 +4,22 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
+import net.lax1dude.eaglercraft.v1_8.PauseMenuCustomizeState;
 import net.lax1dude.eaglercraft.v1_8.crypto.SHA256Digest;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformNetworking;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketClient;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketFrame;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
@@ -42,20 +50,40 @@ import net.minecraft.util.IChatComponent;
  */
 public class ConnectionHandshake {
 
-	private static final long baseTimeout = 15000l;
+	private static final long baseTimeout = 10000l;
 
 	private static final int protocolV2 = 2;
 	private static final int protocolV3 = 3;
+	private static final int protocolV4 = 4;
 	
 	private static final Logger logger = LogManager.getLogger();
 
 	public static String pluginVersion = null;
 	public static String pluginBrand = null;
+	public static int protocolVersion = -1;
 	
-	public static boolean attemptHandshake(Minecraft mc, GuiConnecting connecting, GuiScreen ret, String password, boolean allowPlaintext) {
+	public static byte[] getSPHandshakeProtocolData() {
 		try {
+			EaglerOutputStream bao = new EaglerOutputStream();
+			DataOutputStream d = new DataOutputStream(bao);
+			d.writeShort(3); // supported eagler protocols count
+			d.writeShort(protocolV2); // client supports v2
+			d.writeShort(protocolV3); // client supports v3
+			d.writeShort(protocolV4); // client supports v4
+			return bao.toByteArray();
+		}catch(IOException ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+	
+	public static boolean attemptHandshake(Minecraft mc, IWebSocketClient client, GuiConnecting connecting,
+			GuiScreen ret, String password, boolean allowPlaintext, boolean enableCookies, byte[] cookieData) {
+		try {
+			EaglerProfile.clearServerSkinOverride();
+			PauseMenuCustomizeState.reset();
 			pluginVersion = null;
 			pluginBrand = null;
+			protocolVersion = -1;
 			EaglerOutputStream bao = new EaglerOutputStream();
 			DataOutputStream d = new DataOutputStream(bao);
 			
@@ -63,9 +91,7 @@ public class ConnectionHandshake {
 			
 			d.writeByte(2); // legacy protocol version
 			
-			d.writeShort(2); // supported eagler protocols count
-			d.writeShort(protocolV2); // client supports v2
-			d.writeShort(protocolV3); // client supports v3
+			d.write(getSPHandshakeProtocolData()); // write supported eagler protocol versions
 
 			d.writeShort(1); // supported game protocols count
 			d.writeShort(47); // client supports 1.8 protocol
@@ -84,9 +110,9 @@ public class ConnectionHandshake {
 			d.writeByte(username.length());
 			d.writeBytes(username);
 			
-			PlatformNetworking.writePlayPacket(bao.toByteArray());
+			client.send(bao.toByteArray());
 			
-			byte[] read = awaitNextPacket(baseTimeout);
+			byte[] read = awaitNextPacket(client, baseTimeout);
 			if(read == null) {
 				logger.error("Read timed out while waiting for server protocol response!");
 				return false;
@@ -115,7 +141,7 @@ public class ConnectionHandshake {
 					games.append("mc").append(di.readShort());
 				}
 				
-				logger.info("Incompatible client: v2 & mc47");
+				logger.info("Incompatible client: v2/v3/v4 & mc47");
 				logger.info("Server supports: {}", protocols);
 				logger.info("Server supports: {}", games);
 				
@@ -128,11 +154,11 @@ public class ConnectionHandshake {
 				
 				return false;
 			}else if(type == HandshakePacketTypes.PROTOCOL_SERVER_VERSION) {
-				int serverVers = di.readShort();
+				protocolVersion = di.readShort();
 				
-				if(serverVers != protocolV2 && serverVers != protocolV3) {
-					logger.info("Incompatible server version: {}", serverVers);
-					mc.displayGuiScreen(new GuiDisconnected(ret, "connect.failed", new ChatComponentText(serverVers < protocolV2 ? "Outdated Server" : "Outdated Client")));
+				if(protocolVersion != protocolV2 && protocolVersion != protocolV3 && protocolVersion != protocolV4) {
+					logger.info("Incompatible server version: {}", protocolVersion);
+					mc.displayGuiScreen(new GuiDisconnected(ret, "connect.failed", new ChatComponentText(protocolVersion < protocolV2 ? "Outdated Server" : "Outdated Client")));
 					return false;
 				}
 				
@@ -143,7 +169,7 @@ public class ConnectionHandshake {
 					return false;
 				}
 				
-				logger.info("Server protocol: {}", serverVers);
+				logger.info("Server protocol: {}", protocolVersion);
 				
 				int msgLen = di.read();
 				byte[] dat = new byte[msgLen];
@@ -260,10 +286,19 @@ public class ConnectionHandshake {
 				}else {
 					d.writeByte(0);
 				}
+				if(protocolVersion >= protocolV4) {
+					d.writeBoolean(enableCookies);
+					if(enableCookies && cookieData != null) {
+						d.writeByte(cookieData.length);
+						d.write(cookieData);
+					}else {
+						d.writeByte(0);
+					}
+				}
 				
-				PlatformNetworking.writePlayPacket(bao.toByteArray());
+				client.send(bao.toByteArray());
 				
-				read = awaitNextPacket(baseTimeout);
+				read = awaitNextPacket(client, baseTimeout);
 				if(read == null) {
 					logger.error("Read timed out while waiting for login negotiation response!");
 					return false;
@@ -280,52 +315,79 @@ public class ConnectionHandshake {
 					
 					Minecraft.getMinecraft().getSession().update(serverUsername, new EaglercraftUUID(di.readLong(), di.readLong()));
 					
-					bao.reset();
-					d.writeByte(HandshakePacketTypes.PROTOCOL_CLIENT_PROFILE_DATA);
-					String profileDataType = "skin_v1";
-					d.writeByte(profileDataType.length());
-					d.writeBytes(profileDataType);
-					byte[] packetSkin = EaglerProfile.getSkinPacket();
+					Map<String,byte[]> profileDataToSend = new HashMap<>();
+					
+					if(protocolVersion >= 4) {
+						bao.reset();
+						d.writeLong(EaglercraftVersion.clientBrandUUID.msb);
+						d.writeLong(EaglercraftVersion.clientBrandUUID.lsb);
+						profileDataToSend.put("brand_uuid_v1", bao.toByteArray());
+					}
+					
+					byte[] packetSkin = EaglerProfile.getSkinPacket(protocolVersion);
 					if(packetSkin.length > 0xFFFF) {
 						throw new IOException("Skin packet is too long: " + packetSkin.length);
 					}
-					d.writeShort(packetSkin.length);
-					d.write(packetSkin);
-					PlatformNetworking.writePlayPacket(bao.toByteArray());
+					profileDataToSend.put(protocolVersion >= 4 ? "skin_v2" : "skin_v1", packetSkin);
 					
-					bao.reset();
-					d.writeByte(HandshakePacketTypes.PROTOCOL_CLIENT_PROFILE_DATA);
-					profileDataType = "cape_v1";
-					d.writeByte(profileDataType.length());
-					d.writeBytes(profileDataType);
 					byte[] packetCape = EaglerProfile.getCapePacket();
 					if(packetCape.length > 0xFFFF) {
 						throw new IOException("Cape packet is too long: " + packetCape.length);
 					}
-					d.writeShort(packetCape.length);
-					d.write(packetCape);
-					PlatformNetworking.writePlayPacket(bao.toByteArray());
+					profileDataToSend.put("cape_v1", packetCape);
 					
 					byte[] packetSignatureData = UpdateService.getClientSignatureData();
 					if(packetSignatureData != null) {
-						bao.reset();
-						d.writeByte(HandshakePacketTypes.PROTOCOL_CLIENT_PROFILE_DATA);
-						profileDataType = "update_cert_v1";
-						d.writeByte(profileDataType.length());
-						d.writeBytes(profileDataType);
-						if(packetSignatureData.length > 0xFFFF) {
-							throw new IOException("Update certificate login packet is too long: " + packetSignatureData.length);
+						profileDataToSend.put("update_cert_v1", packetSignatureData);
+					}
+					
+					if(protocolVersion >= 4) {
+						List<Entry<String,byte[]>> toSend = new ArrayList<>(profileDataToSend.entrySet());
+						while(!toSend.isEmpty()) {
+							int sendLen = 2;
+							bao.reset();
+							d.writeByte(HandshakePacketTypes.PROTOCOL_CLIENT_PROFILE_DATA);
+							d.writeByte(0); // will be replaced
+							int packetCount = 0;
+							while(!toSend.isEmpty() && packetCount < 255) {
+								Entry<String,byte[]> etr = toSend.get(toSend.size() - 1);
+								int i = 3 + etr.getKey().length() + etr.getValue().length;
+								if(sendLen + i < 0xFF00) {
+									String profileDataType = etr.getKey();
+									d.writeByte(profileDataType.length());
+									d.writeBytes(profileDataType);
+									byte[] data = etr.getValue();
+									d.writeShort(data.length);
+									d.write(data);
+									toSend.remove(toSend.size() - 1);
+									++packetCount;
+								}else {
+									break;
+								}
+							}
+							byte[] send = bao.toByteArray();
+							send[1] = (byte)packetCount;
+							client.send(send);
+						}
+					}else {
+						for(Entry<String,byte[]> etr : profileDataToSend.entrySet()) {
+							bao.reset();
+							d.writeByte(HandshakePacketTypes.PROTOCOL_CLIENT_PROFILE_DATA);
+							String profileDataType = etr.getKey();
+							d.writeByte(profileDataType.length());
+							d.writeBytes(profileDataType);
+							byte[] data = etr.getValue();
+							d.writeShort(data.length);
+							d.write(data);
+							client.send(bao.toByteArray());
 						}
-						d.writeShort(packetSignatureData.length);
-						d.write(packetSignatureData);
-						PlatformNetworking.writePlayPacket(bao.toByteArray());
 					}
 					
 					bao.reset();
 					d.writeByte(HandshakePacketTypes.PROTOCOL_CLIENT_FINISH_LOGIN);
-					PlatformNetworking.writePlayPacket(bao.toByteArray());
+					client.send(bao.toByteArray());
 					
-					read = awaitNextPacket(baseTimeout);
+					read = awaitNextPacket(client, baseTimeout);
 					if(read == null) {
 						logger.error("Read timed out while waiting for login confirmation response!");
 						return false;
@@ -336,13 +398,13 @@ public class ConnectionHandshake {
 					if(type == HandshakePacketTypes.PROTOCOL_SERVER_FINISH_LOGIN) {
 						return true;
 					}else if(type == HandshakePacketTypes.PROTOCOL_SERVER_ERROR) {
-						showError(mc, connecting, ret, di, serverVers == protocolV2);
+						showError(mc, client, connecting, ret, di, protocolVersion == protocolV2);
 						return false;
 					}else {
 						return false;
 					}
 				}else if(type == HandshakePacketTypes.PROTOCOL_SERVER_DENY_LOGIN) {
-					if(serverVers == protocolV2) {
+					if(protocolVersion == protocolV2) {
 						msgLen = di.read();
 					}else {
 						msgLen = di.readUnsignedShort();
@@ -353,13 +415,13 @@ public class ConnectionHandshake {
 					mc.displayGuiScreen(new GuiDisconnected(ret, "connect.failed", IChatComponent.Serializer.jsonToComponent(errStr)));
 					return false;
 				}else if(type == HandshakePacketTypes.PROTOCOL_SERVER_ERROR) {
-					showError(mc, connecting, ret, di, serverVers == protocolV2);
+					showError(mc, client, connecting, ret, di, protocolVersion == protocolV2);
 					return false;
 				}else {
 					return false;
 				}
 			}else if(type == HandshakePacketTypes.PROTOCOL_SERVER_ERROR) {
-				showError(mc, connecting, ret, di, true);
+				showError(mc, client, connecting, ret, di, true);
 				return false;
 			}else {
 				return false;
@@ -372,37 +434,51 @@ public class ConnectionHandshake {
 		
 	}
 	
-	private static byte[] awaitNextPacket(long timeout) {
-		long millis = System.currentTimeMillis();
-		byte[] b;
-		while((b = PlatformNetworking.readPlayPacket()) == null) {
-			if(PlatformNetworking.playConnectionState().isClosed()) {
+	private static byte[] awaitNextPacket(IWebSocketClient client, long timeout) {
+		long millis = EagRuntime.steadyTimeMillis();
+		IWebSocketFrame b;
+		while((b = client.getNextBinaryFrame()) == null) {
+			if(client.getState().isClosed()) {
 				return null;
 			}
 			try {
 				Thread.sleep(50l);
 			} catch (InterruptedException e) {
 			}
-			if(System.currentTimeMillis() - millis > timeout) {
-				PlatformNetworking.playDisconnect();
+			if(EagRuntime.steadyTimeMillis() - millis > timeout) {
+				client.close();
 				return null;
 			}
 		}
-		return b;
+		return b.getByteArray();
 	}
 	
-	private static void showError(Minecraft mc, GuiConnecting connecting, GuiScreen scr, DataInputStream err, boolean v2) throws IOException {
+	private static void showError(Minecraft mc, IWebSocketClient client, GuiConnecting connecting, GuiScreen scr, DataInputStream err, boolean v2) throws IOException {
 		int errorCode = err.read();
 		int msgLen = v2 ? err.read() : err.readUnsignedShort();
+		
+		// workaround for bug in EaglerXBungee 1.2.7 and below
+		if(msgLen == 0) {
+			if(v2) {
+				if(err.available() == 256) {
+					msgLen = 256;
+				}
+			}else {
+				if(err.available() == 65536) {
+					msgLen = 65536;
+				}
+			}
+		}
+		
 		byte[] dat = new byte[msgLen];
 		err.read(dat);
 		String errStr = new String(dat, StandardCharsets.UTF_8);
 		logger.info("Server Error Code {}: {}", errorCode, errStr);
 		if(errorCode == HandshakePacketTypes.SERVER_ERROR_RATELIMIT_BLOCKED) {
-			RateLimitTracker.registerBlock(PlatformNetworking.getCurrentURI());
+			RateLimitTracker.registerBlock(client.getCurrentURI());
 			mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(scr));
 		}else if(errorCode == HandshakePacketTypes.SERVER_ERROR_RATELIMIT_LOCKED) {
-			RateLimitTracker.registerLockOut(PlatformNetworking.getCurrentURI());
+			RateLimitTracker.registerLockOut(client.getCurrentURI());
 			mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(scr));
 		}else if(errorCode == HandshakePacketTypes.SERVER_ERROR_CUSTOM_MESSAGE) {
 			mc.displayGuiScreen(new GuiDisconnected(scr, "connect.failed", IChatComponent.Serializer.jsonToComponent(errStr)));
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java
index 0e5db53..6d7a2a4 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java
@@ -1,24 +1,19 @@
 package net.lax1dude.eaglercraft.v1_8.socket;
 
 import java.io.IOException;
-import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformNetworking;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
 import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
 import net.minecraft.network.EnumConnectionState;
-import net.minecraft.network.EnumPacketDirection;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.Packet;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.IChatComponent;
 
 /**
- * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -32,7 +27,7 @@ import net.minecraft.util.IChatComponent;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class EaglercraftNetworkManager {
+public abstract class EaglercraftNetworkManager {
 	
 	protected final String address;
 	protected INetHandler nethandler = null;
@@ -63,103 +58,23 @@ public class EaglercraftNetworkManager {
 		return pluginVersion;
 	}
 	
-	public void connect() {
-		PlatformNetworking.startPlayConnection(address);
+	public abstract void connect();
+	
+	public abstract EnumEaglerConnectionState getConnectStatus();
+	
+	public String getAddress() {
+		return address;
 	}
 	
-	public EnumEaglerConnectionState getConnectStatus() {
-		return PlatformNetworking.playConnectionState();
-	}
-	
-	public void closeChannel(IChatComponent reason) {
-		PlatformNetworking.playDisconnect();
-		if(nethandler != null) {
-			nethandler.onDisconnect(reason);
-		}
-		clientDisconnected = true;
-	}
+	public abstract void closeChannel(IChatComponent reason);
 	
 	public void setConnectionState(EnumConnectionState state) {
 		packetState = state;
 	}
 	
-	public void processReceivedPackets() throws IOException {
-		if(nethandler == null) return;
-		List<byte[]> pkts = PlatformNetworking.readAllPacket();
+	public abstract void processReceivedPackets() throws IOException;
 
-		if(pkts == null) {
-			return;
-		}
-
-		for(int i = 0, l = pkts.size(); i < l; ++i) {
-			byte[] next = pkts.get(i);
-			++debugPacketCounter;
-			try {
-				ByteBuf nettyBuffer = Unpooled.buffer(next, next.length);
-				nettyBuffer.writerIndex(next.length);
-				PacketBuffer input = new PacketBuffer(nettyBuffer);
-				int pktId = input.readVarIntFromBuffer();
-				
-				Packet pkt;
-				try {
-					pkt = packetState.getPacket(EnumPacketDirection.CLIENTBOUND, pktId);
-				}catch(IllegalAccessException | InstantiationException ex) {
-					throw new IOException("Recieved a packet with type " + pktId + " which is invalid!");
-				}
-				
-				if(pkt == null) {
-					throw new IOException("Recieved packet type " + pktId + " which is undefined in state " + packetState);
-				}
-				
-				try {
-					pkt.readPacketData(input);
-				}catch(Throwable t) {
-					throw new IOException("Failed to read packet type '" + pkt.getClass().getSimpleName() + "'", t);
-				}
-				
-				try {
-					pkt.processPacket(nethandler);
-				}catch(Throwable t) {
-					logger.error("Failed to process {}! It'll be skipped for debug purposes.", pkt.getClass().getSimpleName());
-					logger.error(t);
-				}
-				
-			}catch(Throwable t) {
-				logger.error("Failed to process websocket frame {}! It'll be skipped for debug purposes.", debugPacketCounter);
-				logger.error(t);
-			}
-		}
-	}
-
-	public void sendPacket(Packet pkt) {
-		if(!isChannelOpen()) {
-			logger.error("Packet was sent on a closed connection: {}", pkt.getClass().getSimpleName());
-			return;
-		}
-		
-		int i;
-		try {
-			i = packetState.getPacketId(EnumPacketDirection.SERVERBOUND, pkt);
-		}catch(Throwable t) {
-			logger.error("Incorrect packet for state: {}", pkt.getClass().getSimpleName());
-			return;
-		}
-		
-		temporaryBuffer.clear();
-		temporaryBuffer.writeVarIntToBuffer(i);
-		try {
-			pkt.writePacketData(temporaryBuffer);
-		}catch(IOException ex) {
-			logger.error("Failed to write packet {}!", pkt.getClass().getSimpleName());
-			return;
-		}
-		
-		int len = temporaryBuffer.writerIndex();
-		byte[] bytes = new byte[len];
-		temporaryBuffer.getBytes(0, bytes);
-		
-		PlatformNetworking.writePlayPacket(bytes);
-	}
+	public abstract void sendPacket(Packet pkt);
 	
 	public void setNetHandler(INetHandler nethandler) {
 		this.nethandler = nethandler;
@@ -181,18 +96,7 @@ public class EaglercraftNetworkManager {
 		throw new CompressionNotSupportedException();
 	}
 
-	public boolean checkDisconnected() {
-		if(PlatformNetworking.playConnectionState().isClosed()) {
-			try {
-				processReceivedPackets(); // catch kick message
-			} catch (IOException e) {
-			}
-			doClientDisconnect(new ChatComponentTranslation("disconnect.endOfStream"));
-			return true;
-		}else {
-			return false;
-		}
-	}
+	public abstract boolean checkDisconnected();
 	
 	protected boolean clientDisconnected = false;
 	
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/GuiHandshakeApprove.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/GuiHandshakeApprove.java
index b02b609..350340e 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/GuiHandshakeApprove.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/GuiHandshakeApprove.java
@@ -46,7 +46,7 @@ public class GuiHandshakeApprove extends GuiScreen {
 	public void initGui() {
 		this.buttonList.clear();
 		titleString = I18n.format("handshakeApprove." + message + ".title");
-		bodyLines = new ArrayList();
+		bodyLines = new ArrayList<>();
 		int i = 0;
 		boolean wasNull = true;
 		while(true) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/RateLimitTracker.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/RateLimitTracker.java
index ac5a817..5388092 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/RateLimitTracker.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/RateLimitTracker.java
@@ -4,6 +4,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+
 /**
  * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
  * 
@@ -23,12 +25,12 @@ public class RateLimitTracker {
 
 	private static long lastTickUpdate = 0l;
 
-	private static final Map<String, Long> blocks = new HashMap();
-	private static final Map<String, Long> lockout = new HashMap();
+	private static final Map<String, Long> blocks = new HashMap<>();
+	private static final Map<String, Long> lockout = new HashMap<>();
 
 	public static boolean isLockedOut(String addr) {
 		Long lockoutStatus = lockout.get(addr);
-		return lockoutStatus != null && System.currentTimeMillis() - lockoutStatus.longValue() < 300000l;
+		return lockoutStatus != null && EagRuntime.steadyTimeMillis() - lockoutStatus.longValue() < 300000l;
 	}
 
 	public static boolean isProbablyLockedOut(String addr) {
@@ -36,17 +38,17 @@ public class RateLimitTracker {
 	}
 
 	public static void registerBlock(String addr) {
-		blocks.put(addr, System.currentTimeMillis());
+		blocks.put(addr, EagRuntime.steadyTimeMillis());
 	}
 
 	public static void registerLockOut(String addr) {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		blocks.put(addr, millis);
 		lockout.put(addr, millis);
 	}
 
 	public static void tick() {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		if(millis - lastTickUpdate > 5000l) {
 			lastTickUpdate = millis;
 			Iterator<Long> blocksItr = blocks.values().iterator();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ServerQueryDispatch.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ServerQueryDispatch.java
index 0302c30..9b57fb2 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ServerQueryDispatch.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ServerQueryDispatch.java
@@ -1,6 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.socket;
 
 import net.lax1dude.eaglercraft.v1_8.internal.IServerQuery;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketClient;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformNetworking;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -26,7 +27,8 @@ public class ServerQueryDispatch {
 
 	public static IServerQuery sendServerQuery(String uri, String accept) {
 		logger.info("Sending {} query to: \"{}\"", accept, uri);
-		return PlatformNetworking.sendServerQuery(uri, accept);
+		IWebSocketClient sockClient = PlatformNetworking.openWebSocket(uri);
+		return sockClient != null ? new ServerQueryImpl(sockClient, accept) : null;
 	}
 
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMServerQuery.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ServerQueryImpl.java
similarity index 62%
rename from src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMServerQuery.java
rename to src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ServerQueryImpl.java
index e943903..b99a0f8 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMServerQuery.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ServerQueryImpl.java
@@ -1,25 +1,22 @@
-package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+package net.lax1dude.eaglercraft.v1_8.socket;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import org.json.JSONObject;
-import org.teavm.jso.JSBody;
-import org.teavm.jso.JSObject;
-import org.teavm.jso.dom.events.Event;
-import org.teavm.jso.dom.events.EventListener;
-import org.teavm.jso.dom.events.MessageEvent;
-import org.teavm.jso.typedarrays.ArrayBuffer;
-import org.teavm.jso.websocket.WebSocket;
 
+import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumServerRateLimit;
 import net.lax1dude.eaglercraft.v1_8.internal.IServerQuery;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketClient;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketFrame;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.QueryResponse;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -33,58 +30,48 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class TeaVMServerQuery implements IServerQuery {
+class ServerQueryImpl implements IServerQuery {
 
 	public static final Logger logger = LogManager.getLogger("WebSocketQuery");
 
-	private final List<QueryResponse> queryResponses = new LinkedList();
-	private final List<byte[]> queryResponsesBytes = new LinkedList();
+	private final List<QueryResponse> queryResponses = new LinkedList<>();
+	private final List<byte[]> queryResponsesBytes = new LinkedList<>();
 
+	protected final IWebSocketClient websocketClient;
 	protected final String uri;
 	protected final String accept;
-	protected final WebSocket sock;
+	protected boolean hasSentAccept = false;
 	protected boolean open = true;
 	protected boolean alive = false;
 	protected long pingStart = -1l;
 	protected long pingTimer = -1l;
 	private EnumServerRateLimit rateLimit = EnumServerRateLimit.OK;
 
-	public TeaVMServerQuery(String uri, String accept) {
-		this.uri = uri;
+	ServerQueryImpl(IWebSocketClient websocketClient, String accept) {
+		this.websocketClient = websocketClient;
+		this.uri = websocketClient.getCurrentURI();
 		this.accept = accept;
-		this.sock = WebSocket.create(uri);
-		initHandlers();
 	}
 
-	@JSBody(params = { "obj" }, script = "return typeof obj === \"string\";")
-	private static native boolean isString(JSObject obj);
-
-	protected void initHandlers() {
-		sock.setBinaryType("arraybuffer");
-		TeaVMUtils.addEventListener(sock, "open", new EventListener<Event>() {
-			@Override
-			public void handleEvent(Event evt) {
-				sock.send("Accept: " + accept);
-			}
-		});
-		TeaVMUtils.addEventListener(sock, "close", new EventListener<Event>() {
-			@Override
-			public void handleEvent(Event evt) {
-				open = false;
-			}
-		});
-		TeaVMUtils.addEventListener(sock, "message", new EventListener<MessageEvent>() {
-			@Override
-			public void handleEvent(MessageEvent evt) {
+	@Override
+	public void update() {
+		if(!hasSentAccept && websocketClient.getState() == EnumEaglerConnectionState.CONNECTED) {
+			hasSentAccept = true;
+			websocketClient.send("Accept: " + accept);
+		}
+		List<IWebSocketFrame> lst = websocketClient.getNextFrames();
+		if(lst != null) {
+			for(int i = 0, l = lst.size(); i < l; ++i) {
+				IWebSocketFrame frame = lst.get(i);
 				alive = true;
 				if(pingTimer == -1) {
-					pingTimer = System.currentTimeMillis() - pingStart;
+					pingTimer = PlatformRuntime.steadyTimeMillis() - pingStart;
 					if(pingTimer < 1) {
 						pingTimer = 1;
 					}
 				}
-				if(isString(evt.getData())) {
-					String str = evt.getDataAsString();
+				if(frame.isString()) {
+					String str = frame.getString();
 					if(str.equalsIgnoreCase("BLOCKED")) {
 						logger.error("Reached full IP ratelimit for {}!", uri);
 						rateLimit = EnumServerRateLimit.BLOCKED;
@@ -104,45 +91,33 @@ public class TeaVMServerQuery implements IServerQuery {
 							logger.error("Reached query ratelimit lockout for {}!", uri);
 							rateLimit = EnumServerRateLimit.LOCKED_OUT;
 						}else {
-							QueryResponse response = new QueryResponse(obj, pingTimer);
-							synchronized(queryResponses) {
-								queryResponses.add(response);
-							}
+							queryResponses.add(new QueryResponse(obj, pingTimer));
 						}
 					}catch(Throwable t) {
 						logger.error("Exception thrown parsing websocket query response from \"" + uri + "\"!");
 						logger.error(t);
 					}
 				}else {
-					synchronized(queryResponsesBytes) {
-						queryResponsesBytes.add(TeaVMUtils.wrapByteArrayBuffer(evt.getDataAsArray()));
-					}
+					queryResponsesBytes.add(frame.getByteArray());
 				}
 			}
-		});
-		TeaVMUtils.addEventListener(sock, "error", new EventListener<Event>() {
-			@Override
-			public void handleEvent(Event evt) {
-				sock.close();
-				open = false;
-			}
-		});
+		}
+		if(websocketClient.isClosed()) {
+			open = false;
+		}
 	}
 
 	@Override
 	public void send(String str) {
-		if(open) {
-			sock.send(str);
+		if(websocketClient.getState() == EnumEaglerConnectionState.CONNECTED) {
+			websocketClient.send(str);
 		}
 	}
 
-	@JSBody(params = { "sock", "buffer" }, script = "sock.send(buffer);")
-	private static native void nativeBinarySend(WebSocket sock, ArrayBuffer buffer);
-
 	@Override
 	public void send(byte[] bytes) {
-		if(open) {
-			nativeBinarySend(sock, TeaVMUtils.unwrapArrayBuffer(bytes));
+		if(websocketClient.getState() == EnumEaglerConnectionState.CONNECTED) {
+			websocketClient.send(bytes);
 		}
 	}
 
@@ -192,7 +167,7 @@ public class TeaVMServerQuery implements IServerQuery {
 	public void close() {
 		if(open) {
 			open = false;
-			sock.close();
+			websocketClient.close();
 		}
 	}
 
@@ -200,4 +175,5 @@ public class TeaVMServerQuery implements IServerQuery {
 	public EnumServerRateLimit getRateLimit() {
 		return rateLimit;
 	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/WebSocketNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/WebSocketNetworkManager.java
new file mode 100755
index 0000000..8458de6
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/WebSocketNetworkManager.java
@@ -0,0 +1,152 @@
+package net.lax1dude.eaglercraft.v1_8.socket;
+
+import java.io.IOException;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketClient;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketFrame;
+import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
+import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
+import net.minecraft.network.EnumPacketDirection;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class WebSocketNetworkManager extends EaglercraftNetworkManager {
+
+	protected final IWebSocketClient webSocketClient;
+
+	public WebSocketNetworkManager(IWebSocketClient webSocketClient) {
+		super(webSocketClient.getCurrentURI());
+		this.webSocketClient = webSocketClient;
+	}
+
+	public void connect() {
+	}
+
+	public EnumEaglerConnectionState getConnectStatus() {
+		return webSocketClient.getState();
+	}
+
+	public void closeChannel(IChatComponent reason) {
+		webSocketClient.close();
+		if(nethandler != null) {
+			nethandler.onDisconnect(reason);
+		}
+		clientDisconnected = true;
+	}
+
+	public void processReceivedPackets() throws IOException {
+		if(nethandler == null) return;
+		if(webSocketClient.availableStringFrames() > 0) {
+			logger.warn("discarding {} string frames recieved on a binary connection", webSocketClient.availableStringFrames());
+			webSocketClient.clearStringFrames();
+		}
+		List<IWebSocketFrame> pkts = webSocketClient.getNextBinaryFrames();
+
+		if(pkts == null) {
+			return;
+		}
+
+		for(int i = 0, l = pkts.size(); i < l; ++i) {
+			IWebSocketFrame next = pkts.get(i);
+			++debugPacketCounter;
+			try {
+				byte[] asByteArray = next.getByteArray();
+				ByteBuf nettyBuffer = Unpooled.buffer(asByteArray, asByteArray.length);
+				nettyBuffer.writerIndex(asByteArray.length);
+				PacketBuffer input = new PacketBuffer(nettyBuffer);
+				int pktId = input.readVarIntFromBuffer();
+				
+				Packet pkt;
+				try {
+					pkt = packetState.getPacket(EnumPacketDirection.CLIENTBOUND, pktId);
+				}catch(IllegalAccessException | InstantiationException ex) {
+					throw new IOException("Recieved a packet with type " + pktId + " which is invalid!");
+				}
+				
+				if(pkt == null) {
+					throw new IOException("Recieved packet type " + pktId + " which is undefined in state " + packetState);
+				}
+				
+				try {
+					pkt.readPacketData(input);
+				}catch(Throwable t) {
+					throw new IOException("Failed to read packet type '" + pkt.getClass().getSimpleName() + "'", t);
+				}
+				
+				try {
+					pkt.processPacket(nethandler);
+				}catch(Throwable t) {
+					logger.error("Failed to process {}! It'll be skipped for debug purposes.", pkt.getClass().getSimpleName());
+					logger.error(t);
+				}
+				
+			}catch(Throwable t) {
+				logger.error("Failed to process websocket frame {}! It'll be skipped for debug purposes.", debugPacketCounter);
+				logger.error(t);
+			}
+		}
+	}
+
+	public void sendPacket(Packet pkt) {
+		if(!isChannelOpen()) {
+			logger.error("Packet was sent on a closed connection: {}", pkt.getClass().getSimpleName());
+			return;
+		}
+		
+		int i;
+		try {
+			i = packetState.getPacketId(EnumPacketDirection.SERVERBOUND, pkt);
+		}catch(Throwable t) {
+			logger.error("Incorrect packet for state: {}", pkt.getClass().getSimpleName());
+			return;
+		}
+		
+		temporaryBuffer.clear();
+		temporaryBuffer.writeVarIntToBuffer(i);
+		try {
+			pkt.writePacketData(temporaryBuffer);
+		}catch(IOException ex) {
+			logger.error("Failed to write packet {}!", pkt.getClass().getSimpleName());
+			return;
+		}
+		
+		int len = temporaryBuffer.writerIndex();
+		byte[] bytes = new byte[len];
+		temporaryBuffer.getBytes(0, bytes);
+		
+		webSocketClient.send(bytes);
+	}
+
+	public boolean checkDisconnected() {
+		if(webSocketClient.isClosed()) {
+			try {
+				processReceivedPackets(); // catch kick message
+			} catch (IOException e) {
+			}
+			doClientDisconnect(new ChatComponentTranslation("disconnect.endOfStream"));
+			return true;
+		}else {
+			return false;
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/ClientV3MessageHandler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/ClientV3MessageHandler.java
new file mode 100755
index 0000000..1db2153
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/ClientV3MessageHandler.java
@@ -0,0 +1,130 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.client;
+
+import java.nio.charset.StandardCharsets;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.profile.SkinModel;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.*;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+import net.lax1dude.eaglercraft.v1_8.voice.VoiceClientController;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetHandlerPlayClient;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ClientV3MessageHandler implements GameMessageHandler {
+
+	private final NetHandlerPlayClient netHandler;
+
+	public ClientV3MessageHandler(NetHandlerPlayClient netHandler) {
+		this.netHandler = netHandler;
+	}
+
+	public void handleServer(SPacketEnableFNAWSkinsEAG packet) {
+		netHandler.currentFNAWSkinAllowedState = packet.enableSkins;
+		netHandler.currentFNAWSkinForcedState = packet.enableSkins;
+		Minecraft.getMinecraft().getRenderManager().setEnableFNAWSkins(netHandler.currentFNAWSkinForcedState
+				|| (netHandler.currentFNAWSkinAllowedState && Minecraft.getMinecraft().gameSettings.enableFNAWSkins));
+	}
+
+	public void handleServer(SPacketOtherCapeCustomEAG packet) {
+		netHandler.getCapeCache().cacheCapeCustom(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast),
+				packet.customCape);
+	}
+
+	public void handleServer(SPacketOtherCapePresetEAG packet) {
+		netHandler.getCapeCache().cacheCapePreset(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast),
+				packet.presetCape);
+	}
+
+	public void handleServer(SPacketOtherSkinCustomV3EAG packet) {
+		EaglercraftUUID responseUUID = new EaglercraftUUID(packet.uuidMost, packet.uuidLeast);
+		SkinModel modelId;
+		if(packet.modelID == (byte)0xFF) {
+			modelId = this.netHandler.getSkinCache().getRequestedSkinType(responseUUID);
+		}else {
+			modelId = SkinModel.getModelFromId(packet.modelID & 0x7F);
+			if((packet.modelID & 0x80) != 0 && modelId.sanitize) {
+				modelId = SkinModel.STEVE;
+			}
+		}
+		if(modelId.highPoly != null) {
+			modelId = SkinModel.STEVE;
+		}
+		this.netHandler.getSkinCache().cacheSkinCustom(responseUUID, packet.customSkin, modelId);
+	}
+
+	public void handleServer(SPacketOtherSkinPresetEAG packet) {
+		this.netHandler.getSkinCache().cacheSkinPreset(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast),
+				packet.presetSkin);
+	}
+
+	public void handleServer(SPacketUpdateCertEAG packet) {
+		if (EagRuntime.getConfiguration().allowUpdateSvc()) {
+			UpdateService.addCertificateToSet(packet.updateCert);
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalAllowedEAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeAllowed(packet.allowed, packet.iceServers);
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalConnectV3EAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			if (packet.isAnnounceType) {
+				VoiceClientController.handleVoiceSignalPacketTypeConnectAnnounce(
+						new EaglercraftUUID(packet.uuidMost, packet.uuidLeast));
+			} else {
+				VoiceClientController.handleVoiceSignalPacketTypeConnect(
+						new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), packet.offer);
+			}
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalDescEAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeDescription(
+					new EaglercraftUUID(packet.uuidMost, packet.uuidLeast),
+					new String(packet.desc, StandardCharsets.UTF_8));
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalDisconnectPeerEAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeDisconnect(
+					new EaglercraftUUID(packet.uuidMost, packet.uuidLeast));
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalGlobalEAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeGlobalNew(packet.users);
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalICEEAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeICECandidate(
+					new EaglercraftUUID(packet.uuidMost, packet.uuidLeast),
+					new String(packet.ice, StandardCharsets.UTF_8));
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/ClientV4MessageHandler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/ClientV4MessageHandler.java
new file mode 100755
index 0000000..efee75d
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/ClientV4MessageHandler.java
@@ -0,0 +1,222 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.client;
+
+import java.nio.charset.StandardCharsets;
+
+import net.lax1dude.eaglercraft.v1_8.ClientUUIDLoadingCache;
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.PauseMenuCustomizeState;
+import net.lax1dude.eaglercraft.v1_8.cookie.ServerCookieDataStore;
+import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
+import net.lax1dude.eaglercraft.v1_8.profile.SkinModel;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.*;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.util.SkinPacketVersionCache;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+import net.lax1dude.eaglercraft.v1_8.voice.VoiceClientController;
+import net.lax1dude.eaglercraft.v1_8.webview.ServerInfoCache;
+import net.lax1dude.eaglercraft.v1_8.webview.WebViewOverlayController;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetHandlerPlayClient;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ClientV4MessageHandler implements GameMessageHandler {
+
+	private final NetHandlerPlayClient netHandler;
+
+	public ClientV4MessageHandler(NetHandlerPlayClient netHandler) {
+		this.netHandler = netHandler;
+	}
+
+	public void handleServer(SPacketEnableFNAWSkinsEAG packet) {
+		netHandler.currentFNAWSkinAllowedState = packet.enableSkins;
+		netHandler.currentFNAWSkinForcedState = packet.force;
+		Minecraft.getMinecraft().getRenderManager().setEnableFNAWSkins(netHandler.currentFNAWSkinForcedState
+				|| (netHandler.currentFNAWSkinAllowedState && Minecraft.getMinecraft().gameSettings.enableFNAWSkins));
+	}
+
+	public void handleServer(SPacketOtherCapeCustomEAG packet) {
+		netHandler.getCapeCache().cacheCapeCustom(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast),
+				packet.customCape);
+	}
+
+	public void handleServer(SPacketOtherCapePresetEAG packet) {
+		netHandler.getCapeCache().cacheCapePreset(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast),
+				packet.presetCape);
+	}
+
+	public void handleServer(SPacketOtherSkinCustomV4EAG packet) {
+		EaglercraftUUID responseUUID = new EaglercraftUUID(packet.uuidMost, packet.uuidLeast);
+		SkinModel modelId;
+		if(packet.modelID == (byte)0xFF) {
+			modelId = this.netHandler.getSkinCache().getRequestedSkinType(responseUUID);
+		}else {
+			modelId = SkinModel.getModelFromId(packet.modelID & 0x7F);
+			if((packet.modelID & 0x80) != 0 && modelId.sanitize) {
+				modelId = SkinModel.STEVE;
+			}
+		}
+		if(modelId.highPoly != null) {
+			modelId = SkinModel.STEVE;
+		}
+		this.netHandler.getSkinCache().cacheSkinCustom(responseUUID, SkinPacketVersionCache.convertToV3Raw(packet.customSkin), modelId);
+	}
+
+	public void handleServer(SPacketOtherSkinPresetEAG packet) {
+		this.netHandler.getSkinCache().cacheSkinPreset(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), packet.presetSkin);
+	}
+
+	public void handleServer(SPacketUpdateCertEAG packet) {
+		if (EagRuntime.getConfiguration().allowUpdateSvc()) {
+			UpdateService.addCertificateToSet(packet.updateCert);
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalAllowedEAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeAllowed(packet.allowed, packet.iceServers);
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalConnectV4EAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeConnect(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), packet.offer);
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalConnectAnnounceV4EAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeConnectAnnounce(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast));
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalDescEAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeDescription(
+					new EaglercraftUUID(packet.uuidMost, packet.uuidLeast),
+					new String(packet.desc, StandardCharsets.UTF_8));
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalDisconnectPeerEAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeDisconnect(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast));
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalGlobalEAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeGlobalNew(packet.users);
+		}
+	}
+
+	public void handleServer(SPacketVoiceSignalICEEAG packet) {
+		if (VoiceClientController.isClientSupported()) {
+			VoiceClientController.handleVoiceSignalPacketTypeICECandidate(
+					new EaglercraftUUID(packet.uuidMost, packet.uuidLeast),
+					new String(packet.ice, StandardCharsets.UTF_8));
+		}
+	}
+
+	public void handleServer(SPacketForceClientSkinPresetV4EAG packet) {
+		EaglerProfile.handleForceSkinPreset(packet.presetSkin);
+	}
+
+	public void handleServer(SPacketForceClientSkinCustomV4EAG packet) {
+		EaglerProfile.handleForceSkinCustom(packet.modelID, SkinPacketVersionCache.convertToV3Raw(packet.customSkin));
+	}
+
+	public void handleServer(SPacketSetServerCookieV4EAG packet) {
+		if(!netHandler.isClientInEaglerSingleplayerOrLAN() && Minecraft.getMinecraft().getCurrentServerData().enableCookies) {
+			ServerCookieDataStore.saveCookie(netHandler.getNetworkManager().getAddress(), packet.expires, packet.data,
+					packet.revokeQuerySupported, packet.saveCookieToDisk);
+		}
+	}
+
+	public void handleServer(SPacketRedirectClientV4EAG packet) {
+		Minecraft.getMinecraft().handleReconnectPacket(packet.redirectURI);
+	}
+
+	public void handleServer(SPacketOtherPlayerClientUUIDV4EAG packet) {
+		ClientUUIDLoadingCache.handleResponse(packet.requestId, new EaglercraftUUID(packet.clientUUIDMost, packet.clientUUIDLeast));
+	}
+
+	public void handleServer(SPacketForceClientCapePresetV4EAG packet) {
+		EaglerProfile.handleForceCapePreset(packet.presetCape);
+	}
+
+	public void handleServer(SPacketForceClientCapeCustomV4EAG packet) {
+		EaglerProfile.handleForceCapeCustom(packet.customCape);
+	}
+
+	public void handleServer(SPacketInvalidatePlayerCacheV4EAG packet) {
+		if(packet.players != null && packet.players.size() > 0) {
+			for(SPacketInvalidatePlayerCacheV4EAG.InvalidateRequest req : packet.players) {
+				EaglercraftUUID uuid = new EaglercraftUUID(req.uuidMost, req.uuidLeast);
+				if(req.invalidateSkin) {
+					this.netHandler.getSkinCache().handleInvalidate(uuid);
+				}
+				if(req.invalidateCape) {
+					this.netHandler.getCapeCache().handleInvalidate(uuid);
+				}
+			}
+		}
+	}
+
+	public void handleServer(SPacketUnforceClientV4EAG packet) {
+		if(packet.resetSkin) {
+			EaglerProfile.isServerSkinOverride = false;
+		}
+		if(packet.resetCape) {
+			EaglerProfile.isServerCapeOverride = false;
+		}
+		if(packet.resetFNAW) {
+			netHandler.currentFNAWSkinForcedState = false;
+			Minecraft.getMinecraft().getRenderManager().setEnableFNAWSkins(
+					netHandler.currentFNAWSkinAllowedState && Minecraft.getMinecraft().gameSettings.enableFNAWSkins);
+		}
+	}
+
+	public void handleServer(SPacketCustomizePauseMenuV4EAG packet) {
+		PauseMenuCustomizeState.loadPacket(packet);
+	}
+
+	public void handleServer(SPacketServerInfoDataChunkV4EAG packet) {
+		ServerInfoCache.handleChunk(packet);
+	}
+
+	public void handleServer(SPacketWebViewMessageV4EAG packet) {
+		WebViewOverlayController.handleMessagePacket(packet);
+	}
+
+	public void handleServer(SPacketNotifIconsRegisterV4EAG packet) {
+		netHandler.getNotifManager().processPacketAddIcons(packet);
+	}
+
+	public void handleServer(SPacketNotifIconsReleaseV4EAG packet) {
+		netHandler.getNotifManager().processPacketRemIcons(packet);
+	}
+
+	public void handleServer(SPacketNotifBadgeShowV4EAG packet) {
+		netHandler.getNotifManager().processPacketShowBadge(packet);
+	}
+
+	public void handleServer(SPacketNotifBadgeHideV4EAG packet) {
+		netHandler.getNotifManager().processPacketHideBadge(packet);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/GameProtocolMessageController.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/GameProtocolMessageController.java
new file mode 100755
index 0000000..11d2ff9
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/GameProtocolMessageController.java
@@ -0,0 +1,199 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.client;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageConstants;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageProtocol;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.sp.server.socket.protocol.ServerV3MessageHandler;
+import net.lax1dude.eaglercraft.v1_8.sp.server.socket.protocol.ServerV4MessageHandler;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.PacketBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GameProtocolMessageController {
+
+	private static final Logger logger = LogManager.getLogger("GameProtocolMessageController");
+
+	public final GamePluginMessageProtocol protocol;
+	public final int sendDirection;
+	public final int receiveDirection;
+	private final PacketBufferInputWrapper inputStream = new PacketBufferInputWrapper(null);
+	private final PacketBufferOutputWrapper outputStream = new PacketBufferOutputWrapper(null);
+	private final GameMessageHandler handler;
+	private final IPluginMessageSendFunction sendFunction;
+	private final List<PacketBuffer> sendQueueV4;
+	private final boolean noDelay;
+
+	public GameProtocolMessageController(GamePluginMessageProtocol protocol, int sendDirection, GameMessageHandler handler,
+			IPluginMessageSendFunction sendCallback) {
+		this.protocol = protocol;
+		this.sendDirection = sendDirection;
+		this.receiveDirection = GamePluginMessageConstants.oppositeDirection(sendDirection);
+		this.handler = handler;
+		this.sendFunction = sendCallback;
+		this.noDelay = protocol.ver < 4 || EagRuntime.getConfiguration().isEaglerNoDelay();
+		this.sendQueueV4 = !noDelay ? new LinkedList<>() : null;
+	}
+
+	public boolean handlePacket(String channel, PacketBuffer data) throws IOException {
+		GameMessagePacket pkt;
+		if(protocol.ver >= 4 && data.readableBytes() > 0 && data.getByte(data.readerIndex()) == (byte) 0xFF
+				&& channel.equals(GamePluginMessageConstants.V4_CHANNEL)) {
+			data.readByte();
+			inputStream.buffer = data;
+			int count = inputStream.readVarInt();
+			for(int i = 0, j, k; i < count; ++i) {
+				j = data.readVarIntFromBuffer();
+				k = data.readerIndex() + j;
+				if(j > data.readableBytes()) {
+					throw new IOException("Packet fragment is too long: " + j + " > " + data.readableBytes());
+				}
+				pkt = protocol.readPacket(channel, receiveDirection, inputStream);
+				if(pkt != null) {
+					try {
+						pkt.handlePacket(handler);
+					}catch(Throwable t) {
+						logger.error("Failed to handle packet {} in direction {} using handler {}!", pkt.getClass().getSimpleName(),
+								GamePluginMessageConstants.getDirectionString(receiveDirection), handler);
+						logger.error(t);
+					}
+				}else {
+					logger.warn("Could not read packet fragment {} of {}, unknown packet", count, i);
+				}
+				if(data.readerIndex() != k) {
+					logger.warn("Packet fragment {} was the wrong length: {} != {}",
+							(pkt != null ? pkt.getClass().getSimpleName() : "unknown"), j + data.readerIndex() - k, j);
+					data.readerIndex(k);
+				}
+			}
+			if(data.readableBytes() > 0) {
+				logger.warn("Leftover data after reading multi-packet! ({} bytes)", data.readableBytes());
+			}
+			inputStream.buffer = null;
+			return true;
+		}
+		inputStream.buffer = data;
+		pkt = protocol.readPacket(channel, receiveDirection, inputStream);
+		if(pkt != null && inputStream.available() > 0) {
+			logger.warn("Leftover data after reading packet {}! ({} bytes)", pkt.getClass().getSimpleName(), inputStream.available());
+		}
+		inputStream.buffer = null;
+		if(pkt != null) {
+			try {
+				pkt.handlePacket(handler);
+			}catch(Throwable t) {
+				logger.error("Failed to handle packet {} in direction {} using handler {}!", pkt.getClass().getSimpleName(),
+						GamePluginMessageConstants.getDirectionString(receiveDirection), handler);
+				logger.error(t);
+			}
+			return true;
+		}else {
+			return false;
+		}
+	}
+
+	public void sendPacket(GameMessagePacket packet) throws IOException {
+		int len = packet.length() + 1;
+		PacketBuffer buf = new PacketBuffer(len != 0 ? Unpooled.buffer(len) : Unpooled.buffer(64));
+		outputStream.buffer = buf;
+		String chan = protocol.writePacket(sendDirection, outputStream, packet);
+		outputStream.buffer = null;
+		int j = buf.writerIndex();
+		if(len != 0 && j != len && j + 1 != len) {
+			logger.warn("Packet {} was expected to be {} bytes but was serialized to {} bytes!",
+					packet.getClass().getSimpleName(), len, j);
+		}
+		if(sendQueueV4 != null && chan.equals(GamePluginMessageConstants.V4_CHANNEL)) {
+			sendQueueV4.add(buf);
+		}else {
+			sendFunction.sendPluginMessage(chan, buf);
+		}
+	}
+
+	public void flush() {
+		if(sendQueueV4 != null) {
+			int queueLen = sendQueueV4.size();
+			PacketBuffer pkt;
+			if(queueLen == 0) {
+				return;
+			}else if(queueLen == 1) {
+				pkt = sendQueueV4.remove(0);
+				sendFunction.sendPluginMessage(GamePluginMessageConstants.V4_CHANNEL, pkt);
+			}else {
+				int i, j, sendCount = 0, totalLen = 0;
+				PacketBuffer sendBuffer;
+				while(sendQueueV4.size() > 0) {
+					do {
+						i = sendQueueV4.get(sendCount++).readableBytes();
+						totalLen += GamePacketOutputBuffer.getVarIntSize(i) + i;
+					}while(totalLen < 32760 && sendCount < sendQueueV4.size());
+					if(totalLen >= 32760) {
+						--sendCount;
+					}
+					if(sendCount <= 1) {
+						pkt = sendQueueV4.remove(0);
+						sendFunction.sendPluginMessage(GamePluginMessageConstants.V4_CHANNEL, pkt);
+						continue;
+					}
+					sendBuffer = new PacketBuffer(Unpooled.buffer(1 + totalLen + GamePacketOutputBuffer.getVarIntSize(sendCount))); 
+					sendBuffer.writeByte(0xFF);
+					sendBuffer.writeVarIntToBuffer(sendCount);
+					for(j = 0; j < sendCount; ++j) {
+						pkt = sendQueueV4.remove(0);
+						sendBuffer.writeVarIntToBuffer(pkt.readableBytes());
+						sendBuffer.writeBytes(pkt);
+					}
+					sendFunction.sendPluginMessage(GamePluginMessageConstants.V4_CHANNEL, sendBuffer);
+				}
+			}
+		}
+	}
+
+	public static GameMessageHandler createClientHandler(int protocolVersion, NetHandlerPlayClient netHandler) {
+		switch(protocolVersion) {
+		case 2:
+		case 3:
+			return new ClientV3MessageHandler(netHandler);
+		case 4:
+			return new ClientV4MessageHandler(netHandler);
+		default:
+			throw new IllegalArgumentException("Unknown protocol verison: " + protocolVersion);
+		}
+	}
+
+	public static GameMessageHandler createServerHandler(int protocolVersion, NetHandlerPlayServer netHandler) {
+		switch(protocolVersion) {
+		case 2:
+		case 3:
+			return new ServerV3MessageHandler(netHandler);
+		case 4:
+			return new ServerV4MessageHandler(netHandler);
+		default:
+			throw new IllegalArgumentException("Unknown protocol verison: " + protocolVersion);
+		}
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/IPluginMessageSendFunction.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/IPluginMessageSendFunction.java
new file mode 100755
index 0000000..1065cf9
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/IPluginMessageSendFunction.java
@@ -0,0 +1,24 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.client;
+
+import net.minecraft.network.PacketBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface IPluginMessageSendFunction {
+
+	void sendPluginMessage(String channel, PacketBuffer contents);
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/PacketBufferInputWrapper.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/PacketBufferInputWrapper.java
new file mode 100755
index 0000000..b8dda71
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/PacketBufferInputWrapper.java
@@ -0,0 +1,303 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.client;
+
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+
+import net.lax1dude.eaglercraft.v1_8.DecoderException;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.minecraft.network.PacketBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PacketBufferInputWrapper implements GamePacketInputBuffer {
+
+	protected PacketBuffer buffer;
+
+	public PacketBufferInputWrapper(PacketBuffer buffer) {
+		this.buffer = buffer;
+	}
+
+	public PacketBuffer getBuffer() {
+		return buffer;
+	}
+
+	public void setBuffer(PacketBuffer buffer) {
+		this.buffer = buffer;
+	}
+
+	@Override
+	public void readFully(byte[] b) throws IOException {
+		try {
+			buffer.readBytes(b);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public void readFully(byte[] b, int off, int len) throws IOException {
+		try {
+			buffer.readBytes(b, off, len);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public int skipBytes(int n) throws IOException {
+		int r = buffer.readableBytes();
+		if(n > r) {
+			n = r;
+		}
+		buffer.readerIndex(buffer.readerIndex() + n);
+		return n;
+	}
+
+	@Override
+	public boolean readBoolean() throws IOException {
+		try {
+			return buffer.readBoolean();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public byte readByte() throws IOException {
+		try {
+			return buffer.readByte();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public int readUnsignedByte() throws IOException {
+		try {
+			return buffer.readUnsignedByte();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public short readShort() throws IOException {
+		try {
+			return buffer.readShort();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public int readUnsignedShort() throws IOException {
+		try {
+			return buffer.readUnsignedShort();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public char readChar() throws IOException {
+		try {
+			return buffer.readChar();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public int readInt() throws IOException {
+		try {
+			return buffer.readInt();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public long readLong() throws IOException {
+		try {
+			return buffer.readLong();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public float readFloat() throws IOException {
+		try {
+			return buffer.readFloat();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public double readDouble() throws IOException {
+		try {
+			return buffer.readDouble();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public String readLine() throws IOException {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public String readUTF() throws IOException {
+		return DataInputStream.readUTF(this);
+	}
+
+	@Override
+	public void skipAllBytes(int n) throws IOException {
+		if(buffer.readableBytes() < n) {
+			throw new EOFException();
+		}
+		buffer.readerIndex(buffer.readerIndex() + n);
+	}
+
+	@Override
+	public int readVarInt() throws IOException {
+		try {
+			return buffer.readVarIntFromBuffer();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public long readVarLong() throws IOException {
+		try {
+			return buffer.readVarLong();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public String readStringMC(int maxLen) throws IOException {
+		try {
+			return buffer.readStringFromBuffer(maxLen);
+		}catch(DecoderException ex) {
+			throw new IOException(ex.getMessage());
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public String readStringEaglerASCII8() throws IOException {
+		int len = readUnsignedByte();
+		char[] ret = new char[len];
+		for(int i = 0; i < len; ++i) {
+			ret[i] = (char)readByte();
+		}
+		return new String(ret);
+	}
+
+	@Override
+	public String readStringEaglerASCII16() throws IOException {
+		int len = readUnsignedShort();
+		char[] ret = new char[len];
+		for(int i = 0; i < len; ++i) {
+			ret[i] = (char)readByte();
+		}
+		return new String(ret);
+	}
+
+	@Override
+	public byte[] readByteArrayMC() throws IOException {
+		try {
+			return buffer.readByteArray();
+		}catch(IndexOutOfBoundsException ex) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public int available() throws IOException {
+		return buffer.readableBytes();
+	}
+
+	@Override
+	public InputStream stream() {
+		return new InputStream() {
+
+			@Override
+			public int read() throws IOException {
+				if(buffer.readableBytes() > 0) {
+					return buffer.readUnsignedShort();
+				}else {
+					return -1;
+				}
+			}
+
+			@Override
+			public int read(byte b[], int off, int len) throws IOException {
+				int avail = buffer.readableBytes();
+				if(avail == 0) return -1;
+				len = avail > len ? avail : len;
+				buffer.readBytes(b, off, len);
+				return len;
+			}
+
+			@Override
+			public long skip(long n) throws IOException {
+				return PacketBufferInputWrapper.this.skipBytes((int)n);
+			}
+
+			@Override
+			public int available() throws IOException {
+				return buffer.readableBytes();
+			}
+
+			@Override
+		    public boolean markSupported() {
+		        return true;
+		    }
+
+			@Override
+			public synchronized void mark(int readlimit) {
+				buffer.markReaderIndex();
+			}
+
+			@Override
+		    public synchronized void reset() throws IOException {
+				try {
+					buffer.resetReaderIndex();
+				}catch(IndexOutOfBoundsException ex) {
+					throw new EOFException();
+				}
+			}
+
+		};
+	}
+
+	@Override
+	public byte[] toByteArray() throws IOException {
+		byte[] ret = new byte[buffer.readableBytes()];
+		buffer.readBytes(ret);
+		return ret;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/PacketBufferOutputWrapper.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/PacketBufferOutputWrapper.java
new file mode 100755
index 0000000..c228f7f
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/PacketBufferOutputWrapper.java
@@ -0,0 +1,316 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.client;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.minecraft.network.PacketBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PacketBufferOutputWrapper implements GamePacketOutputBuffer {
+
+	protected PacketBuffer buffer;
+
+	public PacketBufferOutputWrapper(PacketBuffer buffer) {
+		this.buffer = buffer;
+	}
+
+	public PacketBuffer getBuffer() {
+		return buffer;
+	}
+
+	public void setBuffer(PacketBuffer buffer) {
+		this.buffer = buffer;
+	}
+
+	@Override
+	public void write(int b) throws IOException {
+		try {
+			buffer.writeByte(b);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void write(byte[] b) throws IOException {
+		try {
+			buffer.writeBytes(b);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void write(byte[] b, int off, int len) throws IOException {
+		try {
+			buffer.writeBytes(b, off, len);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeBoolean(boolean v) throws IOException {
+		try {
+			buffer.writeBoolean(v);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeByte(int v) throws IOException {
+		try {
+			buffer.writeByte(v);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeShort(int v) throws IOException {
+		try {
+			buffer.writeShort(v);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeChar(int v) throws IOException {
+		try {
+			buffer.writeChar(v);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeInt(int v) throws IOException {
+		try {
+			buffer.writeInt(v);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeLong(long v) throws IOException {
+		try {
+			buffer.writeLong(v);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeFloat(float v) throws IOException {
+		try {
+			buffer.writeFloat(v);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeDouble(double v) throws IOException {
+		try {
+			buffer.writeDouble(v);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeBytes(String s) throws IOException {
+		try {
+			int l = s.length();
+			for(int i = 0; i < l; ++i) {
+				buffer.writeByte((int)s.charAt(i));
+			}
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeChars(String s) throws IOException {
+		try {
+			int l = s.length();
+			for(int i = 0; i < l; ++i) {
+				buffer.writeChar(s.charAt(i));
+			}
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public final void writeUTF(String str) throws IOException {
+		long utfCount = countUTFBytes(str);
+		if (utfCount > 65535) {
+			throw new IOException("String is longer than 65535 bytes when encoded as UTF8!");
+		}
+		byte[] arr = new byte[(int) utfCount + 2];
+		int offset = 2;
+		arr[0] = (byte)(((int)utfCount >>> 8) & 0xFF);
+		arr[1] = (byte)((int)utfCount & 0xFF);
+		offset = writeUTFBytesToBuffer(str, arr, offset);
+		try {
+			buffer.writeBytes(arr, 0, offset);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	private static long countUTFBytes(String str) {
+		int utfCount = 0;
+		int length = str.length();
+		for (int i = 0; i < length; i++) {
+			int charValue = str.charAt(i);
+			if (charValue > 0 && charValue <= 127) {
+				utfCount++;
+			} else if (charValue <= 2047) {
+				utfCount += 2;
+			} else {
+				utfCount += 3;
+			}
+		}
+		return utfCount;
+	}
+
+	private static int writeUTFBytesToBuffer(String str, byte[] buffer, int offset) throws IOException {
+		int length = str.length();
+		for (int i = 0; i < length; i++) {
+			int charValue = str.charAt(i);
+			if (charValue > 0 && charValue <= 127) {
+				buffer[offset++] = (byte) charValue;
+			} else if (charValue <= 2047) {
+				buffer[offset++] = (byte) (0xc0 | (0x1f & (charValue >> 6)));
+				buffer[offset++] = (byte) (0x80 | (0x3f & charValue));
+			} else {
+				buffer[offset++] = (byte) (0xe0 | (0x0f & (charValue >> 12)));
+				buffer[offset++] = (byte) (0x80 | (0x3f & (charValue >> 6)));
+				buffer[offset++] = (byte) (0x80 | (0x3f & charValue));
+			}
+		}
+		return offset;
+	}
+
+	@Override
+	public void writeVarInt(int i) throws IOException {
+		try {
+			buffer.writeVarIntToBuffer(i);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeVarLong(long i) throws IOException {
+		try {
+			buffer.writeVarLong(i);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeStringMC(String str) throws IOException {
+		try {
+			buffer.writeString(str);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeStringEaglerASCII8(String str) throws IOException {
+		int len = str.length();
+		if(len > 255) {
+			throw new IOException("String is longer than 255 chars! (" + len + ")");
+		}
+		try {
+			buffer.writeByte(len);
+			for(int i = 0, j; i < len; ++i) {
+				j = (int)str.charAt(i);
+				if(j > 255) {
+					j = (int)'?';
+				}
+				buffer.writeByte(j);
+			}
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeStringEaglerASCII16(String str) throws IOException {
+		int len = str.length();
+		if(len > 65535) {
+			throw new IOException("String is longer than 65535 chars! (" + len + ")");
+		}
+		try {
+			buffer.writeShort(len);
+			for(int i = 0, j; i < len; ++i) {
+				j = (int)str.charAt(i);
+				if(j > 255) {
+					j = (int)'?';
+				}
+				buffer.writeByte(j);
+			}
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public void writeByteArrayMC(byte[] bytes) throws IOException {
+		try {
+			buffer.writeByteArray(bytes);
+		}catch(IndexOutOfBoundsException ex) {
+			throw new IOException("Packet buffer overflowed!");
+		}
+	}
+
+	@Override
+	public OutputStream stream() {
+		return new OutputStream() {
+
+			@Override
+			public void write(int b) throws IOException {
+				try {
+					buffer.writeByte(b);
+				}catch(IndexOutOfBoundsException ex) {
+					throw new IOException("Packet buffer overflowed!");
+				}
+			}
+
+			@Override
+			public void write(byte b[], int off, int len) throws IOException {
+				try {
+					buffer.writeBytes(b, off, len);
+				}catch(IndexOutOfBoundsException ex) {
+					throw new IOException("Packet buffer overflowed!");
+				}
+			}
+
+		};
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java
index 11a0e24..ef490a2 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java
@@ -3,9 +3,11 @@ package net.lax1dude.eaglercraft.v1_8.sp;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
 
@@ -56,34 +58,59 @@ public class SingleplayerServerController implements ISaveFormat {
 	private static boolean loggingState = true;
 	private static String worldStatusString = "";
 	private static float worldStatusProgress = 0.0f;
-	private static final LinkedList<IPCPacket15Crashed> exceptions = new LinkedList();
+	private static final LinkedList<IPCPacket15Crashed> exceptions = new LinkedList<>();
+	private static final Set<Integer> issuesDetected = new HashSet<>();
 
 	public static final SingleplayerServerController instance = new SingleplayerServerController();
 	public static final Logger logger = LogManager.getLogger("SingleplayerServerController");
-	public static final List<SaveFormatComparator> saveListCache = new ArrayList();
-	public static final Map<String, WorldInfo> saveListMap = new HashMap();
-	public static final List<NBTTagCompound> saveListNBT = new ArrayList();
+	public static final List<SaveFormatComparator> saveListCache = new ArrayList<>();
+	public static final Map<String, WorldInfo> saveListMap = new HashMap<>();
+	public static final List<NBTTagCompound> saveListNBT = new ArrayList<>();
 
 	private static boolean isPaused = false;
-	private static List<String> integratedServerTPS = new ArrayList();
+	private static List<String> integratedServerTPS = new ArrayList<>();
 	private static long integratedServerLastTPSUpdate = 0;
 	public static final ClientIntegratedServerNetworkManager localPlayerNetworkManager = new ClientIntegratedServerNetworkManager(PLAYER_CHANNEL);
-	private static final List<String> openLANChannels = new ArrayList();
+	private static final List<String> openLANChannels = new ArrayList<>();
 
 	private static final IPCPacketManager packetManagerInstance = new IPCPacketManager();
 
 	private SingleplayerServerController() {
 	}
 
-	public static void startIntegratedServerWorker() {
+	public static void startIntegratedServerWorker(boolean forceSingleThread) {
 		if(statusState == IntegratedServerState.WORLD_WORKER_NOT_RUNNING) {
 			exceptions.clear();
+			issuesDetected.clear();
 			statusState = IntegratedServerState.WORLD_WORKER_BOOTING;
 			loggingState = true;
-			ClientPlatformSingleplayer.startIntegratedServer();
+			boolean singleThreadSupport = ClientPlatformSingleplayer.isSingleThreadModeSupported();
+			if(!singleThreadSupport && forceSingleThread) {
+				throw new UnsupportedOperationException("Single thread mode is not supported!");
+			}
+			if(forceSingleThread || !singleThreadSupport) {
+				ClientPlatformSingleplayer.startIntegratedServer(forceSingleThread);
+			}else {
+				try {
+					ClientPlatformSingleplayer.startIntegratedServer(forceSingleThread);
+				}catch(Throwable t) {
+					logger.error("Failed to start integrated server worker");
+					logger.error(t);
+					logger.error("Attempting to use single thread mode");
+					exceptions.clear();
+					issuesDetected.clear();
+					statusState = IntegratedServerState.WORLD_WORKER_BOOTING;
+					loggingState = true;
+					ClientPlatformSingleplayer.startIntegratedServer(true);
+				}
+			}
 		}
 	}
 
+	public static boolean isIssueDetected(int issue) {
+		return issuesDetected.contains(issue);
+	}
+
 	public static boolean isIntegratedServerWorkerStarted() {
 		return statusState != IntegratedServerState.WORLD_WORKER_NOT_RUNNING && statusState != IntegratedServerState.WORLD_WORKER_BOOTING;
 	}
@@ -196,7 +223,7 @@ public class SingleplayerServerController implements ISaveFormat {
 	}
 
 	public static long getTPSAge() {
-		return System.currentTimeMillis() - integratedServerLastTPSUpdate;
+		return EagRuntime.steadyTimeMillis() - integratedServerLastTPSUpdate;
 	}
 
 	public static boolean hangupEaglercraftServer() {
@@ -269,7 +296,11 @@ public class SingleplayerServerController implements ISaveFormat {
 		boolean logWindowState = PlatformApplication.isShowingDebugConsole();
 		if(loggingState != logWindowState) {
 			loggingState = logWindowState;
-			sendIPCPacket(new IPCPacket21EnableLogging(logWindowState));
+			sendIPCPacket(new IPCPacket1BEnableLogging(logWindowState));
+		}
+
+		if(ClientPlatformSingleplayer.isRunningSingleThreadMode()) {
+			ClientPlatformSingleplayer.updateSingleThreadMode();
 		}
 
 		LANServerController.updateLANServer();
@@ -385,17 +416,22 @@ public class SingleplayerServerController implements ISaveFormat {
 			if(pkt.opCode == IPCPacket14StringList.SERVER_TPS) {
 				integratedServerTPS.clear();
 				integratedServerTPS.addAll(pkt.stringList);
-				integratedServerLastTPSUpdate = System.currentTimeMillis();
+				integratedServerLastTPSUpdate = EagRuntime.steadyTimeMillis();
 			}else {
 				logger.warn("Strange string list type {} recieved!", pkt.opCode);
 			}
 			break;
 		}
-		case IPCPacket20LoggerMessage.ID: {
-			IPCPacket20LoggerMessage pkt = (IPCPacket20LoggerMessage)ipc;
+		case IPCPacket1ALoggerMessage.ID: {
+			IPCPacket1ALoggerMessage pkt = (IPCPacket1ALoggerMessage)ipc;
 			PlatformApplication.addLogMessage(pkt.logMessage, pkt.isError);
 			break;
 		}
+		case IPCPacket1CIssueDetected.ID: {
+			IPCPacket1CIssueDetected pkt = (IPCPacket1CIssueDetected)ipc;
+			issuesDetected.add(pkt.issueID);
+			break;
+		}
 		default:
 			throw new RuntimeException("Unexpected IPC packet type recieved on client: " + ipc.id());
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SkullCommand.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SkullCommand.java
index 0530310..900eba1 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SkullCommand.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SkullCommand.java
@@ -3,9 +3,8 @@ package net.lax1dude.eaglercraft.v1_8.sp;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
 import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-import net.lax1dude.eaglercraft.v1_8.profile.SkinPackets;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketInstallSkinSPEAG;
 import net.minecraft.client.Minecraft;
-import net.minecraft.network.play.client.C17PacketCustomPayload;
 import net.minecraft.util.ChatComponentTranslation;
 
 /**
@@ -44,9 +43,9 @@ public class SkullCommand {
 			if(fr == null || mc.thePlayer == null || mc.thePlayer.sendQueue == null) {
 				return;
 			}
-			ImageData loaded = ImageData.loadImageFile(fr.fileData);
+			ImageData loaded = ImageData.loadImageFile(fr.fileData, ImageData.getMimeFromType(fr.fileName));
 			if(loaded == null) {
-				mc.ingameGUI.getChatGUI().printChatMessage(new ChatComponentTranslation("command.skull.error.invalid.png"));
+				mc.ingameGUI.getChatGUI().printChatMessage(new ChatComponentTranslation("command.skull.error.invalid.format"));
 				return;
 			}
 			if(loaded.width != 64 || loaded.height > 64) {
@@ -62,7 +61,7 @@ public class SkullCommand {
 				rawSkin[j + 2] = (byte)(k >>> 8);
 				rawSkin[j + 3] = (byte)(k & 0xFF);
 			}
-			mc.thePlayer.sendQueue.addToSendQueue(new C17PacketCustomPayload("EAG|Skins-1.8", SkinPackets.writeCreateCustomSkull(rawSkin)));
+			mc.thePlayer.sendQueue.sendEaglerMessage(new CPacketInstallSkinSPEAG(rawSkin));
 		}
 	}
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiIntegratedServerStartup.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiIntegratedServerStartup.java
deleted file mode 100755
index 624890e..0000000
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiIntegratedServerStartup.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.sp.gui;
-
-import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiSelectWorld;
-import net.minecraft.client.resources.I18n;
-
-/**
- * Copyright (c) 2023-2024 lax1dude. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class GuiIntegratedServerStartup extends GuiScreen {
-
-	private final GuiScreen backScreen;
-	private static final String[] dotDotDot = new String[] { "", ".", "..", "..." };
-
-	private int counter = 0;
-
-	public GuiIntegratedServerStartup(GuiScreen backScreen) {
-		this.backScreen = backScreen;
-	}
-
-	protected void keyTyped(char parChar1, int parInt1) {
-	}
-
-	public void initGui() {
-		this.buttonList.clear();
-	}
-
-	public void updateScreen() {
-		++counter;
-		if(counter > 1 && SingleplayerServerController.isIntegratedServerWorkerStarted()) {
-			mc.displayGuiScreen(new GuiSelectWorld(backScreen));
-		}else if(counter == 2) {
-			SingleplayerServerController.startIntegratedServerWorker();
-		}
-	}
-
-	public void drawScreen(int i, int j, float f) {
-		this.drawBackground(0);
-		String txt = I18n.format("singleplayer.integratedStartup");
-		int w = this.fontRendererObj.getStringWidth(txt);
-		this.drawString(this.fontRendererObj, txt + dotDotDot[(int)((System.currentTimeMillis() / 300L) % 4L)], (this.width - w) / 2, this.height / 2 - 50, 16777215);
-		super.drawScreen(i, j, f);
-	}
-
-}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenAddRelay.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenAddRelay.java
index 838a3d3..9ec28a8 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenAddRelay.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenAddRelay.java
@@ -2,6 +2,7 @@ package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -143,4 +144,16 @@ public class GuiScreenAddRelay extends GuiScreen {
 	public boolean blockPTTKey() {
 		return this.serverName.isFocused() || this.serverAddress.isFocused();
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return this.serverName.isFocused() || this.serverAddress.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		this.serverName.fireInputEvent(event, param);
+		this.serverAddress.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenDemoIntegratedServerStartup.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenDemoIntegratedServerStartup.java
index 492f709..6d98ef6 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenDemoIntegratedServerStartup.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenDemoIntegratedServerStartup.java
@@ -1,9 +1,14 @@
 package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.WorkerStartupFailedException;
 import net.lax1dude.eaglercraft.v1_8.sp.ipc.IPCPacket15Crashed;
+import net.lax1dude.eaglercraft.v1_8.sp.ipc.IPCPacket1CIssueDetected;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiSelectWorld;
 import net.minecraft.client.resources.I18n;
 
 /**
@@ -24,46 +29,76 @@ import net.minecraft.client.resources.I18n;
 public class GuiScreenDemoIntegratedServerStartup extends GuiScreen {
 
 	private final GuiScreen contScreen;
+	private final boolean singleThread;
 	private static final String[] dotDotDot = new String[] { "", ".", "..", "..." };
 
 	private int counter = 0;
 
+	private GuiButton cancelButton;
+
 	public GuiScreenDemoIntegratedServerStartup(GuiScreen contScreen) {
 		this.contScreen = contScreen;
+		this.singleThread = false;
 	}
 
-	protected void keyTyped(char parChar1, int parInt1) {
+	public GuiScreenDemoIntegratedServerStartup(GuiScreen contScreen, boolean singleThread) {
+		this.contScreen = contScreen;
+		this.singleThread = singleThread;
 	}
 
 	public void initGui() {
 		this.buttonList.clear();
+		this.buttonList.add(cancelButton = new GuiButton(0, this.width / 2 - 100, this.height / 3 + 50, I18n.format("singleplayer.busy.killTask")));
+		cancelButton.visible = false;
 	}
 
 	public void updateScreen() {
 		++counter;
 		if(counter == 2) {
 			try {
-				SingleplayerServerController.startIntegratedServerWorker();
+				SingleplayerServerController.startIntegratedServerWorker(singleThread);
 			}catch(WorkerStartupFailedException ex) {
 				mc.displayGuiScreen(new GuiScreenIntegratedServerFailed(ex.getMessage(), new GuiScreenDemoIntegratedServerFailed()));
 				return;
 			}
 		}else if(counter > 2) {
+			if(counter > 100 && SingleplayerServerController.canKillWorker() && !singleThread) {
+				cancelButton.visible = true;
+			}
 			IPCPacket15Crashed[] crashReport = SingleplayerServerController.worldStatusErrors();
 			if(crashReport != null) {
 				mc.displayGuiScreen(GuiScreenIntegratedServerBusy.createException(new GuiScreenDemoIntegratedServerFailed(), "singleplayer.failed.notStarted", crashReport));
 			}else if(SingleplayerServerController.isIntegratedServerWorkerStarted()) {
-				mc.displayGuiScreen(contScreen);
+				GuiScreen cont = contScreen;
+				if(SingleplayerServerController.isRunningSingleThreadMode()) {
+					cont = new GuiScreenIntegratedServerFailed("singleplayer.failed.singleThreadWarning.1", "singleplayer.failed.singleThreadWarning.2", cont);
+				} else if (!EagRuntime.getConfiguration().isRamdiskMode()
+						&& SingleplayerServerController.isIssueDetected(IPCPacket1CIssueDetected.ISSUE_RAMDISK_MODE)
+						&& SingleplayerServerController.canKillWorker()) {
+					cont = new GuiScreenRAMDiskModeDetected(cont);
+				}
+				mc.displayGuiScreen(cont);
 			}
 		}
 	}
 
+	protected void actionPerformed(GuiButton parGuiButton) {
+		if(parGuiButton.id == 0) {
+			SingleplayerServerController.killWorker();
+			mc.displayGuiScreen(new GuiScreenDemoIntegratedServerStartup(contScreen, true));
+		}
+	}
+
 	public void drawScreen(int i, int j, float f) {
 		this.drawBackground(0);
 		String txt = I18n.format("singleplayer.integratedStartup");
 		int w = this.fontRendererObj.getStringWidth(txt);
-		this.drawString(this.fontRendererObj, txt + dotDotDot[(int)((System.currentTimeMillis() / 300L) % 4L)], (this.width - w) / 2, this.height / 2 - 50, 16777215);
+		this.drawString(this.fontRendererObj, txt + dotDotDot[(int)((EagRuntime.steadyTimeMillis() / 300L) % 4L)], (this.width - w) / 2, this.height / 2 - 50, 16777215);
 		super.drawScreen(i, j, f);
 	}
 
+	public boolean canCloseGui() {
+		return false;
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerBusy.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerBusy.java
index 20c837e..7caf337 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerBusy.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerBusy.java
@@ -88,7 +88,7 @@ public class GuiScreenIntegratedServerBusy extends GuiScreen {
 	}
 	
 	public void initGui() {
-		if(startStartTime == 0) this.startStartTime = System.currentTimeMillis();
+		if(startStartTime == 0) this.startStartTime = EagRuntime.steadyTimeMillis();
 		areYouSure = 0;
 		this.buttonList.add(killTask = new GuiButton(0, this.width / 2 - 100, this.height / 3 + 50, I18n.format("singleplayer.busy.killTask")));
 		killTask.enabled = false;
@@ -102,7 +102,7 @@ public class GuiScreenIntegratedServerBusy extends GuiScreen {
 		this.drawDefaultBackground();
 		int top = this.height / 3;
 		
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		
 		String str = I18n.format(currentStatus);
 		
@@ -128,7 +128,7 @@ public class GuiScreenIntegratedServerBusy extends GuiScreen {
 	}
 	
 	public void updateScreen() {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		if(millis - startStartTime > 6000l && SingleplayerServerController.canKillWorker()) {
 			killTask.enabled = true;
 		}
@@ -164,4 +164,8 @@ public class GuiScreenIntegratedServerBusy extends GuiScreen {
 		return false;
 	}
 
+	public boolean canCloseGui() {
+		return false;
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerCrashed.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerCrashed.java
index 7ed9722..f291c83 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerCrashed.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerCrashed.java
@@ -2,7 +2,6 @@ package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.resources.I18n;
 
 /**
@@ -33,8 +32,7 @@ public class GuiScreenIntegratedServerCrashed extends GuiScreen {
 	public void initGui() {
 		this.buttonList.clear();
 		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height - 50, I18n.format("singleplayer.crashed.continue")));
-		ScaledResolution res = new ScaledResolution(mc);
-		int i = res.getScaleFactor();
+		int i = mc.scaledResolution.getScaleFactor();
 		CrashScreen.showCrashReportOverlay(crashReport, 90 * i, 60 * i, (width - 180) * i, (height - 130) * i);
 	}
 	
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerFailed.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerFailed.java
index 1b1f640..ac180cc 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerFailed.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerFailed.java
@@ -1,6 +1,9 @@
 package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
+import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
+import net.lax1dude.eaglercraft.v1_8.sp.internal.ClientPlatformSingleplayer;
 import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
 
@@ -40,6 +43,9 @@ public class GuiScreenIntegratedServerFailed extends GuiScreen {
 	public void initGui() {
 		this.buttonList.clear();
 		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 96, I18n.format("singleplayer.crashed.continue")));
+		if(!ClientPlatformSingleplayer.isRunningSingleThreadMode() && ClientPlatformSingleplayer.isSingleThreadModeSupported()) {
+			this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 6 + 126, I18n.format("singleplayer.crashed.singleThreadCont")));
+		}
 	}
 
 	public void drawScreen(int par1, int par2, float par3) {
@@ -52,6 +58,12 @@ public class GuiScreenIntegratedServerFailed extends GuiScreen {
 	protected void actionPerformed(GuiButton par1GuiButton) {
 		if(par1GuiButton.id == 0) {
 			this.mc.displayGuiScreen(cont);
+		}else if(par1GuiButton.id == 1) {
+			if(SingleplayerServerController.canKillWorker()) {
+				SingleplayerServerController.killWorker();
+			}
+			this.mc.displayGuiScreen(new GuiScreenIntegratedServerStartup(new GuiMainMenu(), true));
 		}
 	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerStartup.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerStartup.java
index da7ee49..d805c6a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerStartup.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenIntegratedServerStartup.java
@@ -1,8 +1,11 @@
 package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.WorkerStartupFailedException;
 import net.lax1dude.eaglercraft.v1_8.sp.ipc.IPCPacket15Crashed;
+import net.lax1dude.eaglercraft.v1_8.sp.ipc.IPCPacket1CIssueDetected;
+import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiSelectWorld;
@@ -26,31 +29,42 @@ import net.minecraft.client.resources.I18n;
 public class GuiScreenIntegratedServerStartup extends GuiScreen {
 
 	private final GuiScreen backScreen;
+	private final boolean singleThread;
 	private static final String[] dotDotDot = new String[] { "", ".", "..", "..." };
 
 	private int counter = 0;
 
+	private GuiButton cancelButton;
+
 	public GuiScreenIntegratedServerStartup(GuiScreen backScreen) {
 		this.backScreen = backScreen;
+		this.singleThread = false;
 	}
 
-	protected void keyTyped(char parChar1, int parInt1) {
+	public GuiScreenIntegratedServerStartup(GuiScreen backScreen, boolean singleThread) {
+		this.backScreen = backScreen;
+		this.singleThread = singleThread;
 	}
 
 	public void initGui() {
 		this.buttonList.clear();
+		this.buttonList.add(cancelButton = new GuiButton(0, this.width / 2 - 100, this.height / 3 + 50, I18n.format("singleplayer.busy.killTask")));
+		cancelButton.visible = false;
 	}
 
 	public void updateScreen() {
 		++counter;
 		if(counter == 2) {
 			try {
-				SingleplayerServerController.startIntegratedServerWorker();
+				SingleplayerServerController.startIntegratedServerWorker(singleThread);
 			}catch(WorkerStartupFailedException ex) {
 				mc.displayGuiScreen(new GuiScreenIntegratedServerFailed(ex.getMessage(), new GuiMainMenu()));
 				return;
 			}
 		}else if(counter > 2) {
+			if(counter > 100 && SingleplayerServerController.canKillWorker() && !singleThread) {
+				cancelButton.visible = true;
+			}
 			IPCPacket15Crashed[] crashReport = SingleplayerServerController.worldStatusErrors();
 			if(crashReport != null) {
 				mc.displayGuiScreen(GuiScreenIntegratedServerBusy.createException(new GuiMainMenu(), "singleplayer.failed.notStarted", crashReport));
@@ -58,18 +72,33 @@ public class GuiScreenIntegratedServerStartup extends GuiScreen {
 				GuiScreen cont = new GuiSelectWorld(backScreen);
 				if(SingleplayerServerController.isRunningSingleThreadMode()) {
 					cont = new GuiScreenIntegratedServerFailed("singleplayer.failed.singleThreadWarning.1", "singleplayer.failed.singleThreadWarning.2", cont);
+				} else if (!EagRuntime.getConfiguration().isRamdiskMode()
+						&& SingleplayerServerController.isIssueDetected(IPCPacket1CIssueDetected.ISSUE_RAMDISK_MODE)
+						&& SingleplayerServerController.canKillWorker()) {
+					cont = new GuiScreenRAMDiskModeDetected(cont);
 				}
 				mc.displayGuiScreen(cont);
 			}
 		}
 	}
 
+	protected void actionPerformed(GuiButton parGuiButton) {
+		if(parGuiButton.id == 0) {
+			SingleplayerServerController.killWorker();
+			mc.displayGuiScreen(new GuiScreenIntegratedServerStartup(new GuiMainMenu(), true));
+		}
+	}
+
 	public void drawScreen(int i, int j, float f) {
 		this.drawBackground(0);
 		String txt = I18n.format("singleplayer.integratedStartup");
 		int w = this.fontRendererObj.getStringWidth(txt);
-		this.drawString(this.fontRendererObj, txt + dotDotDot[(int)((System.currentTimeMillis() / 300L) % 4L)], (this.width - w) / 2, this.height / 2 - 50, 16777215);
+		this.drawString(this.fontRendererObj, txt + dotDotDot[(int)((EagRuntime.steadyTimeMillis() / 300L) % 4L)], (this.width - w) / 2, this.height / 2 - 50, 16777215);
 		super.drawScreen(i, j, f);
 	}
 
+	public boolean canCloseGui() {
+		return false;
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnect.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnect.java
index 94d4dc7..1d6276a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnect.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnect.java
@@ -1,6 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
@@ -88,4 +89,14 @@ public class GuiScreenLANConnect extends GuiScreen {
 		}
 	}
 
+	@Override
+	public boolean showCopyPasteButtons() {
+		return codeTextField.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		codeTextField.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnecting.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnecting.java
index c1b594e..02bba8a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnecting.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnecting.java
@@ -1,7 +1,9 @@
 package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
+import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
 import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
+import net.lax1dude.eaglercraft.v1_8.socket.ConnectionHandshake;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANClientNetworkManager;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServer;
@@ -120,9 +122,15 @@ public class GuiScreenLANConnecting extends GuiScreen {
 				this.mc.clearTitles();
 				networkManager.setConnectionState(EnumConnectionState.LOGIN);
 				networkManager.setNetHandler(new NetHandlerSingleplayerLogin(networkManager, mc, parent));
-				networkManager.sendPacket(new C00PacketLoginStart(this.mc.getSession().getProfile(), EaglerProfile.getSkinPacket(), EaglerProfile.getCapePacket()));
+				networkManager.sendPacket(new C00PacketLoginStart(this.mc.getSession().getProfile(),
+						EaglerProfile.getSkinPacket(3), EaglerProfile.getCapePacket(),
+						ConnectionHandshake.getSPHandshakeProtocolData(), EaglercraftVersion.clientBrandUUID));
 			}
 		}
 	}
 
+	public boolean canCloseGui() {
+		return false;
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenNameWorldImport.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenNameWorldImport.java
index f6808e7..7414c7c 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenNameWorldImport.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenNameWorldImport.java
@@ -3,6 +3,7 @@ package net.lax1dude.eaglercraft.v1_8.sp.gui;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiCreateWorld;
@@ -144,10 +145,21 @@ public class GuiScreenNameWorldImport extends GuiScreen {
 			this.theGuiTextField.drawTextBox();
 		}else {
 			definetlyTimeToImport = true;
-			long dots = (System.currentTimeMillis() / 500l) % 4l;
+			long dots = (EagRuntime.steadyTimeMillis() / 500l) % 4l;
 			String str = I18n.format("singleplayer.import.reading", world.fileName);
 			this.drawString(fontRendererObj, str + (dots > 0 ? "." : "") + (dots > 1 ? "." : "") + (dots > 2 ? "." : ""), (this.width - this.fontRendererObj.getStringWidth(str)) / 2, this.height / 3 + 10, 0xFFFFFF);
 		}
 		super.drawScreen(par1, par2, par3);
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return theGuiTextField.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		theGuiTextField.fireInputEvent(event, param);
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenRAMDiskModeDetected.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenRAMDiskModeDetected.java
new file mode 100755
index 0000000..85eef64
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenRAMDiskModeDetected.java
@@ -0,0 +1,55 @@
+package net.lax1dude.eaglercraft.v1_8.sp.gui;
+
+import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiMainMenu;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenRAMDiskModeDetected extends GuiScreen {
+
+	private GuiScreen cont;
+
+	public GuiScreenRAMDiskModeDetected(GuiScreen cont) {
+		this.cont = cont;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 106, I18n.format("singleplayer.ramdiskdetected.continue")));
+		this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 6 + 136, I18n.format("singleplayer.ramdiskdetected.singleThreadCont")));
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, I18n.format("singleplayer.ramdiskdetected.title"), this.width / 2, 70, 11184810);
+		this.drawCenteredString(fontRendererObj, I18n.format("singleplayer.ramdiskdetected.text0"), this.width / 2, 90, 16777215);
+		this.drawCenteredString(fontRendererObj, I18n.format("singleplayer.ramdiskdetected.text1"), this.width / 2, 105, 16777215);
+		super.drawScreen(par1, par2, par3);
+	}
+
+	protected void actionPerformed(GuiButton par1GuiButton) {
+		if(par1GuiButton.id == 0) {
+			this.mc.displayGuiScreen(cont);
+		}else if(par1GuiButton.id == 1) {
+			SingleplayerServerController.killWorker();
+			mc.displayGuiScreen(new GuiScreenIntegratedServerStartup(new GuiMainMenu(), true));
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenRelay.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenRelay.java
index 8a526fa..25f65c3 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenRelay.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenRelay.java
@@ -98,7 +98,7 @@ public class GuiScreenRelay extends GuiScreen implements GuiYesNoCallback {
 				selected = 0;
 			}
 		} else if(btn.id == 4) {
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			if(millis - lastRefresh > 700l) {
 				lastRefresh = millis;
 				slots.relayManager.ping();
@@ -106,14 +106,14 @@ public class GuiScreenRelay extends GuiScreen implements GuiYesNoCallback {
 			lastRefresh += 60l;
 		} else if(btn.id == 5) {
 			slots.relayManager.loadDefaults();
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			if(millis - lastRefresh > 700l) {
 				lastRefresh = millis;
 				slots.relayManager.ping();
 			}
 			lastRefresh += 60l;
 		} else if(btn.id == 6) {
-			EagRuntime.downloadFileWithName("EaglerSPRelay.zip", EagRuntime.getResourceBytes("relay_download.zip"));
+			EagRuntime.downloadFileWithName("EaglerSPRelay.zip", EagRuntime.getRequiredResourceBytes("relay_download.zip"));
 		}
 	}
 
@@ -215,4 +215,10 @@ public class GuiScreenRelay extends GuiScreen implements GuiYesNoCallback {
 		this.slots.handleMouseInput();
 	}
 
+	@Override
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		this.slots.handleTouchInput();
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenSingleplayerConnecting.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenSingleplayerConnecting.java
index 7f4f48b..b54d823 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenSingleplayerConnecting.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenSingleplayerConnecting.java
@@ -2,7 +2,10 @@ package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
 import java.io.IOException;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
 import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
+import net.lax1dude.eaglercraft.v1_8.socket.ConnectionHandshake;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkManager;
 import net.lax1dude.eaglercraft.v1_8.sp.socket.NetHandlerSingleplayerLogin;
@@ -47,7 +50,7 @@ public class GuiScreenSingleplayerConnecting extends GuiScreen {
 	}
 	
 	public void initGui() {
-		if(startStartTime == 0) this.startStartTime = System.currentTimeMillis();
+		if(startStartTime == 0) this.startStartTime = EagRuntime.steadyTimeMillis();
 		this.buttonList.add(killTask = new GuiButton(0, this.width / 2 - 100, this.height / 3 + 50, I18n.format("singleplayer.busy.killTask")));
 		killTask.enabled = false;
 	}
@@ -57,7 +60,7 @@ public class GuiScreenSingleplayerConnecting extends GuiScreen {
 		float f = 2.0f;
 		int top = this.height / 3;
 		
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		
 		long dots = (millis / 500l) % 4l;
 		this.drawString(fontRendererObj, message + (dots > 0 ? "." : "") + (dots > 1 ? "." : "") + (dots > 2 ? "." : ""), (this.width - this.fontRendererObj.getStringWidth(message)) / 2, top + 10, 0xFFFFFF);
@@ -88,7 +91,9 @@ public class GuiScreenSingleplayerConnecting extends GuiScreen {
 						this.mc.clearTitles();
 						this.networkManager.setConnectionState(EnumConnectionState.LOGIN);
 						this.networkManager.setNetHandler(new NetHandlerSingleplayerLogin(this.networkManager, this.mc, this.menu));
-						this.networkManager.sendPacket(new C00PacketLoginStart(this.mc.getSession().getProfile(), EaglerProfile.getSkinPacket(), EaglerProfile.getCapePacket()));
+						this.networkManager.sendPacket(new C00PacketLoginStart(this.mc.getSession().getProfile(),
+								EaglerProfile.getSkinPacket(3), EaglerProfile.getCapePacket(),
+								ConnectionHandshake.getSPHandshakeProtocolData(), EaglercraftVersion.clientBrandUUID));
 					}
 					try {
 						this.networkManager.processReceivedPackets();
@@ -106,7 +111,7 @@ public class GuiScreenSingleplayerConnecting extends GuiScreen {
 			}
 		}
 		
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		if(millis - startStartTime > 6000l && SingleplayerServerController.canKillWorker()) {
 			killTask.enabled = true;
 		}
@@ -124,4 +129,9 @@ public class GuiScreenSingleplayerConnecting extends GuiScreen {
 	public boolean shouldHangupIntegratedServer() {
 		return false;
 	}
+
+	public boolean canCloseGui() {
+		return false;
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java
index 63a458b..98a3afc 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java
@@ -1,6 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;
 import net.minecraft.client.LoadingScreenRenderer;
@@ -198,4 +199,15 @@ public class GuiShareToLan extends GuiScreen {
 	public boolean blockPTTKey() {
 		return this.codeTextField.isFocused();
 	}
+
+	@Override
+	public boolean showCopyPasteButtons() {
+		return this.codeTextField.isFocused();
+	}
+
+	@Override
+	public void fireInputEvent(EnumInputEvent event, String param) {
+		this.codeTextField.fireInputEvent(event, param);
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiSlider2.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiSlider2.java
index ef70409..2c63698 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiSlider2.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiSlider2.java
@@ -27,10 +27,11 @@ public class GuiSlider2 extends GuiButton {
 	/** Is this slider control being dragged. */
 	public boolean dragging = false;
 
-	public GuiSlider2(int par1, int par2, int par3, int par4, int par5, float par6, float par7) {
-		super(par1, par2, par3, par4, par5, (int)(par6 * par7 * 100.0F) + "%");
-		this.sliderValue = par6;
-		this.sliderMax = par7;
+	public GuiSlider2(int buttonId, int x, int y, int widthIn, int heightIn, float sliderValue, float sliderMax) {
+		super(buttonId, x, y, widthIn, heightIn, null);
+		this.sliderValue = sliderValue;
+		this.sliderMax = sliderMax;
+		this.displayString = updateDisplayString();
 	}
 
 	/**
@@ -48,6 +49,7 @@ public class GuiSlider2 extends GuiButton {
 	protected void mouseDragged(Minecraft par1Minecraft, int par2, int par3) {
 		if (this.visible) {
 			if (this.dragging) {
+				float oldValue = sliderValue;
 				this.sliderValue = (float) (par2 - (this.xPosition + 4)) / (float) (this.width - 8);
 
 				if (this.sliderValue < 0.0F) {
@@ -58,7 +60,11 @@ public class GuiSlider2 extends GuiButton {
 					this.sliderValue = 1.0F;
 				}
 
-				this.displayString = (int)(this.sliderValue * this.sliderMax * 100.0F) + "%";
+				if(oldValue != sliderValue) {
+					onChange();
+				}
+
+				this.displayString = updateDisplayString();
 			}
 
 			if(this.enabled) {
@@ -75,6 +81,7 @@ public class GuiSlider2 extends GuiButton {
 	 */
 	public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) {
 		if (super.mousePressed(par1Minecraft, par2, par3)) {
+			float oldValue = sliderValue;
 			this.sliderValue = (float) (par2 - (this.xPosition + 4)) / (float) (this.width - 8);
 
 			if (this.sliderValue < 0.0F) {
@@ -85,7 +92,11 @@ public class GuiSlider2 extends GuiButton {
 				this.sliderValue = 1.0F;
 			}
 
-			this.displayString = (int)(this.sliderValue * this.sliderMax * 100.0F) + "%";
+			if(oldValue != sliderValue) {
+				onChange();
+			}
+
+			this.displayString = updateDisplayString();
 			this.dragging = true;
 			return true;
 		} else {
@@ -100,4 +111,17 @@ public class GuiSlider2 extends GuiButton {
 	public void mouseReleased(int par1, int par2) {
 		this.dragging = false;
 	}
+
+	protected String updateDisplayString() {
+		return (int)(this.sliderValue * this.sliderMax * 100.0F) + "%";
+	}
+
+	protected void onChange() {
+		
+	}
+
+	public boolean isSliderTouchEvents() {
+		return true;
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket14StringList.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket14StringList.java
index 16f7f08..bf800a2 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket14StringList.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket14StringList.java
@@ -34,11 +34,11 @@ public class IPCPacket14StringList implements IPCPacketBase {
 	public final List<String> stringList;
 	
 	public IPCPacket14StringList() {
-		stringList = new ArrayList();
+		stringList = new ArrayList<>();
 	}
 	
 	public IPCPacket14StringList(int opcode, String[] list) {
-		stringList = new ArrayList();
+		stringList = new ArrayList<>(list.length);
 		for(int i = 0; i < list.length; ++i) {
 			String s = list[i].trim();
 			if(s.length() > 0) {
@@ -49,7 +49,7 @@ public class IPCPacket14StringList implements IPCPacketBase {
 	}
 	
 	public IPCPacket14StringList(int opcode, List<String> list) {
-		stringList = new ArrayList();
+		stringList = new ArrayList<>(list.size());
 		for(int i = 0, l = list.size(); i < l; ++i) {
 			String s = list.get(i).trim();
 			if(s.length() > 0) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket16NBTList.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket16NBTList.java
index 91544a5..17c2a42 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket16NBTList.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket16NBTList.java
@@ -40,8 +40,8 @@ public class IPCPacket16NBTList implements IPCPacketBase {
 	public final List<NBTTagCompound> nbtTagList;
 	
 	public IPCPacket16NBTList() {
-		tagList = new LinkedList();
-		nbtTagList = new LinkedList();
+		tagList = new LinkedList<>();
+		nbtTagList = new LinkedList<>();
 	}
 	
 	public IPCPacket16NBTList(int opcode, NBTTagCompound[] list) {
@@ -49,7 +49,7 @@ public class IPCPacket16NBTList implements IPCPacketBase {
 	}
 	
 	public IPCPacket16NBTList(int opcode, List<NBTTagCompound> list) {
-		tagList = new LinkedList();
+		tagList = new LinkedList<>();
 		nbtTagList = list;
 		for(int i = 0, size = list.size(); i < size; ++i) {
 			NBTTagCompound tag = list.get(i);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket17ConfigureLAN.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket17ConfigureLAN.java
index 7327e77..0d1bf6a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket17ConfigureLAN.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket17ConfigureLAN.java
@@ -30,7 +30,7 @@ public class IPCPacket17ConfigureLAN implements IPCPacketBase {
 	public final List<String> iceServers;
 	
 	public IPCPacket17ConfigureLAN() {
-		iceServers = new ArrayList();
+		iceServers = new ArrayList<>();
 	}
 	
 	public IPCPacket17ConfigureLAN(int gamemode, boolean cheats, List<String> iceServers) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket20LoggerMessage.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket1ALoggerMessage.java
similarity index 83%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket20LoggerMessage.java
rename to src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket1ALoggerMessage.java
index dd200c9..b2ed0e5 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket20LoggerMessage.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket1ALoggerMessage.java
@@ -19,22 +19,22 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPCPacket20LoggerMessage implements IPCPacketBase {
+public class IPCPacket1ALoggerMessage implements IPCPacketBase {
 	
-	public static final int ID = 0x20;
+	public static final int ID = 0x1A;
 
 	public String logMessage;
 	public boolean isError;
 	
-	public IPCPacket20LoggerMessage() {
+	public IPCPacket1ALoggerMessage() {
 	}
 	
-	public IPCPacket20LoggerMessage(String logMessage, boolean isError) {
+	public IPCPacket1ALoggerMessage(String logMessage, boolean isError) {
 		this.logMessage = logMessage;
 		this.isError = isError;
 	}
 	
-	public IPCPacket20LoggerMessage(String logMessage) {
+	public IPCPacket1ALoggerMessage(String logMessage) {
 		this.logMessage = logMessage;
 		this.isError = false;
 	}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket21EnableLogging.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket1BEnableLogging.java
similarity index 84%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket21EnableLogging.java
rename to src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket1BEnableLogging.java
index 71dab84..f97cece 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket21EnableLogging.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket1BEnableLogging.java
@@ -19,16 +19,16 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPCPacket21EnableLogging implements IPCPacketBase {
+public class IPCPacket1BEnableLogging implements IPCPacketBase {
 	
-	public static final int ID = 0x21;
+	public static final int ID = 0x1B;
 
 	public boolean enable;
 	
-	public IPCPacket21EnableLogging() {
+	public IPCPacket1BEnableLogging() {
 	}
 	
-	public IPCPacket21EnableLogging(boolean enable) {
+	public IPCPacket1BEnableLogging(boolean enable) {
 		this.enable = enable;
 	}
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket1CIssueDetected.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket1CIssueDetected.java
new file mode 100755
index 0000000..f4ca120
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket1CIssueDetected.java
@@ -0,0 +1,57 @@
+package net.lax1dude.eaglercraft.v1_8.sp.ipc;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class IPCPacket1CIssueDetected implements IPCPacketBase {
+
+	public static final int ID = 0x1C;
+
+	public static final int ISSUE_RAMDISK_MODE = 0x01;
+
+	public int issueID;
+
+	public IPCPacket1CIssueDetected() {
+	}
+
+	public IPCPacket1CIssueDetected(int issueID) {
+		this.issueID = issueID;
+	}
+
+	@Override
+	public void deserialize(DataInput bin) throws IOException {
+		issueID = bin.readUnsignedByte();
+	}
+
+	@Override
+	public void serialize(DataOutput bin) throws IOException {
+		bin.writeByte(issueID);
+	}
+
+	@Override
+	public int id() {
+		return ID;
+	}
+
+	@Override
+	public int size() {
+		return 1;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacketManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacketManager.java
index 97684df..96080f1 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacketManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacketManager.java
@@ -23,7 +23,7 @@ import java.util.function.Supplier;
  */
 public class IPCPacketManager {
 	
-	public static final HashMap<Integer, Supplier<IPCPacketBase>> mappings = new HashMap();
+	public static final HashMap<Integer, Supplier<IPCPacketBase>> mappings = new HashMap<>();
 
 	public final IPCInputStream IPC_INPUT_STREAM = new IPCInputStream();
 	public final IPCOutputStream IPC_OUTPUT_STREAM = new IPCOutputStream();
@@ -55,8 +55,9 @@ public class IPCPacketManager {
 		mappings.put(IPCPacket17ConfigureLAN.ID, IPCPacket17ConfigureLAN::new);
 		mappings.put(IPCPacket18ClearPlayers.ID, IPCPacket18ClearPlayers::new);
 		mappings.put(IPCPacket19Autosave.ID, IPCPacket19Autosave::new);
-		mappings.put(IPCPacket20LoggerMessage.ID, IPCPacket20LoggerMessage::new);
-		mappings.put(IPCPacket21EnableLogging.ID, IPCPacket21EnableLogging::new);
+		mappings.put(IPCPacket1ALoggerMessage.ID, IPCPacket1ALoggerMessage::new);
+		mappings.put(IPCPacket1BEnableLogging.ID, IPCPacket1BEnableLogging::new);
+		mappings.put(IPCPacket1CIssueDetected.ID, IPCPacket1CIssueDetected::new);
 		mappings.put(IPCPacketFFProcessKeepAlive.ID, IPCPacketFFProcessKeepAlive::new);
 	}
 	
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java
index b959b23..bd59238 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java
@@ -1,5 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.sp.lan;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
 import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
@@ -75,15 +76,17 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager {
 	public static LANClientNetworkManager connectToWorld(RelayServerSocket sock, String displayCode, String displayRelay) {
 		PlatformWebRTC.clearLANClientState();
 		int connectState = PRE;
-		IPacket pkt;
+		RelayPacket pkt;
 		mainLoop: while(!sock.isClosed()) {
+			PlatformWebRTC.runScheduledTasks();
+			sock.update();
 			if((pkt = sock.readPacket()) != null) {
-				if(pkt instanceof IPacket00Handshake) {
+				if(pkt instanceof RelayPacket00Handshake) {
 					if(connectState == PRE) {
 
 						// %%%%%%  Process IPacket00Handshake  %%%%%%
 
-						logger.info("Relay [{}|{}] recieved handshake, client id: {}", displayRelay, displayCode, ((IPacket00Handshake)pkt).connectionCode);
+						logger.info("Relay [{}|{}] recieved handshake, client id: {}", displayRelay, displayCode, ((RelayPacket00Handshake)pkt).connectionCode);
 						connectState = INIT;
 
 					}else {
@@ -91,17 +94,17 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager {
 						logger.error("Relay [{}|{}] unexpected packet: IPacket00Handshake in state {}", displayRelay, displayCode, initStateNames[connectState]);
 						return null;
 					}
-				}else if(pkt instanceof IPacket01ICEServers) {
+				}else if(pkt instanceof RelayPacket01ICEServers) {
 					if(connectState == INIT) {
 
 						// %%%%%%  Process IPacket01ICEServers  %%%%%%
 
-						IPacket01ICEServers ipkt = (IPacket01ICEServers) pkt;
+						RelayPacket01ICEServers ipkt = (RelayPacket01ICEServers) pkt;
 
 						// print servers
 						logger.info("Relay [{}|{}] provided ICE servers:", displayRelay, displayCode);
-						List<String> servers = new ArrayList();
-						for(ICEServerSet.RelayServer srv : ipkt.servers) {
+						List<String> servers = new ArrayList<>();
+						for(RelayPacket01ICEServers.RelayServer srv : ipkt.servers) {
 							logger.info("Relay [{}|{}]     {}: {}", displayRelay, displayCode, srv.type.name(), srv.address);
 							servers.add(srv.getICEString());
 						}
@@ -110,20 +113,21 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager {
 						PlatformWebRTC.clientLANSetICEServersAndConnect(servers.toArray(new String[servers.size()]));
 
 						// await result
-						long lm = System.currentTimeMillis();
+						long lm = EagRuntime.steadyTimeMillis();
 						do {
+							PlatformWebRTC.runScheduledTasks();
 							String c = PlatformWebRTC.clientLANAwaitDescription();
 							if(c != null) {
 								logger.info("Relay [{}|{}] client sent description", displayRelay, displayCode);
 
 								// 'this.descriptionHandler' was called, send result:
-								sock.writePacket(new IPacket04Description("", c));
+								sock.writePacket(new RelayPacket04Description("", c));
 
 								connectState = SENT_DESCRIPTION;
 								continue mainLoop;
 							}
 							EagUtils.sleep(20l);
-						}while(System.currentTimeMillis() - lm < 5000l);
+						}while(EagRuntime.steadyTimeMillis() - lm < 5000l);
 
 						// no description was sent
 						sock.close();
@@ -135,34 +139,35 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager {
 						logger.error("Relay [{}|{}] unexpected packet: IPacket01ICEServers in state {}", displayRelay, displayCode, initStateNames[connectState]);
 						return null;
 					}
-				}else if(pkt instanceof IPacket03ICECandidate) {
+				}else if(pkt instanceof RelayPacket03ICECandidate) {
 					if(connectState == SENT_ICE_CANDIDATE) {
 
 						// %%%%%%  Process IPacket03ICECandidate  %%%%%%
 
-						IPacket03ICECandidate ipkt = (IPacket03ICECandidate) pkt;
+						RelayPacket03ICECandidate ipkt = (RelayPacket03ICECandidate) pkt;
 
 						// process
 						logger.info("Relay [{}|{}] recieved server ICE candidate", displayRelay, displayCode);
-						PlatformWebRTC.clientLANSetICECandidate(ipkt.candidate);
+						PlatformWebRTC.clientLANSetICECandidate(ipkt.getCandidateString());
 
 						// await result
-						long lm = System.currentTimeMillis();
+						long lm = EagRuntime.steadyTimeMillis();
 						do {
+							PlatformWebRTC.runScheduledTasks();
 							if(PlatformWebRTC.clientLANAwaitChannel()) {
 								logger.info("Relay [{}|{}] client opened data channel", displayRelay, displayCode);
 
 								// 'this.remoteDataChannelHandler' was called, success
-								sock.writePacket(new IPacket05ClientSuccess(ipkt.peerId));
+								sock.writePacket(new RelayPacket05ClientSuccess(ipkt.peerId));
 								sock.close();
 								return new LANClientNetworkManager(displayCode, displayRelay);
 
 							}
 							EagUtils.sleep(20l);
-						}while(System.currentTimeMillis() - lm < 5000l);
+						}while(EagRuntime.steadyTimeMillis() - lm < 5000l);
 
 						// no channel was opened
-						sock.writePacket(new IPacket06ClientFailure(ipkt.peerId));
+						sock.writePacket(new RelayPacket06ClientFailure(ipkt.peerId));
 						sock.close();
 						logger.error("Relay [{}|{}] client open data channel timeout", displayRelay, displayCode);
 						return null;
@@ -172,32 +177,33 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager {
 						logger.error("Relay [{}|{}] unexpected packet: IPacket03ICECandidate in state {}", displayRelay, displayCode, initStateNames[connectState]);
 						return null;
 					}
-				}else if(pkt instanceof IPacket04Description) {
+				}else if(pkt instanceof RelayPacket04Description) {
 					if(connectState == SENT_DESCRIPTION) {
 
 						// %%%%%%  Process IPacket04Description  %%%%%%
 
-						IPacket04Description ipkt = (IPacket04Description) pkt;
+						RelayPacket04Description ipkt = (RelayPacket04Description) pkt;
 
 						// process
 						logger.info("Relay [{}|{}] recieved server description", displayRelay, displayCode);
-						PlatformWebRTC.clientLANSetDescription(ipkt.description);
+						PlatformWebRTC.clientLANSetDescription(ipkt.getDescriptionString());
 
 						// await result
-						long lm = System.currentTimeMillis();
+						long lm = EagRuntime.steadyTimeMillis();
 						do {
+							PlatformWebRTC.runScheduledTasks();
 							String c = PlatformWebRTC.clientLANAwaitICECandidate();
 							if(c != null) {
 								logger.info("Relay [{}|{}] client sent ICE candidate", displayRelay, displayCode);
 
 								// 'this.iceCandidateHandler' was called, send result:
-								sock.writePacket(new IPacket03ICECandidate("", c));
+								sock.writePacket(new RelayPacket03ICECandidate("", c));
 
 								connectState = SENT_ICE_CANDIDATE;
 								continue mainLoop;
 							}
 							EagUtils.sleep(20l);
-						}while(System.currentTimeMillis() - lm < 5000l);
+						}while(EagRuntime.steadyTimeMillis() - lm < 5000l);
 
 						// no ice candidates were sent
 						sock.close();
@@ -209,12 +215,12 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager {
 						logger.error("Relay [{}|{}] unexpected packet: IPacket04Description in state {}", displayRelay, displayCode, initStateNames[connectState]);
 						return null;
 					}
-				}else if(pkt instanceof IPacketFFErrorCode) {
+				}else if(pkt instanceof RelayPacketFFErrorCode) {
 
 					// %%%%%%  Process IPacketFFErrorCode  %%%%%%
 
-					IPacketFFErrorCode ipkt = (IPacketFFErrorCode) pkt;
-					logger.error("Relay [{}|{}] connection failed: {}({}): {}", displayRelay, displayCode, IPacketFFErrorCode.code2string(ipkt.code), ipkt.code, ipkt.desc);
+					RelayPacketFFErrorCode ipkt = (RelayPacketFFErrorCode) pkt;
+					logger.error("Relay [{}|{}] connection failed: {}({}): {}", displayRelay, displayCode, RelayPacketFFErrorCode.code2string(ipkt.code), ipkt.code, ipkt.desc);
 					Throwable t;
 					while((t = sock.getException()) != null) {
 						logger.error(t);
@@ -291,7 +297,7 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager {
 		return !clientDisconnected;
 	}
 
-	private List<byte[]> fragmentedPacket = new ArrayList();
+	private List<byte[]> fragmentedPacket = new ArrayList<>();
 
 	@Override
 	public void processReceivedPackets() throws IOException {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientPeer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientPeer.java
index cd04e95..5532a49 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientPeer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientPeer.java
@@ -3,6 +3,7 @@ package net.lax1dude.eaglercraft.v1_8.sp.lan;
 import java.util.Iterator;
 import java.util.List;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
 import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
@@ -10,8 +11,8 @@ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.internal.ClientPlatformSingleplayer;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket03ICECandidate;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket04Description;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket03ICECandidate;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket04Description;
 
 /**
  * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
@@ -47,12 +48,12 @@ class LANClientPeer {
 	protected void handleICECandidates(String candidates) {
 		if(state == SENT_DESCRIPTION) {
 			PlatformWebRTC.serverLANPeerICECandidates(clientId, candidates);
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			do {
 				LANPeerEvent evt;
 				if((evt = PlatformWebRTC.serverLANGetEvent(clientId)) != null) {
 					if(evt instanceof LANPeerEvent.LANPeerICECandidateEvent) {
-						LANServerController.lanRelaySocket.writePacket(new IPacket03ICECandidate(clientId, ((LANPeerEvent.LANPeerICECandidateEvent)evt).candidates));
+						LANServerController.lanRelaySocket.writePacket(new RelayPacket03ICECandidate(clientId, ((LANPeerEvent.LANPeerICECandidateEvent)evt).candidates));
 						state = SENT_ICE_CANDIDATE;
 						return;
 					}else if(evt instanceof LANPeerEvent.LANPeerDisconnectEvent) {
@@ -64,7 +65,7 @@ class LANClientPeer {
 					return;
 				}
 				EagUtils.sleep(20l);
-			}while(System.currentTimeMillis() - millis < 5000l);
+			}while(EagRuntime.steadyTimeMillis() - millis < 5000l);
 			logger.error("Getting server ICE candidates for '{}' timed out!", clientId);
 			disconnect();
 		}else {
@@ -75,12 +76,12 @@ class LANClientPeer {
 	protected void handleDescription(String description) {
 		if(state == PRE) {
 			PlatformWebRTC.serverLANPeerDescription(clientId, description);
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			do {
 				LANPeerEvent evt;
 				if((evt = PlatformWebRTC.serverLANGetEvent(clientId)) != null) {
 					if(evt instanceof LANPeerEvent.LANPeerDescriptionEvent) {
-						LANServerController.lanRelaySocket.writePacket(new IPacket04Description(clientId, ((LANPeerEvent.LANPeerDescriptionEvent)evt).description));
+						LANServerController.lanRelaySocket.writePacket(new RelayPacket04Description(clientId, ((LANPeerEvent.LANPeerDescriptionEvent)evt).description));
 						state = SENT_DESCRIPTION;
 						return;
 					}else if(evt instanceof LANPeerEvent.LANPeerDisconnectEvent) {
@@ -92,7 +93,7 @@ class LANClientPeer {
 					return;
 				}
 				EagUtils.sleep(20l);
-			}while(System.currentTimeMillis() - millis < 5000l);
+			}while(EagRuntime.steadyTimeMillis() - millis < 5000l);
 			logger.error("Getting server description for '{}' timed out!", clientId);
 			disconnect();
 		}else {
@@ -102,7 +103,7 @@ class LANClientPeer {
 
 	protected void handleSuccess() {
 		if(state == SENT_ICE_CANDIDATE) {
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			do {
 				LANPeerEvent evt;
 				while((evt = PlatformWebRTC.serverLANGetEvent(clientId)) != null && evt instanceof LANPeerEvent.LANPeerICECandidateEvent) {
@@ -122,7 +123,7 @@ class LANClientPeer {
 					return;
 				}
 				EagUtils.sleep(20l);
-			}while(System.currentTimeMillis() - millis < 5000l);
+			}while(EagRuntime.steadyTimeMillis() - millis < 5000l);
 			logger.error("Getting server description for '{}' timed out!", clientId);
 			disconnect();
 		}else {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerController.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerController.java
index 503f260..3b2eac3 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerController.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerController.java
@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
@@ -34,7 +35,7 @@ public class LANServerController {
 
 	public static final Logger logger = LogManager.getLogger("LANServerController");
 
-	public static final List<String> currentICEServers = new ArrayList();
+	public static final List<String> currentICEServers = new ArrayList<>();
 
 	static RelayServerSocket lanRelaySocket = null;
 
@@ -49,25 +50,26 @@ public class LANServerController {
 			return null;
 		}else {
 			progressCallback.accept("Opening: " + sock.getURI());
-			IPacket00Handshake hs = (IPacket00Handshake)sock.readPacket();
+			RelayPacket00Handshake hs = (RelayPacket00Handshake)sock.readPacket();
 			lanRelaySocket = sock;
 			String code = hs.connectionCode;
 			logger.info("Relay [{}] connected as 'server', code: {}", sock.getURI(), code);
 			progressCallback.accept("Opened '" + code + "' on " + sock.getURI());
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			do {
+				sock.update();
 				if(sock.isClosed()) {
 					logger.info("Relay [{}] connection lost", sock.getURI());
 					lanRelaySocket = null;
 					return null;
 				}
-				IPacket pkt = sock.readPacket();
+				RelayPacket pkt = sock.readPacket();
 				if(pkt != null) {
-					if(pkt instanceof IPacket01ICEServers) {
-						IPacket01ICEServers ipkt = (IPacket01ICEServers)pkt;
+					if(pkt instanceof RelayPacket01ICEServers) {
+						RelayPacket01ICEServers ipkt = (RelayPacket01ICEServers)pkt;
 						logger.info("Relay [{}] provided ICE servers:", sock.getURI());
 						currentICEServers.clear();
-						for(net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.ICEServerSet.RelayServer srv : ipkt.servers) {
+						for(net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket01ICEServers.RelayServer srv : ipkt.servers) {
 							logger.info("Relay [{}]     {}: {}", sock.getURI(), srv.type.name(), srv.address);
 							currentICEServers.add(srv.getICEString());
 						}
@@ -80,7 +82,7 @@ public class LANServerController {
 					}
 				}
 				EagUtils.sleep(50l);
-			}while(System.currentTimeMillis() - millis < 1000l);
+			}while(EagRuntime.steadyTimeMillis() - millis < 1000l);
 			logger.info("Relay [{}] relay provide ICE servers timeout", sock.getURI());
 			closeLAN();
 			return null;
@@ -131,54 +133,55 @@ public class LANServerController {
 		return lanRelaySocket != null;
 	}
 
-	private static final Map<String, LANClientPeer> clients = new HashMap();
+	private static final Map<String, LANClientPeer> clients = new HashMap<>();
 
 	public static void updateLANServer() {
 		if(lanRelaySocket != null) {
-			IPacket pkt;
+			lanRelaySocket.update();
+			RelayPacket pkt;
 			while((pkt = lanRelaySocket.readPacket()) != null) {
-				if(pkt instanceof IPacket02NewClient) {
-					IPacket02NewClient ipkt = (IPacket02NewClient) pkt;
+				if(pkt instanceof RelayPacket02NewClient) {
+					RelayPacket02NewClient ipkt = (RelayPacket02NewClient) pkt;
 					if(clients.containsKey(ipkt.clientId)) {
 						logger.error("Relay [{}] relay provided duplicate client '{}'", lanRelaySocket.getURI(), ipkt.clientId);
 					}else {
 						clients.put(ipkt.clientId, new LANClientPeer(ipkt.clientId));
 					}
-				}else if(pkt instanceof IPacket03ICECandidate) {
-					IPacket03ICECandidate ipkt = (IPacket03ICECandidate) pkt;
+				}else if(pkt instanceof RelayPacket03ICECandidate) {
+					RelayPacket03ICECandidate ipkt = (RelayPacket03ICECandidate) pkt;
 					LANClientPeer c = clients.get(ipkt.peerId);
 					if(c != null) {
-						c.handleICECandidates(ipkt.candidate);
+						c.handleICECandidates(ipkt.getCandidateString());
 					}else {
 						logger.error("Relay [{}] relay sent IPacket03ICECandidate for unknown client '{}'", lanRelaySocket.getURI(), ipkt.peerId);
 					}
-				}else if(pkt instanceof IPacket04Description) {
-					IPacket04Description ipkt = (IPacket04Description) pkt;
+				}else if(pkt instanceof RelayPacket04Description) {
+					RelayPacket04Description ipkt = (RelayPacket04Description) pkt;
 					LANClientPeer c = clients.get(ipkt.peerId);
 					if(c != null) {
-						c.handleDescription(ipkt.description);
+						c.handleDescription(ipkt.getDescriptionString());
 					}else {
 						logger.error("Relay [{}] relay sent IPacket04Description for unknown client '{}'", lanRelaySocket.getURI(), ipkt.peerId);
 					}
-				}else if(pkt instanceof IPacket05ClientSuccess) {
-					IPacket05ClientSuccess ipkt = (IPacket05ClientSuccess) pkt;
+				}else if(pkt instanceof RelayPacket05ClientSuccess) {
+					RelayPacket05ClientSuccess ipkt = (RelayPacket05ClientSuccess) pkt;
 					LANClientPeer c = clients.get(ipkt.clientId);
 					if(c != null) {
 						c.handleSuccess();
 					}else {
 						logger.error("Relay [{}] relay sent IPacket05ClientSuccess for unknown client '{}'", lanRelaySocket.getURI(), ipkt.clientId);
 					}
-				}else if(pkt instanceof IPacket06ClientFailure) {
-					IPacket06ClientFailure ipkt = (IPacket06ClientFailure) pkt;
+				}else if(pkt instanceof RelayPacket06ClientFailure) {
+					RelayPacket06ClientFailure ipkt = (RelayPacket06ClientFailure) pkt;
 					LANClientPeer c = clients.get(ipkt.clientId);
 					if(c != null) {
 						c.handleFailure();
 					}else {
 						logger.error("Relay [{}] relay sent IPacket06ClientFailure for unknown client '{}'", lanRelaySocket.getURI(), ipkt.clientId);
 					}
-				}else if(pkt instanceof IPacketFFErrorCode) {
-					IPacketFFErrorCode ipkt = (IPacketFFErrorCode) pkt;
-					logger.error("Relay [{}] error code thrown: {}({}): {}", lanRelaySocket.getURI(), IPacketFFErrorCode.code2string(ipkt.code), ipkt.code, ipkt.desc);
+				}else if(pkt instanceof RelayPacketFFErrorCode) {
+					RelayPacketFFErrorCode ipkt = (RelayPacketFFErrorCode) pkt;
+					logger.error("Relay [{}] error code thrown: {}({}): {}", lanRelaySocket.getURI(), RelayPacketFFErrorCode.code2string(ipkt.code), ipkt.code, ipkt.desc);
 					Throwable t;
 					while((t = lanRelaySocket.getException()) != null) {
 						logger.error(t);
@@ -186,6 +189,7 @@ public class LANServerController {
 				}else {
 					logger.error("Relay [{}] unexpected packet: {}", lanRelaySocket.getURI(), pkt.getClass().getSimpleName());
 				}
+				lanRelaySocket.update();
 			}
 			if(lanRelaySocket.isClosed()) {
 				lanRelaySocket = null;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerList.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerList.java
index fd7a36b..bc736d4 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerList.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerList.java
@@ -9,11 +9,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServer;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayWorldsQuery;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket07LocalWorlds;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket07LocalWorlds;
 
 /**
  * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
@@ -32,15 +33,15 @@ import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket07LocalWorlds;
  */
 public class LANServerList {
 	
-	private final List<LanServer> lanServersList = new LinkedList();
-	private final Map<String, RelayWorldsQuery> lanServersQueryList = new LinkedHashMap();
-	private final Set<String> deadURIs = new HashSet();
+	private final List<LanServer> lanServersList = new LinkedList<>();
+	private final Map<String, RelayWorldsQuery> lanServersQueryList = new LinkedHashMap<>();
+	private final Set<String> deadURIs = new HashSet<>();
 	
 	private long lastRefresh = 0l;
 	private int refreshCounter = 0;
 	
 	public boolean update() {
-		long millis = System.currentTimeMillis();
+		long millis = EagRuntime.steadyTimeMillis();
 		if(millis - lastRefresh > 20000l) {
 			if(++refreshCounter < 10) {
 				refresh();
@@ -54,6 +55,7 @@ public class LANServerList {
 				Entry<String,RelayWorldsQuery> etr = itr.next();
 				String uri = etr.getKey();
 				RelayWorldsQuery q = etr.getValue();
+				q.update();
 				if(!q.isQueryOpen()) {
 					itr.remove();
 					if(q.isQueryFailed()) {
@@ -75,9 +77,9 @@ public class LANServerList {
 							}
 						}
 						if(rl != null) {
-							Iterator<IPacket07LocalWorlds.LocalWorld> itr3 = q.getWorlds().iterator();
+							Iterator<RelayPacket07LocalWorlds.LocalWorld> itr3 = q.getWorlds().iterator();
 							yee: while(itr3.hasNext()) {
-								IPacket07LocalWorlds.LocalWorld l = itr3.next();
+								RelayPacket07LocalWorlds.LocalWorld l = itr3.next();
 								itr2 = lanServersList.iterator();
 								while(itr2.hasNext()) {
 									LanServer l2 = itr2.next();
@@ -116,7 +118,7 @@ public class LANServerList {
 	}
 
 	private void refresh() {
-		lastRefresh = System.currentTimeMillis();
+		lastRefresh = EagRuntime.steadyTimeMillis();
 		if(PlatformWebRTC.supported()) {
 			for(int i = 0, l = RelayManager.relayManager.count(); i < l; ++i) {
 				RelayServer srv = RelayManager.relayManager.get(i);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayLoggerImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayLoggerImpl.java
new file mode 100755
index 0000000..306fd4b
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayLoggerImpl.java
@@ -0,0 +1,54 @@
+package net.lax1dude.eaglercraft.v1_8.sp.relay;
+
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IRelayLogger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RelayLoggerImpl implements IRelayLogger {
+
+	private final Logger impl;
+
+	public RelayLoggerImpl(Logger impl) {
+		this.impl = impl;
+	}
+
+	@Override
+	public void debug(String msg, Object... args) {
+		impl.debug(msg, args);
+	}
+
+	@Override
+	public void info(String msg, Object... args) {
+		impl.debug(msg, args);
+	}
+
+	@Override
+	public void warn(String msg, Object... args) {
+		impl.warn(msg, args);
+	}
+
+	@Override
+	public void error(String msg, Object... args) {
+		impl.error(msg, args);
+	}
+
+	@Override
+	public void error(Throwable th) {
+		impl.error(th);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java
index 8f3346c..bd970a2 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java
@@ -14,9 +14,9 @@ import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket00Handshake;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacketFFErrorCode;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket00Handshake;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacketFFErrorCode;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -43,7 +43,7 @@ public class RelayManager {
 	public static final RelayManager relayManager = new RelayManager();
 	public static final int preferredRelayVersion = 1;
 	
-	private final List<RelayServer> relays = new ArrayList();
+	private final List<RelayServer> relays = new ArrayList<>();
 	private long lastPingThrough = 0l;
 
 	public void load(byte[] relayConfig) {
@@ -180,7 +180,7 @@ public class RelayManager {
 	}
 	
 	public void ping() {
-		lastPingThrough = System.currentTimeMillis();
+		lastPingThrough = EagRuntime.steadyTimeMillis();
 		for(int i = 0, l = relays.size(); i < l; ++i) {
 			relays.get(i).ping();
 		}
@@ -274,16 +274,18 @@ public class RelayManager {
 	public RelayServerSocket connectHandshake(RelayServer relay, int type, String code) {
 		RelayServerSocket sock = relay.openSocket();
 		while(!sock.isClosed()) {
+			sock.update();
 			if(sock.isOpen()) {
-				sock.writePacket(new IPacket00Handshake(type, preferredRelayVersion, code));
+				sock.writePacket(new RelayPacket00Handshake(type, preferredRelayVersion, code));
 				while(!sock.isClosed()) {
-					IPacket pkt = sock.nextPacket();
+					sock.update();
+					RelayPacket pkt = sock.nextPacket();
 					if(pkt != null) {
-						if(pkt instanceof IPacket00Handshake) {
+						if(pkt instanceof RelayPacket00Handshake) {
 							return sock;
-						}else if(pkt instanceof IPacketFFErrorCode) {
-							IPacketFFErrorCode ipkt = (IPacketFFErrorCode) pkt;
-							logger.error("Relay [{}] failed: {}({}): {}", relay.address, IPacketFFErrorCode.code2string(ipkt.code), ipkt.code, ipkt.desc);
+						}else if(pkt instanceof RelayPacketFFErrorCode) {
+							RelayPacketFFErrorCode ipkt = (RelayPacketFFErrorCode) pkt;
+							logger.error("Relay [{}] failed: {}({}): {}", relay.address, RelayPacketFFErrorCode.code2string(ipkt.code), ipkt.code, ipkt.desc);
 							Throwable t;
 							while((t = sock.getException()) != null) {
 								logger.error(t);
@@ -309,12 +311,12 @@ public class RelayManager {
 		return null;
 	}
 	
-	private final List<RelayServer> brokenServers = new LinkedList();
+	private final List<RelayServer> brokenServers = new LinkedList<>();
 
 	public RelayServerSocket getWorkingRelay(Consumer<String> progressCallback, int type, String code) {
 		brokenServers.clear();
 		if(!relays.isEmpty()) {
-			long millis = System.currentTimeMillis();
+			long millis = EagRuntime.steadyTimeMillis();
 			if(millis - lastPingThrough < 10000l) {
 				RelayServer relay = getPrimary();
 				if(relay.getPing() > 0l && relay.getPingCompatible().isCompatible()) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayQuery.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayQuery.java
index ec18923..f8c2650 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayQuery.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayQuery.java
@@ -28,6 +28,7 @@ public interface RelayQuery {
 		}
 	}
 
+	void update();
 	boolean isQueryOpen();
 	boolean isQueryFailed();
 	RateLimit isQueryRateLimit();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayQueryImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayQueryImpl.java
new file mode 100755
index 0000000..7ec3b58
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayQueryImpl.java
@@ -0,0 +1,225 @@
+package net.lax1dude.eaglercraft.v1_8.sp.relay;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketClient;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketFrame;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformNetworking;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket00Handshake;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket69Pong;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket70SpecialUpdate;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacketFFErrorCode;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RelayQueryImpl implements RelayQuery {
+
+	private static final Logger logger = LogManager.getLogger("RelayQuery");
+	private static final RelayLoggerImpl loggerImpl = new RelayLoggerImpl(LogManager.getLogger("RelayPacket"));
+
+	private final IWebSocketClient sock;
+	private final String uri;
+
+	private boolean failed;
+
+	private boolean hasSentHandshake = false;
+	private boolean hasRecievedAnyData = false;
+
+	private int vers = -1;
+	private String comment = "<no comment>";
+	private String brand = "<no brand>";
+
+	private long connectionOpenedAt;
+	private long connectionPingStart = -1;
+	private long connectionPingTimer = -1;
+
+	private RateLimit rateLimitStatus = RateLimit.NONE;
+
+	private VersionMismatch versError = VersionMismatch.UNKNOWN;
+
+	public RelayQueryImpl(String uri) {
+		this.uri = uri;
+		IWebSocketClient s;
+		try {
+			connectionOpenedAt = EagRuntime.steadyTimeMillis();
+			s = PlatformNetworking.openWebSocketUnsafe(uri);
+		}catch(Throwable t) {
+			connectionOpenedAt = 0l;
+			sock = null;
+			failed = true;
+			return;
+		}
+		sock = s;
+		
+	}
+
+	@Override
+	public void update() {
+		if(sock == null) return;
+		if(sock.availableStringFrames() > 0) {
+			logger.warn("[{}] discarding {} string frames recieved on a binary connection", uri, sock.availableStringFrames());
+			sock.clearStringFrames();
+		}
+		List<IWebSocketFrame> frames = sock.getNextBinaryFrames();
+		if(frames != null) {
+			for(int i = 0, l = frames.size(); i < l; ++i) {
+				hasRecievedAnyData = true;
+				byte[] arr = frames.get(i).getByteArray();
+				if(arr.length == 2 && arr[0] == (byte)0xFC) {
+					if(arr[1] == (byte)0x00 || arr[1] == (byte)0x01) {
+						rateLimitStatus = RateLimit.BLOCKED;
+						RelayServerRateLimitTracker.setLimited(RelayQueryImpl.this.uri);
+					}else if(arr[1] == (byte)0x02) {
+						rateLimitStatus = RateLimit.NOW_LOCKED;
+						RelayServerRateLimitTracker.setLimitedLocked(RelayQueryImpl.this.uri);
+					}else {
+						rateLimitStatus = RateLimit.LOCKED;
+						RelayServerRateLimitTracker.setLocked(RelayQueryImpl.this.uri);
+					}
+					failed = true;
+					sock.close();
+				}else {
+					try {
+						RelayPacket pkt = RelayPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)), loggerImpl);
+						if(pkt instanceof RelayPacket69Pong) {
+							RelayPacket69Pong ipkt = (RelayPacket69Pong)pkt;
+							versError = VersionMismatch.COMPATIBLE;
+							if(connectionPingTimer == -1) {
+								connectionPingTimer = frames.get(i).getTimestamp() - connectionPingStart;
+							}
+							vers = ipkt.protcolVersion;
+							comment = ipkt.comment;
+							brand = ipkt.brand;
+							failed = false;
+							sock.close();
+							return;
+						}else if(pkt instanceof RelayPacket70SpecialUpdate) {
+							RelayPacket70SpecialUpdate ipkt = (RelayPacket70SpecialUpdate)pkt;
+							if(ipkt.operation == RelayPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
+								UpdateService.addCertificateToSet(ipkt.updatePacket);
+							}
+						}else if(pkt instanceof RelayPacketFFErrorCode) {
+							RelayPacketFFErrorCode ipkt = (RelayPacketFFErrorCode)pkt;
+							if(ipkt.code == RelayPacketFFErrorCode.TYPE_PROTOCOL_VERSION) {
+								String s1 = ipkt.desc.toLowerCase();
+								if(s1.contains("outdated client") || s1.contains("client outdated")) {
+									versError = VersionMismatch.CLIENT_OUTDATED;
+								}else if(s1.contains("outdated server") || s1.contains("server outdated") ||
+										s1.contains("outdated relay") || s1.contains("server relay")) {
+									versError = VersionMismatch.RELAY_OUTDATED;
+								}else {
+									versError = VersionMismatch.UNKNOWN;
+								}
+							}
+							logger.error("[{}] Recieved query error code {}: {}", uri, ipkt.code, ipkt.desc);
+							failed = true;
+							sock.close();
+							return;
+						}else {
+							throw new IOException("Unexpected packet '" + pkt.getClass().getSimpleName() + "'");
+						}
+					} catch (IOException e) {
+						logger.error("Relay query error: {}", e.toString());
+						logger.error(e);
+						failed = true;
+						sock.close();
+						return;
+					}
+				}
+			}
+		}
+		if(sock.isOpen() && !hasSentHandshake) {
+			hasSentHandshake = true;
+			try {
+				connectionPingStart = EagRuntime.steadyTimeMillis();
+				sock.send(RelayPacket.writePacket(new RelayPacket00Handshake(0x03, RelayManager.preferredRelayVersion, ""), loggerImpl));
+			} catch (IOException e) {
+				logger.error("Failed to write handshake: {}", e.toString());
+				logger.error(e);
+				sock.close();
+				failed = true;
+			}
+		}
+		if(sock.isClosed()) {
+			if(!hasRecievedAnyData) {
+				failed = true;
+				rateLimitStatus = RelayServerRateLimitTracker.isLimitedLong(uri);
+			}
+		}
+		if(EagRuntime.steadyTimeMillis() - connectionOpenedAt > 10000l) {
+			logger.error("Terminating connection that was open for too long: {}", uri);
+			sock.close();
+			failed = true;
+		}
+	}
+
+	@Override
+	public boolean isQueryOpen() {
+		return sock != null && !sock.isClosed();
+	}
+
+	@Override
+	public boolean isQueryFailed() {
+		return failed || sock == null || sock.getState() == EnumEaglerConnectionState.FAILED;
+	}
+
+	@Override
+	public RateLimit isQueryRateLimit() {
+		return rateLimitStatus;
+	}
+
+	@Override
+	public void close() {
+		if(sock != null) {
+			sock.close();
+		}
+	}
+
+	@Override
+	public int getVersion() {
+		return vers;
+	}
+
+	@Override
+	public String getComment() {
+		return comment;
+	}
+
+	@Override
+	public String getBrand() {
+		return brand;
+	}
+
+	@Override
+	public long getPing() {
+		return connectionPingTimer < 1 ? 1 : connectionPingTimer;
+	}
+
+	@Override
+	public VersionMismatch getCompatible() {
+		return versError;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayQueryRateLimitDummy.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayQueryRateLimitDummy.java
new file mode 100755
index 0000000..c740fa9
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayQueryRateLimitDummy.java
@@ -0,0 +1,75 @@
+package net.lax1dude.eaglercraft.v1_8.sp.relay;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RelayQueryRateLimitDummy implements RelayQuery {
+
+	private final RateLimit type;
+
+	public RelayQueryRateLimitDummy(RateLimit type) {
+		this.type = type;
+	}
+
+	@Override
+	public void update() {
+		
+	}
+
+	@Override
+	public boolean isQueryOpen() {
+		return false;
+	}
+
+	@Override
+	public boolean isQueryFailed() {
+		return true;
+	}
+
+	@Override
+	public RateLimit isQueryRateLimit() {
+		return type;
+	}
+
+	@Override
+	public void close() {
+	}
+
+	@Override
+	public int getVersion() {
+		return RelayManager.preferredRelayVersion;
+	}
+
+	@Override
+	public String getComment() {
+		return "this query was rate limited";
+	}
+
+	@Override
+	public String getBrand() {
+		return "lax1dude";
+	}
+
+	@Override
+	public long getPing() {
+		return 0l;
+	}
+
+	@Override
+	public VersionMismatch getCompatible() {
+		return VersionMismatch.COMPATIBLE;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServer.java
index be27bc2..1a9d309 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServer.java
@@ -1,5 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.sp.relay;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayQuery.VersionMismatch;
@@ -105,23 +106,26 @@ public class RelayServer {
 	}
 	
 	public void update() {
-		if(query != null && !query.isQueryOpen()) {
-			if(query.isQueryFailed()) {
-				queriedVersion = -1;
-				queriedComment = null;
-				queriedVendor = null;
-				queriedCompatible = VersionMismatch.UNKNOWN;
-				ping = 0l;
-			}else {
-				queriedVersion = query.getVersion();
-				queriedComment = query.getComment();
-				queriedVendor = query.getBrand();
-				ping = query.getPing();
-				queriedCompatible = query.getCompatible();
-				workingPing = ping;
+		if(query != null) {
+			query.update();
+			if(!query.isQueryOpen()) {
+				if(query.isQueryFailed()) {
+					queriedVersion = -1;
+					queriedComment = null;
+					queriedVendor = null;
+					queriedCompatible = VersionMismatch.UNKNOWN;
+					ping = 0l;
+				}else {
+					queriedVersion = query.getVersion();
+					queriedComment = query.getComment();
+					queriedVendor = query.getBrand();
+					ping = query.getPing();
+					queriedCompatible = query.getCompatible();
+					workingPing = ping;
+				}
+				lastPing = EagRuntime.steadyTimeMillis();
+				query = null;
 			}
-			lastPing = System.currentTimeMillis();
-			query = null;
 		}
 	}
 	
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerRateLimitTracker.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerRateLimitTracker.java
new file mode 100755
index 0000000..0ecca12
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerRateLimitTracker.java
@@ -0,0 +1,98 @@
+package net.lax1dude.eaglercraft.v1_8.sp.relay;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RelayServerRateLimitTracker {
+
+	private static final Map<String,Long> relayQueryLimited = new HashMap<>();
+	private static final Map<String,Long> relayQueryLocked = new HashMap<>();
+
+	public static void setLimited(String str) {
+		synchronized(relayQueryLimited) {
+			relayQueryLimited.put(str, EagRuntime.steadyTimeMillis());
+		}
+	}
+
+	public static void setLocked(String str) {
+		synchronized(relayQueryLocked) {
+			relayQueryLocked.put(str, EagRuntime.steadyTimeMillis());
+		}
+	}
+
+	public static void setLimitedLocked(String str) {
+		long now = EagRuntime.steadyTimeMillis();
+		synchronized(relayQueryLimited) {
+			relayQueryLimited.put(str, now);
+		}
+		synchronized(relayQueryLocked) {
+			relayQueryLocked.put(str, now);
+		}
+	}
+
+	public static RelayQuery.RateLimit isLimited(String str) {
+		long now = EagRuntime.steadyTimeMillis();
+		synchronized(relayQueryLocked) {
+			Long l = relayQueryLocked.get(str);
+			if(l != null && now - l.longValue() < 60000l) {
+				return RelayQuery.RateLimit.LOCKED;
+			}
+		}
+		synchronized(relayQueryLimited) {
+			Long l = relayQueryLimited.get(str);
+			if(l != null && now - l.longValue() < 10000l) {
+				return RelayQuery.RateLimit.BLOCKED;
+			}
+		}
+		return RelayQuery.RateLimit.NONE;	
+	}
+
+	public static RelayQuery.RateLimit isLimitedLong(String str) {
+		long now = EagRuntime.steadyTimeMillis();
+		synchronized(relayQueryLocked) {
+			Long l = relayQueryLocked.get(str);
+			if(l != null && now - l.longValue() < 400000l) {
+				return RelayQuery.RateLimit.LOCKED;
+			}
+		}
+		synchronized(relayQueryLimited) {
+			Long l = relayQueryLimited.get(str);
+			if(l != null && now - l.longValue() < 900000l) {
+				return RelayQuery.RateLimit.BLOCKED;
+			}
+		}
+		return RelayQuery.RateLimit.NONE;	
+	}
+
+	public static RelayQuery.RateLimit isLimitedEver(String str) {
+		synchronized(relayQueryLocked) {
+			if(relayQueryLocked.containsKey(str)) {
+				return RelayQuery.RateLimit.LOCKED;
+			}
+		}
+		synchronized(relayQueryLimited) {
+			if(relayQueryLimited.containsKey(str)) {
+				return RelayQuery.RateLimit.BLOCKED;
+			}
+		}
+		return RelayQuery.RateLimit.NONE;	
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerSocket.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerSocket.java
index ca1a2c0..33fa3e9 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerSocket.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerSocket.java
@@ -1,6 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.sp.relay;
 
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket;
 
 /**
  * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
@@ -19,6 +19,7 @@ import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket;
  */
 public interface RelayServerSocket {
 
+	void update();
 	boolean isOpen();
 	boolean isClosed();
 	void close();
@@ -26,10 +27,10 @@ public interface RelayServerSocket {
 	boolean isFailed();
 	Throwable getException();
 	
-	void writePacket(IPacket pkt);
+	void writePacket(RelayPacket pkt);
 	
-	IPacket readPacket();
-	IPacket nextPacket();
+	RelayPacket readPacket();
+	RelayPacket nextPacket();
 	
 	RelayQuery.RateLimit getRatelimitHistory();
 	
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerSocketImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerSocketImpl.java
new file mode 100755
index 0000000..7c0fb50
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerSocketImpl.java
@@ -0,0 +1,173 @@
+package net.lax1dude.eaglercraft.v1_8.sp.relay;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketClient;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketFrame;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformNetworking;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket70SpecialUpdate;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RelayServerSocketImpl implements RelayServerSocket {
+
+	private static final Logger logger = LogManager.getLogger("RelayServerSocket");
+	private static final RelayLoggerImpl loggerImpl = new RelayLoggerImpl(LogManager.getLogger("RelayPacket"));
+
+	private final IWebSocketClient sock;
+	private final String uri;
+
+	private boolean hasRecievedAnyData = false;
+	private boolean failed = false;
+
+	private final List<Throwable> exceptions = new LinkedList<>();
+	private final List<RelayPacket> packets = new LinkedList<>();
+
+	public RelayServerSocketImpl(String uri, int timeout) {
+		this.uri = uri;
+		IWebSocketClient s;
+		try {
+			s = PlatformNetworking.openWebSocketUnsafe(uri);
+		}catch(Throwable t) {
+			exceptions.add(t);
+			sock = null;
+			failed = true;
+			return;
+		}
+		sock = s;
+	}
+
+	@Override
+	public void update() {
+		if(sock == null) return;
+		if(sock.availableStringFrames() > 0) {
+			logger.warn("[{}] discarding {} string frames recieved on a binary connection", uri, sock.availableStringFrames());
+			sock.clearStringFrames();
+		}
+		List<IWebSocketFrame> frames = sock.getNextBinaryFrames();
+		if(frames != null) {
+			for(int i = 0, l = frames.size(); i < l; ++i) {
+				hasRecievedAnyData = true;
+				try {
+					RelayPacket pkt = RelayPacket.readPacket(new DataInputStream(frames.get(i).getInputStream()), loggerImpl);
+					if(pkt instanceof RelayPacket70SpecialUpdate) {
+						RelayPacket70SpecialUpdate ipkt = (RelayPacket70SpecialUpdate)pkt;
+						if(ipkt.operation == RelayPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
+							UpdateService.addCertificateToSet(ipkt.updatePacket);
+						}
+					}else {
+						packets.add(pkt);
+					}
+				} catch (IOException e) {
+					exceptions.add(e);
+					logger.error("[{}] Relay Socket Error: {}", uri, e.toString());
+					EagRuntime.debugPrintStackTrace(e);
+					failed = true;
+					sock.close();
+					return;
+				}
+			}
+		}
+		if(sock.isClosed()) {
+			if (!hasRecievedAnyData) {
+				failed = true;
+			}
+		}
+	}
+
+	@Override
+	public boolean isOpen() {
+		return sock != null && sock.isOpen();
+	}
+
+	@Override
+	public boolean isClosed() {
+		return sock == null || sock.isClosed();
+	}
+
+	@Override
+	public void close() {
+		if(sock != null) {
+			sock.close();
+		}
+	}
+
+	@Override
+	public boolean isFailed() {
+		return failed || sock == null || sock.getState() == EnumEaglerConnectionState.FAILED;
+	}
+
+	@Override
+	public Throwable getException() {
+		if(!exceptions.isEmpty()) {
+			return exceptions.remove(0);
+		}else {
+			return null;
+		}
+	}
+
+	@Override
+	public void writePacket(RelayPacket pkt) {
+		if(sock != null) {
+			try {
+				sock.send(RelayPacket.writePacket(pkt, loggerImpl));
+			} catch (Throwable e) {
+				logger.error("Relay connection error: {}", e.toString());
+				EagRuntime.debugPrintStackTrace(e);
+				exceptions.add(e);
+				sock.close();
+			}
+		}
+	}
+
+	@Override
+	public RelayPacket readPacket() {
+		if(!packets.isEmpty()) {
+			return packets.remove(0);
+		}else {
+			return null;
+		}
+	}
+
+	@Override
+	public RelayPacket nextPacket() {
+		if(!packets.isEmpty()) {
+			return packets.get(0);
+		}else {
+			return null;
+		}
+	}
+
+	@Override
+	public RelayQuery.RateLimit getRatelimitHistory() {
+		return RelayServerRateLimitTracker.isLimitedEver(uri);
+	}
+
+	@Override
+	public String getURI() {
+		return uri;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerSocketRateLimitDummy.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerSocketRateLimitDummy.java
new file mode 100755
index 0000000..6e052e1
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServerSocketRateLimitDummy.java
@@ -0,0 +1,80 @@
+package net.lax1dude.eaglercraft.v1_8.sp.relay;
+
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RelayServerSocketRateLimitDummy implements RelayServerSocket {
+
+	private final RelayQuery.RateLimit limit;
+
+	public RelayServerSocketRateLimitDummy(RelayQuery.RateLimit limit) {
+		this.limit = limit;
+	}
+
+	@Override
+	public void update() {
+	}
+
+	@Override
+	public boolean isOpen() {
+		return false;
+	}
+
+	@Override
+	public boolean isClosed() {
+		return true;
+	}
+
+	@Override
+	public void close() {
+	}
+
+	@Override
+	public boolean isFailed() {
+		return true;
+	}
+
+	@Override
+	public Throwable getException() {
+		return null;
+	}
+
+	@Override
+	public void writePacket(RelayPacket pkt) {
+	}
+
+	@Override
+	public RelayPacket readPacket() {
+		return null;
+	}
+
+	@Override
+	public RelayPacket nextPacket() {
+		return null;
+	}
+
+	@Override
+	public RelayQuery.RateLimit getRatelimitHistory() {
+		return limit;
+	}
+
+	@Override
+	public String getURI() {
+		return "<disconnected>";
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayWorldsQuery.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayWorldsQuery.java
index aa69225..e1f1615 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayWorldsQuery.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayWorldsQuery.java
@@ -3,7 +3,7 @@ package net.lax1dude.eaglercraft.v1_8.sp.relay;
 import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayQuery.VersionMismatch;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket07LocalWorlds;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket07LocalWorlds;
 
 /**
  * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
@@ -22,12 +22,13 @@ import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket07LocalWorlds;
  */
 public interface RelayWorldsQuery {
 
+	void update();
 	boolean isQueryOpen();
 	boolean isQueryFailed();
 	RelayQuery.RateLimit isQueryRateLimit();
 	void close();
 	
-	List<IPacket07LocalWorlds.LocalWorld> getWorlds();
+	List<RelayPacket07LocalWorlds.LocalWorld> getWorlds();
 	
 	VersionMismatch getCompatible();
 	
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayWorldsQueryImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayWorldsQueryImpl.java
new file mode 100755
index 0000000..d849d12
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayWorldsQueryImpl.java
@@ -0,0 +1,197 @@
+package net.lax1dude.eaglercraft.v1_8.sp.relay;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketClient;
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketFrame;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformNetworking;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayQuery.RateLimit;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket00Handshake;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket07LocalWorlds;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket70SpecialUpdate;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacketFFErrorCode;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RelayWorldsQueryImpl implements RelayWorldsQuery {
+
+	private static final Logger logger = LogManager.getLogger("RelayWorldsQuery");
+	private static final RelayLoggerImpl loggerImpl = new RelayLoggerImpl(LogManager.getLogger("RelayPacket"));
+
+	private final IWebSocketClient sock;
+	private final String uri;
+
+	private boolean failed;
+
+	private long openedAt;
+
+	private boolean hasSentHandshake = false;
+	private boolean hasRecievedAnyData = false;
+	private RelayQuery.RateLimit rateLimitStatus = RelayQuery.RateLimit.NONE;
+
+	private RelayQuery.VersionMismatch versError = RelayQuery.VersionMismatch.UNKNOWN;
+
+	private List<RelayPacket07LocalWorlds.LocalWorld> worlds = null;
+
+	public RelayWorldsQueryImpl(String uri) {
+		this.uri = uri;
+		IWebSocketClient s;
+		try {
+			openedAt = EagRuntime.steadyTimeMillis();
+			s = PlatformNetworking.openWebSocketUnsafe(uri);
+		}catch(Throwable t) {
+			sock = null;
+			failed = true;
+			return;
+		}
+		sock = s;
+	}
+
+	@Override
+	public void update() {
+		if(sock == null) return;
+		if(sock.availableStringFrames() > 0) {
+			logger.warn("[{}] discarding {} string frames recieved on a binary connection", uri, sock.availableStringFrames());
+			sock.clearStringFrames();
+		}
+		List<IWebSocketFrame> frames = sock.getNextBinaryFrames();
+		if(frames != null) {
+			for(int i = 0, l = frames.size(); i < l; ++i) {
+				hasRecievedAnyData = true;
+				byte[] arr = frames.get(i).getByteArray();
+				if(arr.length == 2 && arr[0] == (byte)0xFC) {
+					if(arr[1] == (byte)0x00 || arr[1] == (byte)0x01) {
+						rateLimitStatus = RateLimit.BLOCKED;
+						RelayServerRateLimitTracker.setLimited(RelayWorldsQueryImpl.this.uri);
+					}else if(arr[1] == (byte)0x02) {
+						rateLimitStatus = RateLimit.NOW_LOCKED;
+						RelayServerRateLimitTracker.setLimitedLocked(RelayWorldsQueryImpl.this.uri);
+					}else {
+						rateLimitStatus = RateLimit.LOCKED;
+						RelayServerRateLimitTracker.setLocked(RelayWorldsQueryImpl.this.uri);
+					}
+					failed = true;
+					sock.close();
+				}else {
+					try {
+						RelayPacket pkt = RelayPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)), loggerImpl);
+						if(pkt instanceof RelayPacket07LocalWorlds) {
+							worlds = ((RelayPacket07LocalWorlds)pkt).worldsList;
+							sock.close();
+							failed = false;
+							return;
+						}else if(pkt instanceof RelayPacket70SpecialUpdate) {
+							RelayPacket70SpecialUpdate ipkt = (RelayPacket70SpecialUpdate)pkt;
+							if(ipkt.operation == RelayPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
+								UpdateService.addCertificateToSet(ipkt.updatePacket);
+							}
+						}else if(pkt instanceof RelayPacketFFErrorCode) {
+							RelayPacketFFErrorCode ipkt = (RelayPacketFFErrorCode)pkt;
+							if(ipkt.code == RelayPacketFFErrorCode.TYPE_PROTOCOL_VERSION) {
+								String s1 = ipkt.desc.toLowerCase();
+								if(s1.contains("outdated client") || s1.contains("client outdated")) {
+									versError = RelayQuery.VersionMismatch.CLIENT_OUTDATED;
+								}else if(s1.contains("outdated server") || s1.contains("server outdated") ||
+										s1.contains("outdated relay") || s1.contains("server relay")) {
+									versError = RelayQuery.VersionMismatch.RELAY_OUTDATED;
+								}else {
+									versError = RelayQuery.VersionMismatch.UNKNOWN;
+								}
+							}
+							logger.error("[{}] Recieved query error code {}: {}", uri, ipkt.code, ipkt.desc);
+							failed = true;
+							sock.close();
+							return;
+						}else {
+							throw new IOException("Unexpected packet '" + pkt.getClass().getSimpleName() + "'");
+						}
+					} catch (IOException e) {
+						logger.error("Relay World Query Error: {}", e.toString());
+						EagRuntime.debugPrintStackTrace(e);
+						failed = true;
+						sock.close();
+						return;
+					}
+				}
+			}
+		}
+		if(sock.isOpen() && !hasSentHandshake) {
+			hasSentHandshake = true;
+			try {
+				sock.send(RelayPacket.writePacket(new RelayPacket00Handshake(0x04, RelayManager.preferredRelayVersion, ""), loggerImpl));
+			} catch (IOException e) {
+				logger.error("Failed to write handshake: {}", e.toString());
+				logger.error(e);
+				sock.close();
+				failed = true;
+			}
+		}
+		if(sock.isClosed()) {
+			if(!hasRecievedAnyData) {
+				failed = true;
+				rateLimitStatus = RelayServerRateLimitTracker.isLimitedLong(uri);
+			}
+		}else {
+			if(EagRuntime.steadyTimeMillis() - openedAt > 10000l) {
+				logger.error("Terminating connection that was open for too long: {}", uri);
+				sock.close();
+				failed = true;
+			}
+		}
+	}
+
+	@Override
+	public boolean isQueryOpen() {
+		return sock != null && !sock.isClosed();
+	}
+
+	@Override
+	public boolean isQueryFailed() {
+		return failed || sock == null || sock.getState() == EnumEaglerConnectionState.FAILED;
+	}
+
+	@Override
+	public RelayQuery.RateLimit isQueryRateLimit() {
+		return rateLimitStatus;
+	}
+
+	@Override
+	public void close() {
+		if(sock != null) {
+			sock.close();
+		}
+	}
+
+	@Override
+	public List<RelayPacket07LocalWorlds.LocalWorld> getWorlds() {
+		return worlds;
+	}
+
+	@Override
+	public RelayQuery.VersionMismatch getCompatible() {
+		return versError;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayWorldsQueryRateLimitDummy.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayWorldsQueryRateLimitDummy.java
new file mode 100755
index 0000000..cb802f3
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayWorldsQueryRateLimitDummy.java
@@ -0,0 +1,64 @@
+package net.lax1dude.eaglercraft.v1_8.sp.relay;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket07LocalWorlds;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RelayWorldsQueryRateLimitDummy implements RelayWorldsQuery {
+
+	private final RelayQuery.RateLimit rateLimit;
+
+	public RelayWorldsQueryRateLimitDummy(RelayQuery.RateLimit rateLimit) {
+		this.rateLimit = rateLimit;
+	}
+
+	@Override
+	public void update() {
+	}
+
+	@Override
+	public boolean isQueryOpen() {
+		return false;
+	}
+
+	@Override
+	public boolean isQueryFailed() {
+		return true;
+	}
+
+	@Override
+	public RelayQuery.RateLimit isQueryRateLimit() {
+		return rateLimit;
+	}
+
+	@Override
+	public void close() {
+	}
+
+	@Override
+	public List<RelayPacket07LocalWorlds.LocalWorld> getWorlds() {
+		return new ArrayList<>(0);
+	}
+
+	@Override
+	public RelayQuery.VersionMismatch getCompatible() {
+		return RelayQuery.VersionMismatch.COMPATIBLE;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/ICEServerSet.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/ICEServerSet.java
deleted file mode 100755
index 8c3b4e0..0000000
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/ICEServerSet.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.sp.relay.pkt;
-
-/**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class ICEServerSet {
-
-	public static enum RelayType {
-		STUN, TURN;
-	}
-
-	public static class RelayServer {
-		
-		public final RelayType type;
-		public final String address;
-		public final String username;
-		public final String password;
-		
-		protected RelayServer(RelayType type, String address, String username, String password) {
-			this.type = type;
-			this.address = address;
-			this.username = username;
-			this.password = password;
-		}
-		
-		protected RelayServer(RelayType type, String address) {
-			this.type = type;
-			this.address = address;
-			this.username = null;
-			this.password = null;
-		}
-
-		public String getICEString() {
-			if(username == null) {
-				return address;
-			}else {
-				return address + ";" + username + ";" + password;
-			}
-		}
-		
-	}
-	
-}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket01ICEServers.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket01ICEServers.java
deleted file mode 100755
index 1db4f35..0000000
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket01ICEServers.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.sp.relay.pkt;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class IPacket01ICEServers extends IPacket {
-	
-	public final Collection<ICEServerSet.RelayServer> servers;
-	
-	public IPacket01ICEServers() {
-		servers = new ArrayList();
-	}
-	
-	public void read(DataInputStream input) throws IOException {
-		servers.clear();
-		int l = input.readUnsignedShort();
-		for(int i = 0; i < l; ++i) {
-			char type = (char)input.read();
-			ICEServerSet.RelayType typeEnum;
-			if(type == 'S') {
-				typeEnum = ICEServerSet.RelayType.STUN;
-			}else if(type == 'T') {
-				typeEnum = ICEServerSet.RelayType.TURN;
-			}else {
-				throw new IOException("Unknown/Unsupported Relay Type: '" + type + "'");
-			}
-			servers.add(new ICEServerSet.RelayServer(
-					typeEnum,
-					readASCII16(input),
-					readASCII8(input),
-					readASCII8(input)
-			));
-		}
-	}
-	
-}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerChunkLoader.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerChunkLoader.java
index 3b5a609..a1ac93f 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerChunkLoader.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerChunkLoader.java
@@ -71,7 +71,7 @@ public class EaglerChunkLoader extends AnvilChunkLoader {
 
 	@Override
 	public Chunk loadChunk(World var1, int var2, int var3) throws IOException {
-		VFile2 file = new VFile2(chunkDirectory, getChunkPath(var2, var3) + ".dat");
+		VFile2 file = WorldsDB.newVFile(chunkDirectory, getChunkPath(var2, var3) + ".dat");
 		if(!file.exists()) {
 			return null;
 		}
@@ -93,7 +93,7 @@ public class EaglerChunkLoader extends AnvilChunkLoader {
 		this.writeChunkToNBT(var2, var1, chunkData);
 		NBTTagCompound fileData = new NBTTagCompound();
 		fileData.setTag("Level", chunkData);
-		VFile2 file = new VFile2(chunkDirectory, getChunkPath(var2.xPosition, var2.zPosition) + ".dat");
+		VFile2 file = WorldsDB.newVFile(chunkDirectory, getChunkPath(var2.xPosition, var2.zPosition) + ".dat");
 		try(OutputStream os = file.getOutputStream()) {
 			CompressedStreamTools.writeCompressed(fileData, os);
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java
index 16698c7..d6e4212 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java
@@ -58,7 +58,7 @@ public class EaglerIntegratedServerWorker {
 
 	public static final EaglerSaveFormat saveFormat = new EaglerSaveFormat(EaglerSaveFormat.worldsFolder);
 
-	private static final Map<String, IntegratedServerPlayerNetworkManager> openChannels = new HashMap();
+	private static final Map<String, IntegratedServerPlayerNetworkManager> openChannels = new HashMap<>();
 
 	private static final IPCPacketManager packetManagerInstance = new IPCPacketManager();
 
@@ -197,7 +197,7 @@ public class EaglerIntegratedServerWorker {
 				}
 				String[] worldsTxt = EaglerSaveFormat.worldsList.getAllLines();
 				if(worldsTxt != null) {
-					List<String> newWorlds = new ArrayList();
+					List<String> newWorlds = new ArrayList<>();
 					for(int i = 0; i < worldsTxt.length; ++i) {
 						String str = worldsTxt[i];
 						if(!str.equalsIgnoreCase(pkt.worldName)) {
@@ -301,18 +301,18 @@ public class EaglerIntegratedServerWorker {
 				}else {
 					String[] worlds = EaglerSaveFormat.worldsList.getAllLines();
 					if(worlds == null) {
-						sendIPCPacket(new IPCPacket16NBTList(IPCPacket16NBTList.WORLD_LIST, new LinkedList<NBTTagCompound>()));
+						sendIPCPacket(new IPCPacket16NBTList(IPCPacket16NBTList.WORLD_LIST, new LinkedList<>()));
 						break;
 					}
-					LinkedHashSet<String> updatedList = new LinkedHashSet();
-					LinkedList<NBTTagCompound> sendListNBT = new LinkedList();
+					LinkedHashSet<String> updatedList = new LinkedHashSet<>();
+					LinkedList<NBTTagCompound> sendListNBT = new LinkedList<>();
 					boolean rewrite = false;
 					for(int i = 0; i < worlds.length; ++i) {
 						String w = worlds[i].trim();
 						if(w.length() > 0) {
-							VFile2 vf = new VFile2(EaglerSaveFormat.worldsFolder, w, "level.dat");
+							VFile2 vf = WorldsDB.newVFile(EaglerSaveFormat.worldsFolder, w, "level.dat");
 							if(!vf.exists()) {
-								vf = new VFile2(EaglerSaveFormat.worldsFolder, w, "level.dat_old");
+								vf = WorldsDB.newVFile(EaglerSaveFormat.worldsFolder, w, "level.dat_old");
 							}
 							if(vf.exists()) {
 								try(InputStream dat = vf.getInputStream()) {
@@ -391,8 +391,8 @@ public class EaglerIntegratedServerWorker {
 				}
 				break;
 			}
-			case IPCPacket21EnableLogging.ID: {
-				enableLoggingRedirector(((IPCPacket21EnableLogging)ipc).enable);
+			case IPCPacket1BEnableLogging.ID: {
+				enableLoggingRedirector(((IPCPacket1BEnableLogging)ipc).enable);
 				break;
 			}
 			default: 
@@ -418,7 +418,7 @@ public class EaglerIntegratedServerWorker {
 	}
 
 	public static void sendLogMessagePacket(String txt, boolean err) {
-		sendIPCPacket(new IPCPacket20LoggerMessage(txt, err));
+		sendIPCPacket(new IPCPacket1ALoggerMessage(txt, err));
 	}
 
 	public static void sendIPCPacket(IPCPacketBase ipc) {
@@ -454,12 +454,12 @@ public class EaglerIntegratedServerWorker {
 		currentProcess = null;
 	}
 
-	private static void mainLoop() {
+	private static void mainLoop(boolean singleThreadMode) {
 		processAsyncMessageQueue();
 		
 		if(currentProcess != null) {
 			if(currentProcess.isServerRunning()) {
-				currentProcess.mainLoop();
+				currentProcess.mainLoop(singleThreadMode);
 			}
 			if(!currentProcess.isServerRunning()) {
 				currentProcess.stopServer();
@@ -467,7 +467,9 @@ public class EaglerIntegratedServerWorker {
 				sendIPCPacket(new IPCPacketFFProcessKeepAlive(IPCPacket01StopServer.ID));
 			}
 		}else {
-			EagUtils.sleep(50l);
+			if(!singleThreadMode) {
+				EagUtils.sleep(50l);
+			}
 		}
 	}
 
@@ -476,12 +478,16 @@ public class EaglerIntegratedServerWorker {
 			currentProcess = null;
 			logger.info("Starting EaglercraftX integrated server worker...");
 			
+			if(ServerPlatformSingleplayer.getWorldsDatabase().isRamdisk()) {
+				sendIPCPacket(new IPCPacket1CIssueDetected(IPCPacket1CIssueDetected.ISSUE_RAMDISK_MODE));
+			}
+			
 			// signal thread startup successful
 			sendIPCPacket(new IPCPacketFFProcessKeepAlive(0xFF));
 			
 			while(true) {
-				mainLoop();
-				EagUtils.sleep(0l);
+				mainLoop(false);
+				ServerPlatformSingleplayer.immediateContinue();
 			}
 		}catch(Throwable tt) {
 			if(tt instanceof ReportedException) {
@@ -506,4 +512,17 @@ public class EaglerIntegratedServerWorker {
 			sendIPCPacket(new IPCPacketFFProcessKeepAlive(IPCPacketFFProcessKeepAlive.EXITED));
 		}
 	}
+
+	public static void singleThreadMain() {
+		logger.info("Starting EaglercraftX integrated server worker...");
+		if(ServerPlatformSingleplayer.getWorldsDatabase().isRamdisk()) {
+			sendIPCPacket(new IPCPacket1CIssueDetected(IPCPacket1CIssueDetected.ISSUE_RAMDISK_MODE));
+		}
+		sendIPCPacket(new IPCPacketFFProcessKeepAlive(0xFF));
+	}
+
+	public static void singleThreadUpdate() {
+		mainLoop(true);
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerMinecraftServer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerMinecraftServer.java
index 351655d..14e547b 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerMinecraftServer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerMinecraftServer.java
@@ -1,11 +1,12 @@
 package net.lax1dude.eaglercraft.v1_8.sp.server;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.minecraft.entity.player.EntityPlayer;
@@ -39,7 +40,7 @@ public class EaglerMinecraftServer extends MinecraftServer {
 
 	public static final Logger logger = EaglerIntegratedServerWorker.logger;
 
-	public static final VFile2 savesDir = new VFile2("worlds");
+	public static final VFile2 savesDir = WorldsDB.newVFile("worlds");
 
 	protected EnumDifficulty difficulty;
 	protected GameType gamemode;
@@ -59,13 +60,13 @@ public class EaglerMinecraftServer extends MinecraftServer {
 	public static int counterTileUpdate = 0;
 	public static int counterLightUpdate = 0;
 
-	private final List<Runnable> scheduledTasks = new LinkedList();
+	private final List<Runnable> scheduledTasks = new LinkedList<>();
 
 	public EaglerMinecraftServer(String world, String owner, int viewDistance, WorldSettings currentWorldSettings, boolean demo) {
 		super(world);
 		Bootstrap.register();
 		this.saveHandler = new EaglerSaveHandler(savesDir, world);
-		this.skinService = new IntegratedSkinService(new VFile2(saveHandler.getWorldDirectory(), "eagler/skulls"));
+		this.skinService = new IntegratedSkinService(WorldsDB.newVFile(saveHandler.getWorldDirectory(), "eagler/skulls"));
 		this.capeService = new IntegratedCapeService();
 		this.voiceService = null;
 		this.setServerOwner(owner);
@@ -131,7 +132,7 @@ public class EaglerMinecraftServer extends MinecraftServer {
 		EaglerIntegratedServerWorker.saveFormat.deleteWorldDirectory(getFolderName());
 	}
 
-	public void mainLoop() {
+	public void mainLoop(boolean singleThreadMode) {
 		long k = getCurrentTimeMillis();
 		this.sendTPSToClient(k);
 		if(paused && this.playersOnline.size() <= 1) {
@@ -140,7 +141,7 @@ public class EaglerMinecraftServer extends MinecraftServer {
 		}
 
 		long j = k - this.currentTime;
-		if (j > 2000L && this.currentTime - this.timeOfLastWarning >= 15000L) {
+		if (j > (singleThreadMode ? 500L : 2000L) && this.currentTime - this.timeOfLastWarning >= (singleThreadMode ? 5000L : 15000L)) {
 			logger.warn(
 					"Can\'t keep up! Did the system time change, or is the server overloaded? Running {}ms behind, skipping {} tick(s)",
 					new Object[] { Long.valueOf(j), Long.valueOf(j / 50L) });
@@ -177,13 +178,13 @@ public class EaglerMinecraftServer extends MinecraftServer {
 		if(millis - lastTPSUpdate > 1000l) {
 			lastTPSUpdate = millis;
 			if(serverRunning && this.worldServers != null) {
-				List<String> lst = new ArrayList<>(Arrays.asList(
+				List<String> lst = Lists.newArrayList(
 						"TPS: " + counterTicksPerSecond + "/20",
 						"Chunks: " + countChunksLoaded(this.worldServers) + "/" + countChunksTotal(this.worldServers),
 						"Entities: " + countEntities(this.worldServers) + "+" + countTileEntities(this.worldServers),
 						"R: " + counterChunkRead + ", G: " + counterChunkGenerate + ", W: " + counterChunkWrite,
 						"TU: " + counterTileUpdate + ", LU: " + counterLightUpdate
-				));
+				);
 				int players = countPlayerEntities(this.worldServers);
 				if(players > 1) {
 					lst.add("Players: " + players);
@@ -252,7 +253,7 @@ public class EaglerMinecraftServer extends MinecraftServer {
 	public void setPaused(boolean p) {
 		paused = p;
 		if(!p) {
-			currentTime = System.currentTimeMillis();
+			currentTime = EagRuntime.steadyTimeMillis();
 		}
 	}
 	
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java
index 3d31901..56af6a7 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java
@@ -30,13 +30,13 @@ import net.minecraft.world.storage.WorldInfo;
  */
 public class EaglerSaveFormat extends SaveFormatOld {
 
-	public static final VFile2 worldsList = new VFile2("worlds_list.txt");
-	public static final VFile2 worldsFolder = new VFile2("worlds");
-
 	public EaglerSaveFormat(VFile2 parFile) {
 		super(parFile);
 	}
 
+	public static final VFile2 worldsList = WorldsDB.newVFile("worlds_list.txt");
+	public static final VFile2 worldsFolder = WorldsDB.newVFile("worlds");
+
 	public String getName() {
 		return "eagler";
 	}
@@ -46,7 +46,7 @@ public class EaglerSaveFormat extends SaveFormatOld {
 	}
 
 	public List<SaveFormatComparator> getSaveList() {
-		ArrayList arraylist = Lists.newArrayList();
+		ArrayList<SaveFormatComparator> arraylist = Lists.newArrayList();
 		if(worldsList.exists()) {
 			String[] lines = worldsList.getAllLines();
 			for (int i = 0; i < lines.length; ++i) {
@@ -70,7 +70,7 @@ public class EaglerSaveFormat extends SaveFormatOld {
 	}
 
 	public void clearPlayers(String worldFolder) {
-		VFile2 file1 = new VFile2(this.savesDirectory, worldFolder, "player");
+		VFile2 file1 = WorldsDB.newVFile(this.savesDirectory, worldFolder, "player");
 		deleteFiles(file1.listFiles(true), null);
 	}
 
@@ -80,12 +80,12 @@ public class EaglerSaveFormat extends SaveFormatOld {
 
 	public boolean duplicateWorld(String worldFolder, String displayName) {
 		String newFolderName = displayName.replaceAll("[\\./\"]", "_");
-		VFile2 newFolder = new VFile2(savesDirectory, newFolderName);
-		while((new VFile2(newFolder, "level.dat")).exists() || (new VFile2(newFolder, "level.dat_old")).exists()) {
+		VFile2 newFolder = WorldsDB.newVFile(savesDirectory, newFolderName);
+		while((WorldsDB.newVFile(newFolder, "level.dat")).exists() || (WorldsDB.newVFile(newFolder, "level.dat_old")).exists()) {
 			newFolderName += "_";
-			newFolder = new VFile2(savesDirectory, newFolderName);
+			newFolder = WorldsDB.newVFile(savesDirectory, newFolderName);
 		}
-		VFile2 oldFolder = new VFile2(this.savesDirectory, worldFolder);
+		VFile2 oldFolder = WorldsDB.newVFile(this.savesDirectory, worldFolder);
 		String oldPath = oldFolder.getPath();
 		int totalSize = 0;
 		int lastUpdate = 0;
@@ -94,7 +94,7 @@ public class EaglerSaveFormat extends SaveFormatOld {
 		for(int i = 0, l = vfl.size(); i < l; ++i) {
 			VFile2 vf = vfl.get(i);
 			String fileNameRelative = vf.getPath().substring(oldPath.length() + 1);
-			totalSize += VFile2.copyFile(vf, new VFile2(finalNewFolder, fileNameRelative));
+			totalSize += VFile2.copyFile(vf, WorldsDB.newVFile(finalNewFolder, fileNameRelative));
 			if (totalSize - lastUpdate > 10000) {
 				lastUpdate = totalSize;
 				EaglerIntegratedServerWorker.sendProgress("singleplayer.busy.duplicating", totalSize);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveHandler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveHandler.java
index 55dfc9f..449ed9a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveHandler.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveHandler.java
@@ -29,7 +29,7 @@ public class EaglerSaveHandler extends SaveHandler {
 	}
 
 	public IChunkLoader getChunkLoader(WorldProvider provider) {
-		return new EaglerChunkLoader(new VFile2(this.getWorldDirectory(), "level" + provider.getDimensionId()));
+		return new EaglerChunkLoader(WorldsDB.newVFile(this.getWorldDirectory(), "level" + provider.getDimensionId()));
 	}
 
 	public void saveWorldInfoWithPlayer(WorldInfo worldInformation, NBTTagCompound tagCompound) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/WorldsDB.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/WorldsDB.java
new file mode 100755
index 0000000..01aa28d
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/WorldsDB.java
@@ -0,0 +1,32 @@
+package net.lax1dude.eaglercraft.v1_8.sp.server;
+
+import java.util.function.Supplier;
+
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
+import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
+import net.lax1dude.eaglercraft.v1_8.sp.server.internal.ServerPlatformSingleplayer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class WorldsDB {
+
+	private static final Supplier<IEaglerFilesystem> fsGetter = ServerPlatformSingleplayer::getWorldsDatabase;
+
+	public static VFile2 newVFile(Object... path) {
+		return VFile2.create(fsGetter, path);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKCompiler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKCompiler.java
index 54a9668..c0c3cb0 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKCompiler.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKCompiler.java
@@ -7,8 +7,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.zip.CRC32;
 
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
 
 /**
  * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
@@ -28,11 +28,16 @@ import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 public class EPKCompiler {
 
 	private final EaglerOutputStream os;
+	private final OutputStream dos;
 	private final CRC32 checkSum = new CRC32();
 	private int lengthIntegerOffset = 0;
 	private int totalFileCount = 0;
 
 	public EPKCompiler(String name, String owner, String type) {
+		this(name, owner, type, false, true, null);
+	}
+
+	public EPKCompiler(String name, String owner, String type, boolean gzip, boolean world, String commentStr) {
 		os = new EaglerOutputStream(0x200000);
 		try {
 			
@@ -44,10 +49,11 @@ public class EPKCompiler {
 			os.write(filename.length);
 			os.write(filename);
 			
-			byte[] comment = ("\n\n #  Eagler EPK v2.0 (c) " + EagRuntime.fixDateFormat(new SimpleDateFormat("yyyy")).format(d) + " " +
-					owner + "\n #  export: on " + EagRuntime.fixDateFormat(new SimpleDateFormat("MM/dd/yyyy")).format(d) + " at " +
-					EagRuntime.fixDateFormat(new SimpleDateFormat("hh:mm:ss aa")).format(d) + "\n\n #  world name: " + name + "\n\n")
-					.getBytes(StandardCharsets.UTF_8);
+			byte[] comment = (world ? ("\n\n #  Eagler EPK v2.0 (c) "
+					+ (new SimpleDateFormat("yyyy")).format(d) + " " + owner
+					+ "\n #  export: on " + (new SimpleDateFormat("MM/dd/yyyy")).format(d)
+					+ " at " + (new SimpleDateFormat("hh:mm:ss aa")).format(d)
+					+ "\n\n #  world name: " + name + "\n\n") : commentStr).getBytes(StandardCharsets.UTF_8);
 
 			os.write((comment.length >>> 8) & 255);
 			os.write(comment.length & 255);
@@ -58,40 +64,50 @@ public class EPKCompiler {
 			lengthIntegerOffset = os.size();
 			os.write(new byte[]{(byte)255,(byte)255,(byte)255,(byte)255}); // this will be replaced with the file count
 			
-			os.write('0'); // compression type: none
+			if(gzip) {
+				os.write('G'); // compression type: gzip
+				dos = EaglerZLIB.newGZIPOutputStream(os);
+			}else {
+				os.write('0'); // compression type: none
+				dos = os;
+			}
 			
-			os.write(new byte[]{(byte)72,(byte)69,(byte)65,(byte)68}); // HEAD
-			os.write(new byte[]{(byte)9,(byte)102,(byte)105,(byte)108,(byte)101,(byte)45,(byte)116,(byte)121,
+			dos.write(new byte[]{(byte)72,(byte)69,(byte)65,(byte)68}); // HEAD
+			dos.write(new byte[]{(byte)9,(byte)102,(byte)105,(byte)108,(byte)101,(byte)45,(byte)116,(byte)121,
 					(byte)112,(byte)101}); // 9 + file-type
 			
 			byte[] typeBytes = type.getBytes(StandardCharsets.UTF_8);
-			writeInt(typeBytes.length, os);
-			os.write(typeBytes); // write type
-			os.write('>');
+			writeInt(typeBytes.length, dos);
+			dos.write(typeBytes); // write type
+			dos.write('>');
 			
 			++totalFileCount;
 			
-			os.write(new byte[]{(byte)72,(byte)69,(byte)65,(byte)68}); // HEAD
-			os.write(new byte[]{(byte)10,(byte)119,(byte)111,(byte)114,(byte)108,(byte)100,(byte)45,(byte)110,
-					(byte)97,(byte)109,(byte)101}); // 10 + world-name
+			if(world) {
+				dos.write(new byte[]{(byte)72,(byte)69,(byte)65,(byte)68}); // HEAD
+				dos.write(new byte[]{(byte)10,(byte)119,(byte)111,(byte)114,(byte)108,(byte)100,(byte)45,(byte)110,
+						(byte)97,(byte)109,(byte)101}); // 10 + world-name
+				
+				byte[] nameBytes = name.getBytes(StandardCharsets.UTF_8);
+				writeInt(nameBytes.length, dos);
+				dos.write(nameBytes); // write name
+				dos.write('>');
+				
+				++totalFileCount;
+			}
 			
-			byte[] nameBytes = name.getBytes(StandardCharsets.UTF_8);
-			writeInt(nameBytes.length, os);
-			os.write(nameBytes); // write name
-			os.write('>');
-			
-			++totalFileCount;
-			
-			os.write(new byte[]{(byte)72,(byte)69,(byte)65,(byte)68}); // HEAD
-			os.write(new byte[]{(byte)11,(byte)119,(byte)111,(byte)114,(byte)108,(byte)100,(byte)45,(byte)111,
-					(byte)119,(byte)110,(byte)101,(byte)114}); // 11 + world-owner
-			
-			byte[] ownerBytes = owner.getBytes(StandardCharsets.UTF_8);
-			writeInt(ownerBytes.length, os);
-			os.write(ownerBytes); // write owner
-			os.write('>');
-			
-			++totalFileCount;
+			if(world && owner != null) {
+				dos.write(new byte[]{(byte)72,(byte)69,(byte)65,(byte)68}); // HEAD
+				dos.write(new byte[]{(byte)11,(byte)119,(byte)111,(byte)114,(byte)108,(byte)100,(byte)45,(byte)111,
+						(byte)119,(byte)110,(byte)101,(byte)114}); // 11 + world-owner
+				
+				byte[] ownerBytes = owner.getBytes(StandardCharsets.UTF_8);
+				writeInt(ownerBytes.length, dos);
+				dos.write(ownerBytes); // write owner
+				dos.write('>');
+				
+				++totalFileCount;
+			}
 			
 		}catch(IOException ex) {
 			throw new RuntimeException("This happened somehow", ex);
@@ -105,19 +121,19 @@ public class EPKCompiler {
 			checkSum.update(dat, 0, dat.length);
 			long sum = checkSum.getValue();
 			
-			os.write(new byte[]{(byte)70,(byte)73,(byte)76,(byte)69}); // FILE
+			dos.write(new byte[]{(byte)70,(byte)73,(byte)76,(byte)69}); // FILE
 			
 			byte[] nameBytes = name.getBytes(StandardCharsets.UTF_8);
-			os.write(nameBytes.length);
-			os.write(nameBytes);
+			dos.write(nameBytes.length);
+			dos.write(nameBytes);
 			
-			writeInt(dat.length + 5, os);
-			writeInt((int)sum, os);
+			writeInt(dat.length + 5, dos);
+			writeInt((int)sum, dos);
 			
-			os.write(dat);
+			dos.write(dat);
 			
-			os.write(':');
-			os.write('>');
+			dos.write(':');
+			dos.write('>');
 			
 			++totalFileCount;
 			
@@ -128,8 +144,9 @@ public class EPKCompiler {
 	
 	public byte[] complete() {
 		try {
+			dos.write(new byte[]{(byte)69,(byte)78,(byte)68,(byte)36}); // END$
+			dos.close();
 			
-			os.write(new byte[]{(byte)69,(byte)78,(byte)68,(byte)36}); // END$
 			os.write(new byte[]{(byte)58,(byte)58,(byte)58,(byte)89,(byte)69,(byte)69,(byte)58,(byte)62}); // :::YEE:>
 			
 			byte[] ret = os.toByteArray();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterEPK.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterEPK.java
index 8b92ba0..65f26e3 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterEPK.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterEPK.java
@@ -10,6 +10,7 @@ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerIntegratedServerWorker;
 import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerSaveFormat;
+import net.lax1dude.eaglercraft.v1_8.sp.server.WorldsDB;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.storage.WorldInfo;
@@ -37,7 +38,7 @@ public class WorldConverterEPK {
 		logger.info("Importing world \"{}\" from EPK", newName);
 		String folderName = newName.replaceAll("[\\./\"]", "_");
 		VFile2 worldDir = EaglerIntegratedServerWorker.saveFormat.getSaveLoader(folderName, false).getWorldDirectory();
-		while((new VFile2(worldDir, "level.dat")).exists() || (new VFile2(worldDir, "level.dat_old")).exists()) {
+		while(WorldsDB.newVFile(worldDir, "level.dat").exists() || WorldsDB.newVFile(worldDir, "level.dat_old").exists()) {
 			folderName += "_";
 			worldDir = EaglerIntegratedServerWorker.saveFormat.getSaveLoader(folderName, false).getWorldDirectory();
 		}
@@ -74,7 +75,7 @@ public class WorldConverterEPK {
 						CompressedStreamTools.writeCompressed(worldDatNBT, tmp);
 						b = tmp.toByteArray();
 					}
-					VFile2 ff = new VFile2(worldDir, f.name);
+					VFile2 ff = WorldsDB.newVFile(worldDir, f.name);
 					ff.setAllBytes(b);
 					prog += b.length;
 					++cnt;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java
index d4ddac5..eff2004 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java
@@ -19,6 +19,7 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerChunkLoader;
 import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerIntegratedServerWorker;
 import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerSaveFormat;
+import net.lax1dude.eaglercraft.v1_8.sp.server.WorldsDB;
 import net.minecraft.world.chunk.storage.RegionFile;
 import net.minecraft.world.storage.WorldInfo;
 import net.minecraft.nbt.CompressedStreamTools;
@@ -47,7 +48,7 @@ public class WorldConverterMCA {
 		logger.info("Importing world \"{}\" from MCA", newName);
 		String folderName = newName.replaceAll("[\\./\"]", "_");
 		VFile2 worldDir = EaglerIntegratedServerWorker.saveFormat.getSaveLoader(folderName, false).getWorldDirectory();
-		while((new VFile2(worldDir, "level.dat")).exists() || (new VFile2(worldDir, "level.dat_old")).exists()) {
+		while(WorldsDB.newVFile(worldDir, "level.dat").exists() || WorldsDB.newVFile(worldDir, "level.dat_old").exists()) {
 			folderName += "_";
 			worldDir = EaglerIntegratedServerWorker.saveFormat.getSaveLoader(folderName, false).getWorldDirectory();
 		}
@@ -105,11 +106,11 @@ public class WorldConverterMCA {
 					EaglerOutputStream bo = new EaglerOutputStream();
 					CompressedStreamTools.writeCompressed(worldDatNBT, bo);
 					b = bo.toByteArray();
-					VFile2 ff = new VFile2(worldDir, fileName);
+					VFile2 ff = WorldsDB.newVFile(worldDir, fileName);
 					ff.setAllBytes(b);
 					prog += b.length;
 				} else if ((fileName.endsWith(".mcr") || fileName.endsWith(".mca")) && (fileName.startsWith("region/") || fileName.startsWith("DIM1/region/") || fileName.startsWith("DIM-1/region/"))) {
-					VFile2 chunkFolder = new VFile2(worldDir, fileName.startsWith("DIM1") ? "level1" : (fileName.startsWith("DIM-1") ? "level-1" : "level0"));
+					VFile2 chunkFolder = WorldsDB.newVFile(worldDir, fileName.startsWith("DIM1") ? "level1" : (fileName.startsWith("DIM-1") ? "level-1" : "level0"));
 					RegionFile mca = new RegionFile(new RandomAccessMemoryFile(b, b.length));
 					int loadChunksCount = 0;
 					for(int j = 0; j < 32; ++j) {
@@ -130,7 +131,7 @@ public class WorldConverterMCA {
 								}
 								int chunkX = chunkLevel.getInteger("xPos");
 								int chunkZ = chunkLevel.getInteger("zPos");
-								VFile2 chunkOut = new VFile2(chunkFolder, EaglerChunkLoader.getChunkPath(chunkX, chunkZ) + ".dat");
+								VFile2 chunkOut = WorldsDB.newVFile(chunkFolder, EaglerChunkLoader.getChunkPath(chunkX, chunkZ) + ".dat");
 								if(chunkOut.exists()) {
 									logger.error("{}: Chunk already exists: {}", fileName, chunkOut.getPath());
 									continue;
@@ -152,7 +153,7 @@ public class WorldConverterMCA {
 				} else if (fileName.startsWith("playerdata/") || fileName.startsWith("stats/")) {
 					//TODO: LAN player inventories
 				} else if (fileName.startsWith("data/") || fileName.startsWith("players/") || fileName.startsWith("eagler/skulls/")) {
-					VFile2 ff = new VFile2(worldDir, fileName);
+					VFile2 ff = WorldsDB.newVFile(worldDir, fileName);
 					ff.setAllBytes(b);
 					prog += b.length;
 				} else if (!fileName.equals("level.dat_mcr") && !fileName.equals("session.lock")) {
@@ -184,7 +185,7 @@ public class WorldConverterMCA {
 			zos.setComment("contains backup of world '" + folderName + "'");
 			worldFolder = EaglerIntegratedServerWorker.saveFormat.getSaveLoader(folderName, false).getWorldDirectory();
 			logger.info("Exporting world directory \"{}\" as MCA", worldFolder.getPath());
-			VFile2 vf = new VFile2(worldFolder, "level.dat");
+			VFile2 vf = WorldsDB.newVFile(worldFolder, "level.dat");
 			byte[] b;
 			int lastProgUpdate = 0;
 			int prog = 0;
@@ -196,7 +197,7 @@ public class WorldConverterMCA {
 				prog += b.length;
 				safe = true;
 			}
-			vf = new VFile2(worldFolder, "level.dat_old");
+			vf = WorldsDB.newVFile(worldFolder, "level.dat_old");
 			if(vf.exists()) {
 				zos.putNextEntry(new ZipEntry(folderName + "/level.dat_old"));
 				b = vf.getAllBytes();
@@ -212,11 +213,11 @@ public class WorldConverterMCA {
 			String[] dstFolderNames = new String[] { "/region/", "/DIM-1/region/", "/DIM1/region/" };
 			List<VFile2> fileList;
 			for(int i = 0; i < 3; ++i) {
-				vf = new VFile2(worldFolder, srcFolderNames[i]);
+				vf = WorldsDB.newVFile(worldFolder, srcFolderNames[i]);
 				fileList = vf.listFiles(true);
 				String regionFolder = folderName + dstFolderNames[i];
 				logger.info("Converting chunks in \"{}\" as MCA to \"{}\"...", vf.getPath(), regionFolder);
-				Map<String,RegionFile> regionFiles = new HashMap();
+				Map<String,RegionFile> regionFiles = new HashMap<>();
 				for(int k = 0, l = fileList.size(); k < l; ++k) {
 					VFile2 chunkFile = fileList.get(k);
 					NBTTagCompound chunkNBT;
@@ -266,7 +267,7 @@ public class WorldConverterMCA {
 				}
 			}
 			logger.info("Copying extra world data...");
-			fileList = (new VFile2(worldFolder, "data")).listFiles(false);
+			fileList = WorldsDB.newVFile(worldFolder, "data").listFiles(false);
 			for(int k = 0, l = fileList.size(); k < l; ++k) {
 				VFile2 dataFile = fileList.get(k);
 				zos.putNextEntry(new ZipEntry(folderName + "/data/" + dataFile.getName()));
@@ -278,7 +279,7 @@ public class WorldConverterMCA {
 					EaglerIntegratedServerWorker.sendProgress("singleplayer.busy.exporting.2", prog);
 				}
 			}
-			fileList = (new VFile2(worldFolder, "players")).listFiles(false);
+			fileList = WorldsDB.newVFile(worldFolder, "players").listFiles(false);
 			for(int k = 0, l = fileList.size(); k < l; ++k) {
 				VFile2 dataFile = fileList.get(k);
 				zos.putNextEntry(new ZipEntry(folderName + "/players/" + dataFile.getName()));
@@ -290,7 +291,7 @@ public class WorldConverterMCA {
 					EaglerIntegratedServerWorker.sendProgress("singleplayer.busy.exporting.2", prog);
 				}
 			}
-			fileList = (new VFile2(worldFolder, "eagler/skulls")).listFiles(false);
+			fileList = WorldsDB.newVFile(worldFolder, "eagler/skulls").listFiles(false);
 			for(int k = 0, l = fileList.size(); k < l; ++k) {
 				VFile2 dataFile = fileList.get(k);
 				zos.putNextEntry(new ZipEntry(folderName + "/eagler/skulls/" + dataFile.getName()));
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/CustomSkullData.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/CustomSkullData.java
index 1fea6fa..63dda81 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/CustomSkullData.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/CustomSkullData.java
@@ -1,5 +1,12 @@
 package net.lax1dude.eaglercraft.v1_8.sp.server.skins;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageProtocol;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketOtherSkinCustomV3EAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.util.SkinPacketVersionCache;
+
 /**
  * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
@@ -19,21 +26,25 @@ public class CustomSkullData {
 
 	public String skinURL;
 	public long lastHit;
-	public byte[] skinData;
+	public SkinPacketVersionCache skinData;
 
 	public CustomSkullData(String skinURL, byte[] skinData) {
 		this.skinURL = skinURL;
-		this.lastHit = System.currentTimeMillis();
-		this.skinData = skinData;
+		this.lastHit = EagRuntime.steadyTimeMillis();
+		if(skinData.length != 16384) {
+			byte[] fixed = new byte[16384];
+			System.arraycopy(skinData, 0, fixed, 0, skinData.length > fixed.length ? fixed.length : skinData.length);
+			skinData = fixed;
+		}
+		this.skinData = SkinPacketVersionCache.createCustomV3(0l, 0l, 0, skinData);
 	}
 
 	public byte[] getFullSkin() {
-		if(skinData.length == 16384) {
-			return skinData;
-		}
-		byte[] ret = new byte[16384];
-		System.arraycopy(skinData, 0, ret, 0, skinData.length > ret.length ? ret.length : skinData.length);
-		return ret;
+		return ((SPacketOtherSkinCustomV3EAG)skinData.getV3()).customSkin;
+	}
+
+	public GameMessagePacket getSkinPacket(EaglercraftUUID uuid, GamePluginMessageProtocol protocol) {
+		return SkinPacketVersionCache.rewriteUUID(skinData.get(protocol), uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
 	}
 
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedCapePackets.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedCapePackets.java
index 38a3f4e..d5be9fc 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedCapePackets.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedCapePackets.java
@@ -3,7 +3,9 @@ package net.lax1dude.eaglercraft.v1_8.sp.server.skins;
 import java.io.IOException;
 
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketOtherCapeCustomEAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketOtherCapePresetEAG;
 
 /**
  * Copyright (c) 2024 lax1dude. All Rights Reserved.
@@ -24,56 +26,27 @@ public class IntegratedCapePackets {
 
 	public static final int PACKET_MY_CAPE_PRESET = 0x01;
 	public static final int PACKET_MY_CAPE_CUSTOM = 0x02;
-	public static final int PACKET_GET_OTHER_CAPE = 0x03;
-	public static final int PACKET_OTHER_CAPE_PRESET = 0x04;
-	public static final int PACKET_OTHER_CAPE_CUSTOM = 0x05;
-
-	public static void processPacket(byte[] data, EntityPlayerMP sender, IntegratedCapeService capeService) throws IOException {
-		if(data.length == 0) {
-			throw new IOException("Zero-length packet recieved");
-		}
-		int packetId = (int)data[0] & 0xFF;
-		try {
-			switch(packetId) {
-			case PACKET_GET_OTHER_CAPE:
-				processGetOtherCape(data, sender, capeService);
-				break;
-			default:
-				throw new IOException("Unknown packet type " + packetId);
-			}
-		}catch(IOException ex) {
-			throw ex;
-		}catch(Throwable t) {
-			throw new IOException("Unhandled exception handling packet type " + packetId, t);
-		}
-	}
-
-	private static void processGetOtherCape(byte[] data, EntityPlayerMP sender, IntegratedCapeService capeService) throws IOException {
-		if(data.length != 17) {
-			throw new IOException("Invalid length " + data.length + " for skin request packet");
-		}
-		EaglercraftUUID searchUUID = IntegratedSkinPackets.bytesToUUID(data, 1);
-		capeService.processGetOtherCape(searchUUID, sender);
-	}
 
 	public static void registerEaglerPlayer(EaglercraftUUID clientUUID, byte[] bs, IntegratedCapeService capeService) throws IOException {
 		if(bs.length == 0) {
 			throw new IOException("Zero-length packet recieved");
 		}
-		byte[] generatedPacket;
+		GameMessagePacket generatedPacket;
 		int packetType = (int)bs[0] & 0xFF;
 		switch(packetType) {
 		case PACKET_MY_CAPE_PRESET:
 			if(bs.length != 5) {
 				throw new IOException("Invalid length " + bs.length + " for preset cape packet");
 			}
-			generatedPacket = IntegratedCapePackets.makePresetResponse(clientUUID, (bs[1] << 24) | (bs[2] << 16) | (bs[3] << 8) | (bs[4] & 0xFF));
+			generatedPacket = new SPacketOtherCapePresetEAG(clientUUID.msb, clientUUID.lsb, (bs[1] << 24) | (bs[2] << 16) | (bs[3] << 8) | (bs[4] & 0xFF));
 			break;
 		case PACKET_MY_CAPE_CUSTOM:
 			if(bs.length != 1174) {
 				throw new IOException("Invalid length " + bs.length + " for custom cape packet");
 			}
-			generatedPacket = IntegratedCapePackets.makeCustomResponse(clientUUID, bs, 1, 1173);
+			byte[] capePixels = new byte[bs.length - 1];
+			System.arraycopy(bs, 1, capePixels, 0, capePixels.length);
+			generatedPacket = new SPacketOtherCapeCustomEAG(clientUUID.msb, clientUUID.lsb, capePixels);
 			break;
 		default:
 			throw new IOException("Unknown skin packet type: " + packetType);
@@ -82,29 +55,7 @@ public class IntegratedCapePackets {
 	}
 
 	public static void registerEaglerPlayerFallback(EaglercraftUUID clientUUID, IntegratedCapeService capeService) {
-		capeService.registerEaglercraftPlayer(clientUUID, IntegratedCapePackets.makePresetResponse(clientUUID, 0));
+		capeService.registerEaglercraftPlayer(clientUUID, new SPacketOtherCapePresetEAG(clientUUID.msb, clientUUID.lsb, 0));
 	}
 
-	public static byte[] makePresetResponse(EaglercraftUUID uuid, int presetId) {
-		byte[] ret = new byte[1 + 16 + 4];
-		ret[0] = (byte)PACKET_OTHER_CAPE_PRESET;
-		IntegratedSkinPackets.UUIDToBytes(uuid, ret, 1);
-		ret[17] = (byte)(presetId >>> 24);
-		ret[18] = (byte)(presetId >>> 16);
-		ret[19] = (byte)(presetId >>> 8);
-		ret[20] = (byte)(presetId & 0xFF);
-		return ret;
-	}
-
-	public static byte[] makeCustomResponse(EaglercraftUUID uuid, byte[] pixels) {
-		return makeCustomResponse(uuid, pixels, 0, pixels.length);
-	}
-
-	public static byte[] makeCustomResponse(EaglercraftUUID uuid, byte[] pixels, int offset, int length) {
-		byte[] ret = new byte[1 + 16 + length];
-		ret[0] = (byte)PACKET_OTHER_CAPE_CUSTOM;
-		IntegratedSkinPackets.UUIDToBytes(uuid, ret, 1);
-		System.arraycopy(pixels, offset, ret, 17, length);
-		return ret;
-	}
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedCapeService.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedCapeService.java
index 8d10efc..84bb813 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedCapeService.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedCapeService.java
@@ -7,10 +7,9 @@ import java.util.Map;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketOtherCapePresetEAG;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
 
 /**
  * Copyright (c) 2024 lax1dude. All Rights Reserved.
@@ -33,19 +32,7 @@ public class IntegratedCapeService {
 
 	public static final int masterRateLimitPerPlayer = 250;
 
-	public static final String CHANNEL = "EAG|Capes-1.8";
-
-	private final Map<EaglercraftUUID, byte[]> capesCache = new HashMap();
-
-	public void processPacket(byte[] packetData, EntityPlayerMP sender) {
-		try {
-			IntegratedCapePackets.processPacket(packetData, sender, this);
-		} catch (IOException e) {
-			logger.error("Invalid skin request packet recieved from player {}!", sender.getName());
-			logger.error(e);
-			sender.playerNetServerHandler.kickPlayerFromServer("Invalid skin request packet recieved!");
-		}
-	}
+	private final Map<EaglercraftUUID, GameMessagePacket> capesCache = new HashMap<>();
 
 	public void processLoginPacket(byte[] packetData, EntityPlayerMP sender) {
 		try {
@@ -57,16 +44,16 @@ public class IntegratedCapeService {
 		}
 	}
 
-	public void registerEaglercraftPlayer(EaglercraftUUID playerUUID, byte[] capePacket) {
+	public void registerEaglercraftPlayer(EaglercraftUUID playerUUID, GameMessagePacket capePacket) {
 		capesCache.put(playerUUID, capePacket);
 	}
 
 	public void processGetOtherCape(EaglercraftUUID searchUUID, EntityPlayerMP sender) {
-		byte[] maybeCape = capesCache.get(searchUUID);
+		GameMessagePacket maybeCape = capesCache.get(searchUUID);
 		if(maybeCape == null) {
-			maybeCape = IntegratedCapePackets.makePresetResponse(searchUUID, 0);
+			maybeCape = new SPacketOtherCapePresetEAG(searchUUID.msb, searchUUID.lsb, 0);
 		}
-		sender.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL, new PacketBuffer(Unpooled.buffer(maybeCape, maybeCape.length).writerIndex(maybeCape.length))));
+		sender.playerNetServerHandler.sendEaglerMessage(maybeCape);
 	}
 
 	public void unregisterPlayer(EaglercraftUUID playerUUID) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinPackets.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinPackets.java
index 4997e98..b41a24b 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinPackets.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinPackets.java
@@ -3,7 +3,9 @@ package net.lax1dude.eaglercraft.v1_8.sp.server.skins;
 import java.io.IOException;
 
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.*;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.util.SkinPacketVersionCache;
 
 /**
  * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
@@ -24,76 +26,14 @@ public class IntegratedSkinPackets {
 
 	public static final int PACKET_MY_SKIN_PRESET = 0x01;
 	public static final int PACKET_MY_SKIN_CUSTOM = 0x02;
-	public static final int PACKET_GET_OTHER_SKIN = 0x03;
-	public static final int PACKET_OTHER_SKIN_PRESET = 0x04;
-	public static final int PACKET_OTHER_SKIN_CUSTOM = 0x05;
-	public static final int PACKET_GET_SKIN_BY_URL = 0x06;
-	public static final int PACKET_INSTALL_NEW_SKIN = 0x07;
 	
-	public static void processPacket(byte[] data, EntityPlayerMP sender, IntegratedSkinService skinService) throws IOException {
-		if(data.length == 0) {
-			throw new IOException("Zero-length packet recieved");
-		}
-		int packetId = (int)data[0] & 0xFF;
-		try {
-			switch(packetId) {
-			case PACKET_GET_OTHER_SKIN:
-				processGetOtherSkin(data, sender, skinService);
-				break;
-			case PACKET_GET_SKIN_BY_URL:
-				processGetOtherSkinByURL(data, sender, skinService);
-				break;
-			case PACKET_INSTALL_NEW_SKIN:
-				processInstallNewSkin(data, sender, skinService);
-				break;
-			default:
-				throw new IOException("Unknown packet type " + packetId);
-			}
-		}catch(IOException ex) {
-			throw ex;
-		}catch(Throwable t) {
-			throw new IOException("Unhandled exception handling packet type " + packetId, t);
-		}
-	}
-	
-	private static void processGetOtherSkin(byte[] data, EntityPlayerMP sender, IntegratedSkinService skinService) throws IOException {
-		if(data.length != 17) {
-			throw new IOException("Invalid length " + data.length + " for skin request packet");
-		}
-		EaglercraftUUID searchUUID = bytesToUUID(data, 1);
-		skinService.processPacketGetOtherSkin(searchUUID, sender);
-	}
-	
-	private static void processGetOtherSkinByURL(byte[] data, EntityPlayerMP sender, IntegratedSkinService skinService) throws IOException {
-		if(data.length < 20) {
-			throw new IOException("Invalid length " + data.length + " for skin request packet");
-		}
-		EaglercraftUUID searchUUID = bytesToUUID(data, 1);
-		int urlLength = (data[17] << 8) | data[18];
-		if(data.length < 19 + urlLength) {
-			throw new IOException("Invalid length " + data.length + " for skin request packet with " + urlLength + " length URL");
-		}
-		skinService.processPacketGetOtherSkin(searchUUID, bytesToAscii(data, 19, urlLength), sender);
-	}
-	
-	private static void processInstallNewSkin(byte[] data, EntityPlayerMP sender, IntegratedSkinService skinService) throws IOException {
-		if(data.length < 3) {
-			throw new IOException("Invalid length " + data.length + " for skin data packet");
-		}
-		int dataLength = (data[1] << 8) | data[2];
-		byte[] dataBmp = new byte[dataLength];
-		if(data.length != dataLength + 3) {
-			throw new IOException("Invalid data length " + dataLength + " for " + data.length + " byte skin data packet");
-		}
-		System.arraycopy(data, 3, dataBmp, 0, dataLength);
-		skinService.processPacketInstallNewSkin(dataBmp, sender);
-	}
-	
-	public static void registerEaglerPlayer(EaglercraftUUID clientUUID, byte[] bs, IntegratedSkinService skinService) throws IOException {
+	public static void registerEaglerPlayer(EaglercraftUUID clientUUID, byte[] bs, IntegratedSkinService skinService,
+			int protocolVers) throws IOException {
 		if(bs.length == 0) {
 			throw new IOException("Zero-length packet recieved");
 		}
-		byte[] generatedPacket;
+		GameMessagePacket generatedPacketV3 = null;
+		GameMessagePacket generatedPacketV4 = null;
 		int skinModel = -1;
 		int packetType = (int)bs[0] & 0xFF;
 		switch(packetType) {
@@ -101,118 +41,63 @@ public class IntegratedSkinPackets {
 			if(bs.length != 5) {
 				throw new IOException("Invalid length " + bs.length + " for preset skin packet");
 			}
-			generatedPacket = makePresetResponse(clientUUID, (bs[1] << 24) | (bs[2] << 16) | (bs[3] << 8) | (bs[4] & 0xFF));
+			generatedPacketV3 = generatedPacketV4 = new SPacketOtherSkinPresetEAG(clientUUID.msb, clientUUID.lsb,
+					(bs[1] << 24) | (bs[2] << 16) | (bs[3] << 8) | (bs[4] & 0xFF));
 			break;
 		case PACKET_MY_SKIN_CUSTOM:
-			byte[] pixels = new byte[16384];
-			if(bs.length != 2 + pixels.length) {
-				throw new IOException("Invalid length " + bs.length + " for custom skin packet");
+			if(protocolVers <= 3) {
+				byte[] pixels = new byte[16384];
+				if(bs.length != 2 + pixels.length) {
+					throw new IOException("Invalid length " + bs.length + " for custom skin packet");
+				}
+				setAlphaForChestV3(pixels);
+				System.arraycopy(bs, 2, pixels, 0, pixels.length);
+				generatedPacketV3 = new SPacketOtherSkinCustomV3EAG(clientUUID.msb, clientUUID.lsb, (skinModel = (int)bs[1] & 0xFF), pixels);
+			}else {
+				byte[] pixels = new byte[12288];
+				if(bs.length != 2 + pixels.length) {
+					throw new IOException("Invalid length " + bs.length + " for custom skin packet");
+				}
+				setAlphaForChestV4(pixels);
+				System.arraycopy(bs, 2, pixels, 0, pixels.length);
+				generatedPacketV4 = new SPacketOtherSkinCustomV4EAG(clientUUID.msb, clientUUID.lsb, (skinModel = (int)bs[1] & 0xFF), pixels);
 			}
-			setAlphaForChest(pixels, (byte)255);
-			System.arraycopy(bs, 2, pixels, 0, pixels.length);
-			generatedPacket = makeCustomResponse(clientUUID, (skinModel = (int)bs[1] & 0xFF), pixels);
 			break;
 		default:
 			throw new IOException("Unknown skin packet type: " + packetType);
 		}
-		skinService.processPacketPlayerSkin(clientUUID, generatedPacket, skinModel);
+		skinService.processPacketPlayerSkin(clientUUID, new SkinPacketVersionCache(generatedPacketV3, generatedPacketV4), skinModel);
 	}
 	
 	public static void registerEaglerPlayerFallback(EaglercraftUUID clientUUID, IntegratedSkinService skinService) throws IOException {
 		int skinModel = (clientUUID.hashCode() & 1) != 0 ? 1 : 0;
-		byte[] generatedPacket = makePresetResponse(clientUUID, skinModel);
-		skinService.processPacketPlayerSkin(clientUUID, generatedPacket, skinModel);
+		skinService.processPacketPlayerSkin(clientUUID, SkinPacketVersionCache.createPreset(clientUUID.msb, clientUUID.lsb, skinModel), skinModel);
 	}
 	
-	public static void setAlphaForChest(byte[] skin64x64, byte alpha) {
+	public static void setAlphaForChestV3(byte[] skin64x64) {
 		if(skin64x64.length != 16384) {
 			throw new IllegalArgumentException("Skin is not 64x64!");
 		}
 		for(int y = 20; y < 32; ++y) {
 			for(int x = 16; x < 40; ++x) {
-				skin64x64[(y << 8) | (x << 2)] = alpha;
+				skin64x64[(y << 8) | (x << 2)] = (byte)0xFF;
 			}
 		}
 	}
 	
-	public static byte[] makePresetResponse(EaglercraftUUID uuid) {
-		return makePresetResponse(uuid, (uuid.hashCode() & 1) != 0 ? 1 : 0);
-	}
-	
-	public static byte[] makePresetResponse(EaglercraftUUID uuid, int presetId) {
-		byte[] ret = new byte[1 + 16 + 4];
-		ret[0] = (byte)PACKET_OTHER_SKIN_PRESET;
-		UUIDToBytes(uuid, ret, 1);
-		ret[17] = (byte)(presetId >>> 24);
-		ret[18] = (byte)(presetId >>> 16);
-		ret[19] = (byte)(presetId >>> 8);
-		ret[20] = (byte)(presetId & 0xFF);
-		return ret;
-	}
-	
-	public static byte[] makeCustomResponse(EaglercraftUUID uuid, int model, byte[] pixels) {
-		byte[] ret = new byte[1 + 16 + 1 + pixels.length];
-		ret[0] = (byte)PACKET_OTHER_SKIN_CUSTOM;
-		UUIDToBytes(uuid, ret, 1);
-		ret[17] = (byte)model;
-		System.arraycopy(pixels, 0, ret, 18, pixels.length);
-		return ret;
-	}
-	
-	public static EaglercraftUUID bytesToUUID(byte[] bytes, int off) {
-		long msb = (((long) bytes[off] & 0xFFl) << 56l) | (((long) bytes[off + 1] & 0xFFl) << 48l)
-				| (((long) bytes[off + 2] & 0xFFl) << 40l) | (((long) bytes[off + 3] & 0xFFl) << 32l)
-				| (((long) bytes[off + 4] & 0xFFl) << 24l) | (((long) bytes[off + 5] & 0xFFl) << 16l)
-				| (((long) bytes[off + 6] & 0xFFl) << 8l) | ((long) bytes[off + 7] & 0xFFl);
-		long lsb = (((long) bytes[off + 8] & 0xFFl) << 56l) | (((long) bytes[off + 9] & 0xFFl) << 48l)
-				| (((long) bytes[off + 10] & 0xFFl) << 40l) | (((long) bytes[off + 11] & 0xFFl) << 32l)
-				| (((long) bytes[off + 12] & 0xFFl) << 24l) | (((long) bytes[off + 13] & 0xFFl) << 16l)
-				| (((long) bytes[off + 14] & 0xFFl) << 8l) | ((long) bytes[off + 15] & 0xFFl);
-		return new EaglercraftUUID(msb, lsb);
-	}
-	
-	private static final String hex = "0123456789abcdef";
-	
-	public static String bytesToString(byte[] bytes, int off, int len) {
-		char[] ret = new char[len << 1];
-		for(int i = 0; i < len; ++i) {
-			ret[i * 2] = hex.charAt((bytes[off + i] >> 4) & 0xF);
-			ret[i * 2 + 1] = hex.charAt(bytes[off + i] & 0xF);
+	public static void setAlphaForChestV4(byte[] skin64x64) {
+		if(skin64x64.length != 12288) {
+			throw new IllegalArgumentException("Skin is not 64x64!");
 		}
-		return new String(ret);
-	}
-	
-	public static String bytesToAscii(byte[] bytes, int off, int len) {
-		char[] ret = new char[len];
-		for(int i = 0; i < len; ++i) {
-			ret[i] = (char)((int)bytes[off + i] & 0xFF);
+		for(int y = 20; y < 32; ++y) {
+			for(int x = 16; x < 40; ++x) {
+				skin64x64[((y << 6) | x) * 3] |= 0x80;
+			}
 		}
-		return new String(ret);
-	}
-
-	public static String bytesToAscii(byte[] bytes) {
-		return bytesToAscii(bytes, 0, bytes.length);
 	}
 	
-	public static void UUIDToBytes(EaglercraftUUID uuid, byte[] bytes, int off) {
-		long msb = uuid.getMostSignificantBits();
-		long lsb = uuid.getLeastSignificantBits();
-		bytes[off] = (byte)(msb >>> 56l);
-		bytes[off + 1] = (byte)(msb >>> 48l);
-		bytes[off + 2] = (byte)(msb >>> 40l);
-		bytes[off + 3] = (byte)(msb >>> 32l);
-		bytes[off + 4] = (byte)(msb >>> 24l);
-		bytes[off + 5] = (byte)(msb >>> 16l);
-		bytes[off + 6] = (byte)(msb >>> 8l);
-		bytes[off + 7] = (byte)(msb & 0xFFl);
-		bytes[off + 8] = (byte)(lsb >>> 56l);
-		bytes[off + 9] = (byte)(lsb >>> 48l);
-		bytes[off + 10] = (byte)(lsb >>> 40l);
-		bytes[off + 11] = (byte)(lsb >>> 32l);
-		bytes[off + 12] = (byte)(lsb >>> 24l);
-		bytes[off + 13] = (byte)(lsb >>> 16l);
-		bytes[off + 14] = (byte)(lsb >>> 8l);
-		bytes[off + 15] = (byte)(lsb & 0xFFl);
+	public static SPacketOtherSkinPresetEAG makePresetResponse(EaglercraftUUID uuid) {
+		return new SPacketOtherSkinPresetEAG(uuid.msb, uuid.lsb, (uuid.hashCode() & 1) != 0 ? 1 : 0);
 	}
 	
 	public static byte[] asciiString(String string) {
@@ -231,21 +116,4 @@ public class IntegratedSkinPackets {
 		return "slim".equalsIgnoreCase(modelName) ? 1 : 0;
 	}
 
-	public static byte[] rewriteUUID(EaglercraftUUID newUUID, byte[] pkt) {
-		byte[] ret = new byte[pkt.length];
-		System.arraycopy(pkt, 0, ret, 0, pkt.length);
-		UUIDToBytes(newUUID, ret, 1);
-		return ret;
-	}
-
-	public static byte[] rewriteUUIDModel(EaglercraftUUID newUUID, byte[] pkt, int model) {
-		byte[] ret = new byte[pkt.length];
-		System.arraycopy(pkt, 0, ret, 0, pkt.length);
-		UUIDToBytes(newUUID, ret, 1);
-		if(ret[0] == (byte)PACKET_OTHER_SKIN_CUSTOM) {
-			ret[17] = (byte)model;
-		}
-		return ret;
-	}
-
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java
index 5c7e7aa..e4a5601 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java
@@ -7,17 +7,19 @@ import java.util.Iterator;
 import java.util.Map;
 
 import net.lax1dude.eaglercraft.v1_8.Base64;
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.crypto.SHA1Digest;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketOtherSkinPresetEAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.util.SkinPacketVersionCache;
+import net.lax1dude.eaglercraft.v1_8.sp.server.WorldsDB;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.nbt.NBTTagCompound;
@@ -43,8 +45,6 @@ public class IntegratedSkinService {
 
 	public static final Logger logger = LogManager.getLogger("IntegratedSkinService");
 
-	public static final String CHANNEL = "EAG|Skins-1.8";
-
 	public static final byte[] skullNotFoundTexture = new byte[4096];
 
 	static {
@@ -62,8 +62,8 @@ public class IntegratedSkinService {
 
 	public final VFile2 skullsDirectory;
 
-	public final Map<EaglercraftUUID,byte[]> playerSkins = new HashMap();
-	public final Map<String,CustomSkullData> customSkulls = new HashMap();
+	public final Map<EaglercraftUUID,SkinPacketVersionCache> playerSkins = new HashMap<>();
+	public final Map<String,CustomSkullData> customSkulls = new HashMap<>();
 
 	private long lastFlush = 0l;
 
@@ -71,19 +71,9 @@ public class IntegratedSkinService {
 		this.skullsDirectory = skullsDirectory;
 	}
 
-	public void processPacket(byte[] packetData, EntityPlayerMP sender) {
+	public void processLoginPacket(byte[] packetData, EntityPlayerMP sender, int protocolVers) {
 		try {
-			IntegratedSkinPackets.processPacket(packetData, sender, this);
-		} catch (IOException e) {
-			logger.error("Invalid skin request packet recieved from player {}!", sender.getName());
-			logger.error(e);
-			sender.playerNetServerHandler.kickPlayerFromServer("Invalid skin request packet recieved!");
-		}
-	}
-
-	public void processLoginPacket(byte[] packetData, EntityPlayerMP sender) {
-		try {
-			IntegratedSkinPackets.registerEaglerPlayer(sender.getUniqueID(), packetData, this);
+			IntegratedSkinPackets.registerEaglerPlayer(sender.getUniqueID(), packetData, this, protocolVers);
 		} catch (IOException e) {
 			logger.error("Invalid skin data packet recieved from player {}!", sender.getName());
 			logger.error(e);
@@ -92,36 +82,39 @@ public class IntegratedSkinService {
 	}
 
 	public void processPacketGetOtherSkin(EaglercraftUUID searchUUID, EntityPlayerMP sender) {
-		byte[] playerSkin = playerSkins.get(searchUUID);
-		if(playerSkin == null) {
-			playerSkin = IntegratedSkinPackets.makePresetResponse(searchUUID);
+		SkinPacketVersionCache playerSkin = playerSkins.get(searchUUID);
+		GameMessagePacket toSend = null;
+		if(playerSkin != null) {
+			toSend = playerSkin.get(sender.playerNetServerHandler.getEaglerMessageProtocol());
+		}else {
+			toSend = IntegratedSkinPackets.makePresetResponse(searchUUID);
 		}
-		sender.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL, new PacketBuffer(Unpooled.buffer(playerSkin, playerSkin.length).writerIndex(playerSkin.length))));
+		sender.playerNetServerHandler.sendEaglerMessage(toSend);
 	}
 
 	public void processPacketGetOtherSkin(EaglercraftUUID searchUUID, String urlStr, EntityPlayerMP sender) {
 		urlStr = urlStr.toLowerCase();
-		byte[] playerSkin;
+		GameMessagePacket playerSkin;
 		if(!urlStr.startsWith("eagler://")) {
-			playerSkin = IntegratedSkinPackets.makePresetResponse(searchUUID, 0);
+			playerSkin = new SPacketOtherSkinPresetEAG(searchUUID.msb, searchUUID.lsb, 0);
 		}else {
 			urlStr = urlStr.substring(9);
 			if(urlStr.contains(VFile2.pathSeperator)) {
-				playerSkin = IntegratedSkinPackets.makePresetResponse(searchUUID, 0);
+				playerSkin = new SPacketOtherSkinPresetEAG(searchUUID.msb, searchUUID.lsb, 0);
 			}else {
 				CustomSkullData sk = customSkulls.get(urlStr);
 				if(sk == null) {
 					customSkulls.put(urlStr, sk = loadCustomSkull(urlStr));
 				}else {
-					sk.lastHit = System.currentTimeMillis();
+					sk.lastHit = EagRuntime.steadyTimeMillis();
 				}
-				playerSkin = IntegratedSkinPackets.makeCustomResponse(searchUUID, 0, sk.getFullSkin());
+				playerSkin = sk.getSkinPacket(searchUUID, sender.playerNetServerHandler.getEaglerMessageProtocol());
 			}
 		}
-		sender.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL, new PacketBuffer(Unpooled.buffer(playerSkin, playerSkin.length).writerIndex(playerSkin.length))));
+		sender.playerNetServerHandler.sendEaglerMessage(playerSkin);
 	}
 
-	public void processPacketPlayerSkin(EaglercraftUUID clientUUID, byte[] generatedPacket, int skinModel) {
+	public void processPacketPlayerSkin(EaglercraftUUID clientUUID, SkinPacketVersionCache generatedPacket, int skinModel) {
 		playerSkins.put(clientUUID, generatedPacket);
 	}
 
@@ -188,12 +181,12 @@ public class IntegratedSkinService {
 		}
 		String str = "skin-" + new String(hashText) + ".bmp";
 		customSkulls.put(str, new CustomSkullData(str, skullData));
-		(new VFile2(skullsDirectory, str)).setAllBytes(skullData);
+		WorldsDB.newVFile(skullsDirectory, str).setAllBytes(skullData);
 		return str;
 	}
 
 	private CustomSkullData loadCustomSkull(String urlStr) {
-		byte[] data = (new VFile2(skullsDirectory, urlStr)).getAllBytes();
+		byte[] data = WorldsDB.newVFile(skullsDirectory, urlStr).getAllBytes();
 		if(data == null) {
 			return new CustomSkullData(urlStr, skullNotFoundTexture);
 		}else {
@@ -202,7 +195,7 @@ public class IntegratedSkinService {
 	}
 
 	public void flushCache() {
-		long cur = System.currentTimeMillis();
+		long cur = EagRuntime.steadyTimeMillis();
 		if(cur - lastFlush > 300000l) {
 			lastFlush = cur;
 			Iterator<CustomSkullData> customSkullsItr = customSkulls.values().iterator();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java
index b6d7002..eee0b86 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java
@@ -56,7 +56,7 @@ public class IntegratedServerPlayerNetworkManager {
 
 	private boolean firstPacket = true;
 
-	private List<byte[]> fragmentedPacket = new ArrayList();
+	private List<byte[]> fragmentedPacket = new ArrayList<>();
 
 	public static final int fragmentSize = 0xFF00;
 	public static final int compressionThreshold = 1024;
@@ -124,8 +124,7 @@ public class IntegratedServerPlayerNetworkManager {
 							kickDAO.write(0x00);
 							kickDAO.write(msg.length());
 							for(int j = 0, l = msg.length(); j < l; ++j) {
-								kickDAO.write(0);
-								kickDAO.write(msg.codePointAt(j));
+								kickDAO.writeChar(msg.charAt(j));
 							}
 						}catch(IOException ex) {
 							throw new RuntimeException(ex);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/protocol/ServerV3MessageHandler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/protocol/ServerV3MessageHandler.java
new file mode 100755
index 0000000..98f1163
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/protocol/ServerV3MessageHandler.java
@@ -0,0 +1,90 @@
+package net.lax1dude.eaglercraft.v1_8.sp.server.socket.protocol;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.*;
+import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer;
+import net.lax1dude.eaglercraft.v1_8.sp.server.voice.IntegratedVoiceService;
+import net.minecraft.network.NetHandlerPlayServer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ServerV3MessageHandler implements GameMessageHandler {
+
+	private final NetHandlerPlayServer netHandler;
+	private final EaglerMinecraftServer server;
+
+	public ServerV3MessageHandler(NetHandlerPlayServer netHandler) {
+		this.netHandler = netHandler;
+		this.server = (EaglerMinecraftServer)netHandler.serverController;
+	}
+
+	public void handleClient(CPacketGetOtherCapeEAG packet) {
+		server.getCapeService().processGetOtherCape(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), netHandler.playerEntity);
+	}
+
+	public void handleClient(CPacketGetOtherSkinEAG packet) {
+		server.getSkinService().processPacketGetOtherSkin(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), netHandler.playerEntity);
+	}
+
+	public void handleClient(CPacketGetSkinByURLEAG packet) {
+		server.getSkinService().processPacketGetOtherSkin(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), packet.url, netHandler.playerEntity);
+	}
+
+	public void handleClient(CPacketInstallSkinSPEAG packet) {
+		server.getSkinService().processPacketInstallNewSkin(packet.customSkin, netHandler.playerEntity);
+	}
+
+	public void handleClient(CPacketVoiceSignalConnectEAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			voiceSvc.handleVoiceSignalPacketTypeConnect(netHandler.playerEntity);
+		}
+	}
+
+	public void handleClient(CPacketVoiceSignalDescEAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			voiceSvc.handleVoiceSignalPacketTypeDesc(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), packet.desc, netHandler.playerEntity);
+		}
+	}
+
+	public void handleClient(CPacketVoiceSignalDisconnectV3EAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			if(packet.isPeerType) {
+				voiceSvc.handleVoiceSignalPacketTypeDisconnectPeer(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), netHandler.playerEntity);
+			}else {
+				voiceSvc.handleVoiceSignalPacketTypeDisconnect(netHandler.playerEntity);
+			}
+		}
+	}
+
+	public void handleClient(CPacketVoiceSignalICEEAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			voiceSvc.handleVoiceSignalPacketTypeICE(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), packet.ice, netHandler.playerEntity);
+		}
+	}
+
+	public void handleClient(CPacketVoiceSignalRequestEAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			voiceSvc.handleVoiceSignalPacketTypeRequest(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), netHandler.playerEntity);
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/protocol/ServerV4MessageHandler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/protocol/ServerV4MessageHandler.java
new file mode 100755
index 0000000..d980fb4
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/protocol/ServerV4MessageHandler.java
@@ -0,0 +1,104 @@
+package net.lax1dude.eaglercraft.v1_8.sp.server.socket.protocol;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.*;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketOtherPlayerClientUUIDV4EAG;
+import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer;
+import net.lax1dude.eaglercraft.v1_8.sp.server.voice.IntegratedVoiceService;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ServerV4MessageHandler implements GameMessageHandler {
+
+	private final NetHandlerPlayServer netHandler;
+	private final EaglerMinecraftServer server;
+
+	public ServerV4MessageHandler(NetHandlerPlayServer netHandler) {
+		this.netHandler = netHandler;
+		this.server = (EaglerMinecraftServer)netHandler.serverController;
+	}
+
+	public void handleClient(CPacketGetOtherCapeEAG packet) {
+		server.getCapeService().processGetOtherCape(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), netHandler.playerEntity);
+	}
+
+	public void handleClient(CPacketGetOtherSkinEAG packet) {
+		server.getSkinService().processPacketGetOtherSkin(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), netHandler.playerEntity);
+	}
+
+	public void handleClient(CPacketGetSkinByURLEAG packet) {
+		server.getSkinService().processPacketGetOtherSkin(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), packet.url, netHandler.playerEntity);
+	}
+
+	public void handleClient(CPacketInstallSkinSPEAG packet) {
+		server.getSkinService().processPacketInstallNewSkin(packet.customSkin, netHandler.playerEntity);
+	}
+
+	public void handleClient(CPacketVoiceSignalConnectEAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			voiceSvc.handleVoiceSignalPacketTypeConnect(netHandler.playerEntity);
+		}
+	}
+
+	public void handleClient(CPacketVoiceSignalDescEAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			voiceSvc.handleVoiceSignalPacketTypeDesc(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), packet.desc, netHandler.playerEntity);
+		}
+	}
+
+	public void handleClient(CPacketVoiceSignalDisconnectV4EAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			voiceSvc.handleVoiceSignalPacketTypeDisconnect(netHandler.playerEntity);
+		}
+	}
+
+	public void handleClient(CPacketVoiceSignalDisconnectPeerV4EAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			voiceSvc.handleVoiceSignalPacketTypeDisconnectPeer(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), netHandler.playerEntity);
+		}
+	}
+
+	public void handleClient(CPacketVoiceSignalICEEAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			voiceSvc.handleVoiceSignalPacketTypeICE(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), packet.ice, netHandler.playerEntity);
+		}
+	}
+
+	public void handleClient(CPacketVoiceSignalRequestEAG packet) {
+		IntegratedVoiceService voiceSvc = server.getVoiceService();
+		if(voiceSvc != null) {
+			voiceSvc.handleVoiceSignalPacketTypeRequest(new EaglercraftUUID(packet.uuidMost, packet.uuidLeast), netHandler.playerEntity);
+		}
+	}
+
+	public void handleClient(CPacketGetOtherClientUUIDV4EAG packet) {
+		EntityPlayerMP player = server.getConfigurationManager().getPlayerByUUID(new EaglercraftUUID(packet.playerUUIDMost, packet.playerUUIDLeast));
+		if(player != null && player.clientBrandUUID != null) {
+			netHandler.sendEaglerMessage(new SPacketOtherPlayerClientUUIDV4EAG(packet.requestId, player.clientBrandUUID.msb, player.clientBrandUUID.lsb));
+		}else {
+			netHandler.sendEaglerMessage(new SPacketOtherPlayerClientUUIDV4EAG(packet.requestId, 0l, 0l));
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/voice/IntegratedVoiceService.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/voice/IntegratedVoiceService.java
index efaba81..4fed8d5 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/voice/IntegratedVoiceService.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/voice/IntegratedVoiceService.java
@@ -1,6 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.sp.server.voice;
 
-import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -10,11 +11,10 @@ import java.util.Set;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.*;
 import net.lax1dude.eaglercraft.v1_8.voice.ExpiringSet;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
 
 /**
  * Copyright (c) 2024 lax1dude. All Rights Reserved.
@@ -35,20 +35,18 @@ public class IntegratedVoiceService {
 
 	public static final Logger logger = LogManager.getLogger("IntegratedVoiceService");
 
-	public static final String CHANNEL = "EAG|Voice-1.8";
-
-	private byte[] iceServersPacket;
+	private GameMessagePacket iceServersPacket;
 
 	private final Map<EaglercraftUUID, EntityPlayerMP> voicePlayers = new HashMap<>();
 	private final Map<EaglercraftUUID, ExpiringSet<EaglercraftUUID>> voiceRequests = new HashMap<>();
 	private final Set<VoicePair> voicePairs = new HashSet<>();
 
 	public IntegratedVoiceService(String[] iceServers) {
-		iceServersPacket = IntegratedVoiceSignalPackets.makeVoiceSignalPacketAllowed(true, iceServers);
+		iceServersPacket = new SPacketVoiceSignalAllowedEAG(true, iceServers);
 	}
 
 	public void changeICEServers(String[] iceServers) {
-		iceServersPacket = IntegratedVoiceSignalPackets.makeVoiceSignalPacketAllowed(true, iceServers);
+		iceServersPacket = new SPacketVoiceSignalAllowedEAG(true, iceServers);
 	}
 
 	private static class VoicePair {
@@ -85,25 +83,14 @@ public class IntegratedVoiceService {
 	}
 
 	public void handlePlayerLoggedIn(EntityPlayerMP player) {
-		player.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL, new PacketBuffer(
-				Unpooled.buffer(iceServersPacket, iceServersPacket.length).writerIndex(iceServersPacket.length))));
+		player.playerNetServerHandler.sendEaglerMessage(iceServersPacket);
 	}
 
 	public void handlePlayerLoggedOut(EntityPlayerMP player) {
 		removeUser(player.getUniqueID());
 	}
 
-	public void processPacket(PacketBuffer packetData, EntityPlayerMP sender) {
-		try {
-			IntegratedVoiceSignalPackets.processPacket(packetData, sender, this);
-		} catch (IOException e) {
-			logger.error("Invalid voice signal packet recieved from player {}!", sender.getName());
-			logger.error(e);
-			sender.playerNetServerHandler.kickPlayerFromServer("Invalid voice signal packet recieved!");
-		}
-	}
-
-	void handleVoiceSignalPacketTypeRequest(EaglercraftUUID player, EntityPlayerMP sender) {
+	public void handleVoiceSignalPacketTypeRequest(EaglercraftUUID player, EntityPlayerMP sender) {
 		EaglercraftUUID senderUUID = sender.getUniqueID();
 		if (senderUUID.equals(player))
 			return; // prevent duplicates
@@ -134,14 +121,24 @@ public class IntegratedVoiceService {
 				voiceRequests.remove(senderUUID);
 			// send each other add data
 			voicePairs.add(newPair);
-			targetPlayerCon.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL,
-					IntegratedVoiceSignalPackets.makeVoiceSignalPacketConnect(senderUUID, false)));
-			sender.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL,
-					IntegratedVoiceSignalPackets.makeVoiceSignalPacketConnect(player, true)));
+			if(targetPlayerCon.playerNetServerHandler.getEaglerMessageProtocol().ver <= 3) {
+				targetPlayerCon.playerNetServerHandler
+						.sendEaglerMessage(new SPacketVoiceSignalConnectV3EAG(senderUUID.msb, senderUUID.lsb, false, false));
+			}else {
+				targetPlayerCon.playerNetServerHandler
+						.sendEaglerMessage(new SPacketVoiceSignalConnectV4EAG(senderUUID.msb, senderUUID.lsb, false));
+			}
+			if(sender.playerNetServerHandler.getEaglerMessageProtocol().ver <= 3) {
+				sender.playerNetServerHandler
+						.sendEaglerMessage(new SPacketVoiceSignalConnectV3EAG(player.msb, player.lsb, false, true));
+			}else {
+				sender.playerNetServerHandler
+						.sendEaglerMessage(new SPacketVoiceSignalConnectV4EAG(player.msb, player.lsb, true));
+			}
 		}
 	}
 
-	void handleVoiceSignalPacketTypeConnect(EntityPlayerMP sender) {
+	public void handleVoiceSignalPacketTypeConnect(EntityPlayerMP sender) {
 		if (voicePlayers.containsKey(sender.getUniqueID())) {
 			return;
 		}
@@ -150,63 +147,60 @@ public class IntegratedVoiceService {
 		if (hasNoOtherPlayers) {
 			return;
 		}
-		byte[] packetToBroadcast = IntegratedVoiceSignalPackets.makeVoiceSignalPacketGlobal(voicePlayers.values());
+		Collection<SPacketVoiceSignalGlobalEAG.UserData> userDatas = new ArrayList<>(voicePlayers.size());
+		for(EntityPlayerMP player : voicePlayers.values()) {
+			EaglercraftUUID uuid = player.getUniqueID();
+			userDatas.add(new SPacketVoiceSignalGlobalEAG.UserData(uuid.msb, uuid.lsb, player.getName()));
+		}
+		SPacketVoiceSignalGlobalEAG packetToBroadcast = new SPacketVoiceSignalGlobalEAG(userDatas);
 		for (EntityPlayerMP userCon : voicePlayers.values()) {
-			userCon.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL, new PacketBuffer(Unpooled
-					.buffer(packetToBroadcast, packetToBroadcast.length).writerIndex(packetToBroadcast.length))));
+			userCon.playerNetServerHandler.sendEaglerMessage(packetToBroadcast);
 		}
 	}
 
-	void handleVoiceSignalPacketTypeICE(EaglercraftUUID player, String str, EntityPlayerMP sender) {
-		VoicePair pair = new VoicePair(player, sender.getUniqueID());
+	public void handleVoiceSignalPacketTypeICE(EaglercraftUUID player, byte[] str, EntityPlayerMP sender) {
+		EaglercraftUUID uuid = sender.getUniqueID();
+		VoicePair pair = new VoicePair(player, uuid);
 		EntityPlayerMP pass = voicePairs.contains(pair) ? voicePlayers.get(player) : null;
 		if (pass != null) {
-			pass.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL,
-					IntegratedVoiceSignalPackets.makeVoiceSignalPacketICE(sender.getUniqueID(), str)));
+			pass.playerNetServerHandler.sendEaglerMessage(new SPacketVoiceSignalICEEAG(uuid.msb, uuid.lsb, str));
 		}
 	}
 
-	void handleVoiceSignalPacketTypeDesc(EaglercraftUUID player, String str, EntityPlayerMP sender) {
-		VoicePair pair = new VoicePair(player, sender.getUniqueID());
+	public void handleVoiceSignalPacketTypeDesc(EaglercraftUUID player, byte[] str, EntityPlayerMP sender) {
+		EaglercraftUUID uuid = sender.getUniqueID();
+		VoicePair pair = new VoicePair(player, uuid);
 		EntityPlayerMP pass = voicePairs.contains(pair) ? voicePlayers.get(player) : null;
 		if (pass != null) {
-			pass.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL,
-					IntegratedVoiceSignalPackets.makeVoiceSignalPacketDesc(sender.getUniqueID(), str)));
+			pass.playerNetServerHandler.sendEaglerMessage(new SPacketVoiceSignalDescEAG(uuid.msb, uuid.lsb, str));
 		}
 	}
 
-	void handleVoiceSignalPacketTypeDisconnect(EaglercraftUUID player, EntityPlayerMP sender) {
-		if (player != null) {
-			if (!voicePlayers.containsKey(player)) {
-				return;
+	public void handleVoiceSignalPacketTypeDisconnect(EntityPlayerMP sender) {
+		removeUser(sender.getUniqueID());
+	}
+
+	public void handleVoiceSignalPacketTypeDisconnectPeer(EaglercraftUUID player, EntityPlayerMP sender) {
+		if (!voicePlayers.containsKey(player)) {
+			return;
+		}
+		Iterator<VoicePair> pairsItr = voicePairs.iterator();
+		while (pairsItr.hasNext()) {
+			VoicePair voicePair = pairsItr.next();
+			EaglercraftUUID target = null;
+			if (voicePair.uuid1.equals(player)) {
+				target = voicePair.uuid2;
+			} else if (voicePair.uuid2.equals(player)) {
+				target = voicePair.uuid1;
 			}
-			byte[] userDisconnectPacket = null;
-			Iterator<VoicePair> pairsItr = voicePairs.iterator();
-			while (pairsItr.hasNext()) {
-				VoicePair voicePair = pairsItr.next();
-				EaglercraftUUID target = null;
-				if (voicePair.uuid1.equals(player)) {
-					target = voicePair.uuid2;
-				} else if (voicePair.uuid2.equals(player)) {
-					target = voicePair.uuid1;
-				}
-				if (target != null) {
-					pairsItr.remove();
-					EntityPlayerMP conn = voicePlayers.get(target);
-					if (conn != null) {
-						if (userDisconnectPacket == null) {
-							userDisconnectPacket = IntegratedVoiceSignalPackets.makeVoiceSignalPacketDisconnect(player);
-						}
-						conn.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL,
-								new PacketBuffer(Unpooled.buffer(userDisconnectPacket, userDisconnectPacket.length)
-										.writerIndex(userDisconnectPacket.length))));
-					}
-					sender.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL,
-							IntegratedVoiceSignalPackets.makeVoiceSignalPacketDisconnectPB(target)));
+			if (target != null) {
+				pairsItr.remove();
+				EntityPlayerMP conn = voicePlayers.get(target);
+				if (conn != null) {
+					conn.playerNetServerHandler.sendEaglerMessage(new SPacketVoiceSignalDisconnectPeerEAG(player.msb, player.lsb));
 				}
+				sender.playerNetServerHandler.sendEaglerMessage(new SPacketVoiceSignalDisconnectPeerEAG(target.msb, target.lsb));
 			}
-		} else {
-			removeUser(sender.getUniqueID());
 		}
 	}
 
@@ -216,16 +210,16 @@ public class IntegratedVoiceService {
 		}
 		voiceRequests.remove(user);
 		if (voicePlayers.size() > 0) {
-			byte[] voicePlayersPkt = IntegratedVoiceSignalPackets.makeVoiceSignalPacketGlobal(voicePlayers.values());
+			Collection<SPacketVoiceSignalGlobalEAG.UserData> userDatas = new ArrayList<>(voicePlayers.size());
+			for(EntityPlayerMP player : voicePlayers.values()) {
+				EaglercraftUUID uuid = player.getUniqueID();
+				userDatas.add(new SPacketVoiceSignalGlobalEAG.UserData(uuid.msb, uuid.lsb, player.getName()));
+			}
+			SPacketVoiceSignalGlobalEAG packetToBroadcast = new SPacketVoiceSignalGlobalEAG(userDatas);
 			for (EntityPlayerMP userCon : voicePlayers.values()) {
-				if (!user.equals(userCon.getUniqueID())) {
-					userCon.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL,
-							new PacketBuffer(Unpooled.buffer(voicePlayersPkt, voicePlayersPkt.length)
-									.writerIndex(voicePlayersPkt.length))));
-				}
+				userCon.playerNetServerHandler.sendEaglerMessage(packetToBroadcast);
 			}
 		}
-		byte[] userDisconnectPacket = null;
 		Iterator<VoicePair> pairsItr = voicePairs.iterator();
 		while (pairsItr.hasNext()) {
 			VoicePair voicePair = pairsItr.next();
@@ -240,12 +234,7 @@ public class IntegratedVoiceService {
 				if (voicePlayers.size() > 0) {
 					EntityPlayerMP conn = voicePlayers.get(target);
 					if (conn != null) {
-						if (userDisconnectPacket == null) {
-							userDisconnectPacket = IntegratedVoiceSignalPackets.makeVoiceSignalPacketDisconnect(user);
-						}
-						conn.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL,
-								new PacketBuffer(Unpooled.buffer(userDisconnectPacket, userDisconnectPacket.length)
-										.writerIndex(userDisconnectPacket.length))));
+						conn.playerNetServerHandler.sendEaglerMessage(new SPacketVoiceSignalDisconnectPeerEAG(user.msb, user.lsb));
 					}
 				}
 			}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/voice/IntegratedVoiceSignalPackets.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/voice/IntegratedVoiceSignalPackets.java
deleted file mode 100755
index a45f5b6..0000000
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/voice/IntegratedVoiceSignalPackets.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.sp.server.voice;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-
-import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
-import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
-import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.PacketBuffer;
-
-/**
- * Copyright (c) 2024 lax1dude. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class IntegratedVoiceSignalPackets {
-
-	static final int VOICE_SIGNAL_ALLOWED = 0;
-	static final int VOICE_SIGNAL_REQUEST = 0;
-	static final int VOICE_SIGNAL_CONNECT = 1;
-	static final int VOICE_SIGNAL_DISCONNECT = 2;
-	static final int VOICE_SIGNAL_ICE = 3;
-	static final int VOICE_SIGNAL_DESC = 4;
-	static final int VOICE_SIGNAL_GLOBAL = 5;
-
-	public static void processPacket(PacketBuffer buffer, EntityPlayerMP sender, IntegratedVoiceService voiceService) throws IOException {
-		int packetId = -1;
-		if(buffer.readableBytes() == 0) {
-			throw new IOException("Zero-length packet recieved");
-		}
-		try {
-			packetId = buffer.readUnsignedByte();
-			switch(packetId) {
-				case VOICE_SIGNAL_REQUEST: {
-					voiceService.handleVoiceSignalPacketTypeRequest(buffer.readUuid(), sender);
-					break;
-				}
-				case VOICE_SIGNAL_CONNECT: {
-					voiceService.handleVoiceSignalPacketTypeConnect(sender);
-					break;
-				}
-				case VOICE_SIGNAL_ICE: {
-					voiceService.handleVoiceSignalPacketTypeICE(buffer.readUuid(), buffer.readStringFromBuffer(32767), sender);
-					break;
-				}
-				case VOICE_SIGNAL_DESC: {
-					voiceService.handleVoiceSignalPacketTypeDesc(buffer.readUuid(), buffer.readStringFromBuffer(32767), sender);
-					break;
-				}
-				case VOICE_SIGNAL_DISCONNECT: {
-					voiceService.handleVoiceSignalPacketTypeDisconnect(buffer.readableBytes() > 0 ? buffer.readUuid() : null, sender);
-					break;
-				}
-				default: {
-					throw new IOException("Unknown packet type " + packetId);
-				}
-			}
-			if(buffer.readableBytes() > 0) {
-				throw new IOException("Voice packet is too long!");
-			}
-		}catch(IOException ex) {
-			throw ex;
-		}catch(Throwable t) {
-			throw new IOException("Unhandled exception handling voice packet type " + packetId, t);
-		}
-	}
-
-	static byte[] makeVoiceSignalPacketAllowed(boolean allowed, String[] iceServers) {
-		if (iceServers == null) {
-			byte[] ret = new byte[2];
-			ByteBuf wrappedBuffer = Unpooled.buffer(ret, ret.length);
-			wrappedBuffer.writeByte(VOICE_SIGNAL_ALLOWED);
-			wrappedBuffer.writeBoolean(allowed);
-			return ret;
-		}
-		byte[][] iceServersBytes = new byte[iceServers.length][];
-		int totalLen = 2 + PacketBuffer.getVarIntSize(iceServers.length);
-		for(int i = 0; i < iceServers.length; ++i) {
-			byte[] b = iceServersBytes[i] = iceServers[i].getBytes(StandardCharsets.UTF_8);
-			totalLen += PacketBuffer.getVarIntSize(b.length) + b.length;
-		}
-		byte[] ret = new byte[totalLen];
-		PacketBuffer wrappedBuffer = new PacketBuffer(Unpooled.buffer(ret, ret.length));
-		wrappedBuffer.writeByte(VOICE_SIGNAL_ALLOWED);
-		wrappedBuffer.writeBoolean(allowed);
-		wrappedBuffer.writeVarIntToBuffer(iceServersBytes.length);
-		for(int i = 0; i < iceServersBytes.length; ++i) {
-			byte[] b = iceServersBytes[i];
-			wrappedBuffer.writeVarIntToBuffer(b.length);
-			wrappedBuffer.writeBytes(b);
-		}
-		return ret;
-	}
-
-	static byte[] makeVoiceSignalPacketGlobal(Collection<EntityPlayerMP> users) {
-		int cnt = users.size();
-		byte[][] displayNames = new byte[cnt][];
-		int i = 0;
-		for(EntityPlayerMP user : users) {
-			String name = user.getName();
-			if(name.length() > 16) name = name.substring(0, 16);
-			displayNames[i++] = name.getBytes(StandardCharsets.UTF_8);
-		}
-		int totalLength = 1 + PacketBuffer.getVarIntSize(cnt) + (cnt << 4);
-		for(i = 0; i < cnt; ++i) {
-			totalLength += PacketBuffer.getVarIntSize(displayNames[i].length) + displayNames[i].length;
-		}
-		byte[] ret = new byte[totalLength];
-		PacketBuffer wrappedBuffer = new PacketBuffer(Unpooled.buffer(ret, ret.length));
-		wrappedBuffer.writeByte(VOICE_SIGNAL_GLOBAL);
-		wrappedBuffer.writeVarIntToBuffer(cnt);
-		for(EntityPlayerMP user : users) {
-			wrappedBuffer.writeUuid(user.getUniqueID());
-		}
-		for(i = 0; i < cnt; ++i) {
-			wrappedBuffer.writeVarIntToBuffer(displayNames[i].length);
-			wrappedBuffer.writeBytes(displayNames[i]);
-		}
-		return ret;
-	}
-
-	static PacketBuffer makeVoiceSignalPacketConnect(EaglercraftUUID player, boolean offer) {
-		byte[] ret = new byte[18];
-		PacketBuffer wrappedBuffer = new PacketBuffer(Unpooled.buffer(ret, ret.length));
-		wrappedBuffer.writeByte(VOICE_SIGNAL_CONNECT);
-		wrappedBuffer.writeUuid(player);
-		wrappedBuffer.writeBoolean(offer);
-		return wrappedBuffer;
-	}
-
-	static byte[] makeVoiceSignalPacketConnectAnnounce(EaglercraftUUID player) {
-		byte[] ret = new byte[17];
-		PacketBuffer wrappedBuffer = new PacketBuffer(Unpooled.buffer(ret, ret.length));
-		wrappedBuffer.writeByte(VOICE_SIGNAL_CONNECT);
-		wrappedBuffer.writeUuid(player);
-		return ret;
-	}
-
-	static byte[] makeVoiceSignalPacketDisconnect(EaglercraftUUID player) {
-		if(player == null) {
-			return new byte[] { (byte)VOICE_SIGNAL_DISCONNECT };
-		}
-		byte[] ret = new byte[17];
-		PacketBuffer wrappedBuffer = new PacketBuffer(Unpooled.buffer(ret, ret.length));
-		wrappedBuffer.writeByte(VOICE_SIGNAL_DISCONNECT);
-		wrappedBuffer.writeUuid(player);
-		return ret;
-	}
-
-	static PacketBuffer makeVoiceSignalPacketDisconnectPB(EaglercraftUUID player) {
-		if(player == null) {
-			byte[] ret = new byte[1];
-			PacketBuffer wrappedBuffer = new PacketBuffer(Unpooled.buffer(ret, ret.length));
-			wrappedBuffer.writeByte(VOICE_SIGNAL_DISCONNECT);
-			return wrappedBuffer;
-		}
-		byte[] ret = new byte[17];
-		PacketBuffer wrappedBuffer = new PacketBuffer(Unpooled.buffer(ret, ret.length));
-		wrappedBuffer.writeByte(VOICE_SIGNAL_DISCONNECT);
-		wrappedBuffer.writeUuid(player);
-		return wrappedBuffer;
-	}
-
-	static PacketBuffer makeVoiceSignalPacketICE(EaglercraftUUID player, String str) {
-		byte[] strBytes = str.getBytes(StandardCharsets.UTF_8);
-		byte[] ret = new byte[17 + PacketBuffer.getVarIntSize(strBytes.length) + strBytes.length];
-		PacketBuffer wrappedBuffer = new PacketBuffer(Unpooled.buffer(ret, ret.length));
-		wrappedBuffer.writeByte(VOICE_SIGNAL_ICE);
-		wrappedBuffer.writeUuid(player);
-		wrappedBuffer.writeVarIntToBuffer(strBytes.length);
-		wrappedBuffer.writeBytes(strBytes);
-		return wrappedBuffer;
-	}
-
-	static PacketBuffer makeVoiceSignalPacketDesc(EaglercraftUUID player, String str) {
-		byte[] strBytes = str.getBytes(StandardCharsets.UTF_8);
-		byte[] ret = new byte[17 + PacketBuffer.getVarIntSize(strBytes.length) + strBytes.length];
-		PacketBuffer wrappedBuffer = new PacketBuffer(Unpooled.buffer(ret, ret.length));
-		wrappedBuffer.writeByte(VOICE_SIGNAL_DESC);
-		wrappedBuffer.writeUuid(player);
-		wrappedBuffer.writeVarIntToBuffer(strBytes.length);
-		wrappedBuffer.writeBytes(strBytes);
-		return wrappedBuffer;
-	}
-
-}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/NetHandlerSingleplayerLogin.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/NetHandlerSingleplayerLogin.java
index 0bde8e8..b99bae1 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/NetHandlerSingleplayerLogin.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/NetHandlerSingleplayerLogin.java
@@ -1,7 +1,12 @@
 package net.lax1dude.eaglercraft.v1_8.sp.socket;
 
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
 import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageConstants;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageProtocol;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.client.GameProtocolMessageController;
 import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiDisconnected;
@@ -15,6 +20,7 @@ import net.minecraft.network.login.server.S01PacketEncryptionRequest;
 import net.minecraft.network.login.server.S02PacketLoginSuccess;
 import net.minecraft.network.login.server.S03PacketEnableCompression;
 import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.IChatComponent;
 
 /**
@@ -38,6 +44,8 @@ public class NetHandlerSingleplayerLogin implements INetHandlerLoginClient {
 	private final GuiScreen previousGuiScreen;
 	private final EaglercraftNetworkManager networkManager;
 
+	private static final Logger logger = LogManager.getLogger("NetHandlerSingleplayerLogin");
+
 	public NetHandlerSingleplayerLogin(EaglercraftNetworkManager parNetworkManager, Minecraft mcIn, GuiScreen parGuiScreen) {
 		this.networkManager = parNetworkManager;
 		this.mc = mcIn;
@@ -57,7 +65,19 @@ public class NetHandlerSingleplayerLogin implements INetHandlerLoginClient {
 	@Override
 	public void handleLoginSuccess(S02PacketLoginSuccess var1) {
 		this.networkManager.setConnectionState(EnumConnectionState.PLAY);
-		this.networkManager.setNetHandler(new NetHandlerPlayClient(this.mc, this.previousGuiScreen, this.networkManager, var1.getProfile()));
+		int p = var1.getSelectedProtocol();
+		GamePluginMessageProtocol mp = GamePluginMessageProtocol.getByVersion(p);
+		if(mp == null) {
+			this.networkManager.closeChannel(new ChatComponentText("Unknown protocol selected: " + p));
+			return;
+		}
+		logger.info("Server is using protocol: {}", p);
+		NetHandlerPlayClient netHandler = new NetHandlerPlayClient(this.mc, this.previousGuiScreen, this.networkManager, var1.getProfile());
+		netHandler.setEaglerMessageController(
+				new GameProtocolMessageController(mp, GamePluginMessageConstants.CLIENT_TO_SERVER,
+						GameProtocolMessageController.createClientHandler(p, netHandler),
+						(ch, msg) -> netHandler.addToSendQueue(new C17PacketCustomPayload(ch, msg))));
+		this.networkManager.setNetHandler(netHandler);
 		byte[] b = UpdateService.getClientSignatureData();
 		if(b != null) {
 			this.networkManager.sendPacket(new C17PacketCustomPayload("EAG|MyUpdCert-1.8", new PacketBuffer(Unpooled.buffer(b, b.length).writerIndex(b.length))));
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/EnumTouchControl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/EnumTouchControl.java
new file mode 100755
index 0000000..5f4b751
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/EnumTouchControl.java
@@ -0,0 +1,579 @@
+package net.lax1dude.eaglercraft.v1_8.touch_gui;
+
+import net.lax1dude.eaglercraft.v1_8.Touch;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiChat;
+import net.minecraft.client.gui.GuiMainMenu;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.settings.GameSettings;
+
+/**
+ * Copyright (c) 2024 lax1dude, ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumTouchControl {
+	
+	DPAD_UP(EnumTouchControlPos.BOTTOM_LEFT, 60, 109, 44, null, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 56, 0, 22, 22, 2);
+	}),
+	
+	
+	DPAD_LEFT(EnumTouchControlPos.BOTTOM_LEFT, 11, 60, 44, null, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 56, 22, 22, 22, 2);
+	}),
+	
+	
+	DPAD_RIGHT(EnumTouchControlPos.BOTTOM_LEFT, 109, 60, 44, null, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 56, 66, 22, 22, 2);
+	}),
+	
+	
+	DPAD_DOWN(EnumTouchControlPos.BOTTOM_LEFT, 60, 11, 44, null, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 56, 44, 22, 22, 2);
+	}),
+	
+	
+	DPAD_UP_LEFT(EnumTouchControlPos.BOTTOM_LEFT, 16, 112, 36, null, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 18, 0, 18, 18, 2);
+	}),
+	
+	
+	DPAD_UP_RIGHT(EnumTouchControlPos.BOTTOM_LEFT, 112, 112, 36, null, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 18, 18, 18, 18, 2);
+	}),
+	
+	
+	JUMP(EnumTouchControlPos.BOTTOM_RIGHT, 64, 64, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			if(TouchControls.isSneakToggled) {
+				TouchControls.resetSneakInvalidate();
+			}
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 18, 90, 18, 18, 2);
+	}),
+	
+	
+	SNEAK(EnumTouchControlPos.BOTTOM_LEFT, 64, 64, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			enumIn.invalid = true;
+			TouchControls.isSneakToggled = !TouchControls.isSneakToggled;
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 18, TouchControls.isSneakToggled ? 126 : 108, 18, 18, 2);
+	}),
+	
+	
+	BACK(EnumTouchControlPos.TOP, -18, 0, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			if(Touch.isDeviceKeyboardOpenMAYBE()) {
+				Touch.closeDeviceKeyboard();
+			}else {
+				Minecraft mc = Minecraft.getMinecraft();
+				if(mc.thePlayer != null) {
+					mc.setIngameFocus();
+				}else if(mc.currentScreen != null && !(mc.currentScreen instanceof GuiMainMenu)) {
+					mc.displayGuiScreen(null);
+				}
+			}
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 0, 36, 18, 18, 2);
+	}),
+	
+	
+	BACK_DISABLED(EnumTouchControlPos.TOP, -18, 0, 36, null, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 0, 54, 18, 18, 2);
+	}),
+	
+	
+	KEYBOARD(EnumTouchControlPos.TOP, 18, 0, 36, null, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 0, 72, 18, 18, 2);
+	}),
+	
+	
+	PAUSE(EnumTouchControlPos.TOP, -18, 0, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			Minecraft mc = Minecraft.getMinecraft();
+			mc.displayInGameMenu();
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 0, 0, 18, 18, 2);
+	}),
+	
+	
+	CHAT(EnumTouchControlPos.TOP, 18, 0, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			Minecraft mc = Minecraft.getMinecraft();
+			mc.displayGuiScreen(new GuiChat());
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 0, 18, 18, 18, 2);
+	}),
+	
+	
+	F3(EnumTouchControlPos.TOP, 144, 0, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			Minecraft mc = Minecraft.getMinecraft();
+			GameSettings gameSettings = mc.gameSettings;
+			gameSettings.showDebugInfo = !gameSettings.showDebugInfo;
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 218, 220, 18, 18, 2);
+	}),
+	
+	
+	F5(EnumTouchControlPos.TOP, 90, 0, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			Minecraft mc = Minecraft.getMinecraft();
+			mc.togglePerspective();
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 218, 184, 18, 18, 2);
+	}),
+	
+	
+	PASTE(EnumTouchControlPos.TOP, 144, 0, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			GuiScreen screen = Minecraft.getMinecraft().currentScreen;
+			if(screen != null) {
+				screen.fireInputEvent(EnumInputEvent.CLIPBOARD_PASTE, null);
+			}
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 218, 148, 18, 18, 2);
+	}),
+	
+	
+	COPY(EnumTouchControlPos.TOP, 90, 0, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			GuiScreen screen = Minecraft.getMinecraft().currentScreen;
+			if(screen != null) {
+				screen.fireInputEvent(EnumInputEvent.CLIPBOARD_COPY, null);
+			}
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 218, 166, 18, 18, 2);
+	}),
+	
+	
+	PICK(EnumTouchControlPos.BOTTOM_RIGHT, 62, 125, 40, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			Minecraft.getMinecraft().middleClickMouse();
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 36, 20, 20, 20, 2);
+	}),
+	
+	
+	FLY(EnumTouchControlPos.BOTTOM_LEFT, 16, 16, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			TouchControls.resetSneak();
+			EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
+			player.jump();
+			player.capabilities.isFlying = true;
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 18, 72, 18, 18, 2);
+	}),
+	
+	
+	FLY_UP(EnumTouchControlPos.BOTTOM_RIGHT, 12, 120, 36, null, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 18, 36, 18, 18, 2);
+	}),
+	
+	
+	FLY_DOWN(EnumTouchControlPos.BOTTOM_RIGHT, 12, 75, 36, null, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 18, 54, 18, 18, 2);
+	}),
+	
+	
+	FLY_END(EnumTouchControlPos.BOTTOM_RIGHT, 64, 64, 36, (enumIn, x, y) -> {
+		if(!TouchControls.isPressed(enumIn)) {
+			Minecraft.getMinecraft().thePlayer.capabilities.isFlying = false;
+		}
+	}, (enumIn, x, y, pressed, mc, res) -> {
+		mc.getTextureManager().bindTexture(TouchOverlayRenderer.spriteSheet);
+		int[] pos = enumIn.getLocation(res, TouchOverlayRenderer._fuck);
+		TouchOverlayRenderer.drawTexturedModalRect(pos[0], pos[1], 18, 72, 18, 18, 2);
+	});
+
+	public static interface TouchAction {
+		void call(EnumTouchControl enumIn, int x, int y);
+	}
+
+	public static interface TouchRender {
+		void call(EnumTouchControl enumIn, int x, int y, boolean pressed, Minecraft mc, ScaledResolution res);
+	}
+
+	protected final EnumTouchControlPos pos;
+	protected final int offX;
+	protected final int offY;
+	protected final int size;
+	protected final TouchAction action;
+	protected final TouchRender render;
+
+	protected boolean visible = true;
+	protected boolean invalid = true;
+	
+	public static final EnumTouchControl[] _VALUES = values();
+
+	EnumTouchControl(EnumTouchControlPos pos, int offX, int offY, int size, TouchAction action, TouchRender render) {
+		this.pos = pos;
+		this.offX = offX;
+		this.offY = offY;
+		this.size = size;
+		this.action = action;
+		this.render = render;
+	}
+
+	public int[] getLocation(ScaledResolution scaledResolution, int[] loc) {
+		if(loc == null) {
+			loc = new int[2];
+		}
+		int sz = size;
+		switch (pos) {
+			case TOP_LEFT:
+				loc[0] = offX;
+				loc[1] = offY;
+				break;
+			case TOP:
+				loc[0] = offX + (scaledResolution.getScaledWidth() - sz) / 2;
+				loc[1] = offY;
+				break;
+			case TOP_RIGHT:
+				loc[0] = -offX + (scaledResolution.getScaledWidth() - sz);
+				loc[1] = offY;
+				break;
+			case LEFT:
+				loc[0] = offX;
+				loc[1] = offY + (scaledResolution.getScaledHeight() - sz) / 2;
+				break;
+			case RIGHT:
+				loc[0] = -offX + (scaledResolution.getScaledWidth() - sz);
+				loc[1] = offY + (scaledResolution.getScaledHeight() - sz) / 2;
+				break;
+			case BOTTOM_LEFT:
+				loc[0] = offX;
+				loc[1] = -offY + (scaledResolution.getScaledHeight() - sz);
+				break;
+			case BOTTOM:
+				loc[0] = offX + (scaledResolution.getScaledWidth() - sz) / 2;
+				loc[1] = -offY + (scaledResolution.getScaledHeight() - sz);
+				break;
+			case BOTTOM_RIGHT:
+				loc[0] = -offX + (scaledResolution.getScaledWidth() - sz);
+				loc[1] = -offY + (scaledResolution.getScaledHeight() - sz);
+				break;
+		}
+		return loc;
+	}
+
+	public void setVisible(TouchOverlayRenderer renderer, boolean vis) {
+		if(visible != vis) {
+			visible = vis;
+			invalid = true;
+			if(vis) {
+				renderer.invalidate();
+			}else {
+				renderer.invalidateDeep();
+			}
+		}
+	}
+
+	public int getSize() {
+		return size;
+	}
+
+	public TouchAction getAction() {
+		return action;
+	}
+
+	public TouchRender getRender() {
+		return render;
+	}
+
+	protected static EnumTouchLayoutState currentLayout = null;
+
+	public static void setLayoutState(TouchOverlayRenderer renderer, EnumTouchLayoutState layout) {
+		if(layout == currentLayout) return;
+		switch(layout) {
+		case IN_GUI:
+			DPAD_UP.setVisible(renderer, false);
+			DPAD_LEFT.setVisible(renderer, false);
+			DPAD_RIGHT.setVisible(renderer, false);
+			DPAD_DOWN.setVisible(renderer, false);
+			DPAD_UP_LEFT.setVisible(renderer, false);
+			DPAD_UP_RIGHT.setVisible(renderer, false);
+			JUMP.setVisible(renderer, false);
+			SNEAK.setVisible(renderer, false);
+			BACK.setVisible(renderer, true);
+			BACK_DISABLED.setVisible(renderer, false);
+			KEYBOARD.setVisible(renderer, true);
+			PAUSE.setVisible(renderer, false);
+			CHAT.setVisible(renderer, false);
+			F3.setVisible(renderer, false);
+			F5.setVisible(renderer, false);
+			PASTE.setVisible(renderer, false);
+			COPY.setVisible(renderer, false);
+			PICK.setVisible(renderer, false);
+			FLY.setVisible(renderer, false);
+			FLY_UP.setVisible(renderer, false);
+			FLY_DOWN.setVisible(renderer, false);
+			FLY_END.setVisible(renderer, false);
+			break;
+		case IN_GUI_TYPING:
+			DPAD_UP.setVisible(renderer, false);
+			DPAD_LEFT.setVisible(renderer, false);
+			DPAD_RIGHT.setVisible(renderer, false);
+			DPAD_DOWN.setVisible(renderer, false);
+			DPAD_UP_LEFT.setVisible(renderer, false);
+			DPAD_UP_RIGHT.setVisible(renderer, false);
+			JUMP.setVisible(renderer, false);
+			SNEAK.setVisible(renderer, false);
+			BACK.setVisible(renderer, true);
+			BACK_DISABLED.setVisible(renderer, false);
+			KEYBOARD.setVisible(renderer, true);
+			PAUSE.setVisible(renderer, false);
+			CHAT.setVisible(renderer, false);
+			F3.setVisible(renderer, false);
+			F5.setVisible(renderer, false);
+			PASTE.setVisible(renderer, true);
+			COPY.setVisible(renderer, true);
+			PICK.setVisible(renderer, false);
+			FLY.setVisible(renderer, false);
+			FLY_UP.setVisible(renderer, false);
+			FLY_DOWN.setVisible(renderer, false);
+			FLY_END.setVisible(renderer, false);
+			break;
+		case IN_GUI_NO_BACK:
+			DPAD_UP.setVisible(renderer, false);
+			DPAD_LEFT.setVisible(renderer, false);
+			DPAD_RIGHT.setVisible(renderer, false);
+			DPAD_DOWN.setVisible(renderer, false);
+			DPAD_UP_LEFT.setVisible(renderer, false);
+			DPAD_UP_RIGHT.setVisible(renderer, false);
+			JUMP.setVisible(renderer, false);
+			SNEAK.setVisible(renderer, false);
+			BACK.setVisible(renderer, false);
+			BACK_DISABLED.setVisible(renderer, true);
+			KEYBOARD.setVisible(renderer, true);
+			PAUSE.setVisible(renderer, false);
+			CHAT.setVisible(renderer, false);
+			F3.setVisible(renderer, false);
+			F5.setVisible(renderer, false);
+			PASTE.setVisible(renderer, false);
+			COPY.setVisible(renderer, false);
+			PICK.setVisible(renderer, false);
+			FLY.setVisible(renderer, false);
+			FLY_UP.setVisible(renderer, false);
+			FLY_DOWN.setVisible(renderer, false);
+			FLY_END.setVisible(renderer, false);
+			break;
+		case IN_GAME:
+			DPAD_UP.setVisible(renderer, true);
+			DPAD_LEFT.setVisible(renderer, true);
+			DPAD_RIGHT.setVisible(renderer, true);
+			DPAD_DOWN.setVisible(renderer, true);
+			DPAD_UP_LEFT.setVisible(renderer, false);
+			DPAD_UP_RIGHT.setVisible(renderer, false);
+			JUMP.setVisible(renderer, true);
+			SNEAK.setVisible(renderer, true);
+			BACK.setVisible(renderer, false);
+			BACK_DISABLED.setVisible(renderer, false);
+			KEYBOARD.setVisible(renderer, false);
+			PAUSE.setVisible(renderer, true);
+			CHAT.setVisible(renderer, true);
+			F3.setVisible(renderer, true);
+			F5.setVisible(renderer, true);
+			PASTE.setVisible(renderer, false);
+			COPY.setVisible(renderer, false);
+			PICK.setVisible(renderer, true);
+			FLY.setVisible(renderer, false);
+			FLY_UP.setVisible(renderer, false);
+			FLY_DOWN.setVisible(renderer, false);
+			FLY_END.setVisible(renderer, false);
+			break;
+		case IN_GAME_WALK:
+			DPAD_UP.setVisible(renderer, true);
+			DPAD_LEFT.setVisible(renderer, true);
+			DPAD_RIGHT.setVisible(renderer, true);
+			DPAD_DOWN.setVisible(renderer, true);
+			DPAD_UP_LEFT.setVisible(renderer, true);
+			DPAD_UP_RIGHT.setVisible(renderer, true);
+			JUMP.setVisible(renderer, true);
+			SNEAK.setVisible(renderer, true);
+			BACK.setVisible(renderer, false);
+			BACK_DISABLED.setVisible(renderer, false);
+			KEYBOARD.setVisible(renderer, false);
+			PAUSE.setVisible(renderer, true);
+			CHAT.setVisible(renderer, true);
+			F3.setVisible(renderer, true);
+			F5.setVisible(renderer, true);
+			PASTE.setVisible(renderer, false);
+			COPY.setVisible(renderer, false);
+			PICK.setVisible(renderer, true);
+			FLY.setVisible(renderer, false);
+			FLY_UP.setVisible(renderer, false);
+			FLY_DOWN.setVisible(renderer, false);
+			FLY_END.setVisible(renderer, false);
+			break;
+		case IN_GAME_CAN_FLY:
+			DPAD_UP.setVisible(renderer, true);
+			DPAD_LEFT.setVisible(renderer, true);
+			DPAD_RIGHT.setVisible(renderer, true);
+			DPAD_DOWN.setVisible(renderer, true);
+			DPAD_UP_LEFT.setVisible(renderer, false);
+			DPAD_UP_RIGHT.setVisible(renderer, false);
+			JUMP.setVisible(renderer, true);
+			SNEAK.setVisible(renderer, true);
+			BACK.setVisible(renderer, false);
+			BACK_DISABLED.setVisible(renderer, false);
+			KEYBOARD.setVisible(renderer, false);
+			PAUSE.setVisible(renderer, true);
+			CHAT.setVisible(renderer, true);
+			F3.setVisible(renderer, true);
+			F5.setVisible(renderer, true);
+			PASTE.setVisible(renderer, false);
+			COPY.setVisible(renderer, false);
+			PICK.setVisible(renderer, true);
+			FLY.setVisible(renderer, true);
+			FLY_UP.setVisible(renderer, false);
+			FLY_DOWN.setVisible(renderer, false);
+			FLY_END.setVisible(renderer, false);
+			break;
+		case IN_GAME_WALK_CAN_FLY:
+			DPAD_UP.setVisible(renderer, true);
+			DPAD_LEFT.setVisible(renderer, true);
+			DPAD_RIGHT.setVisible(renderer, true);
+			DPAD_DOWN.setVisible(renderer, true);
+			DPAD_UP_LEFT.setVisible(renderer, true);
+			DPAD_UP_RIGHT.setVisible(renderer, true);
+			JUMP.setVisible(renderer, true);
+			SNEAK.setVisible(renderer, true);
+			BACK.setVisible(renderer, false);
+			BACK_DISABLED.setVisible(renderer, false);
+			KEYBOARD.setVisible(renderer, false);
+			PAUSE.setVisible(renderer, true);
+			CHAT.setVisible(renderer, true);
+			F3.setVisible(renderer, true);
+			F5.setVisible(renderer, true);
+			PASTE.setVisible(renderer, false);
+			COPY.setVisible(renderer, false);
+			PICK.setVisible(renderer, true);
+			FLY.setVisible(renderer, true);
+			FLY_UP.setVisible(renderer, false);
+			FLY_DOWN.setVisible(renderer, false);
+			FLY_END.setVisible(renderer, false);
+			break;
+		case IN_GAME_FLYING:
+			DPAD_UP.setVisible(renderer, true);
+			DPAD_LEFT.setVisible(renderer, true);
+			DPAD_RIGHT.setVisible(renderer, true);
+			DPAD_DOWN.setVisible(renderer, true);
+			DPAD_UP_LEFT.setVisible(renderer, false);
+			DPAD_UP_RIGHT.setVisible(renderer, false);
+			JUMP.setVisible(renderer, false);
+			SNEAK.setVisible(renderer, true);
+			BACK.setVisible(renderer, false);
+			BACK_DISABLED.setVisible(renderer, false);
+			KEYBOARD.setVisible(renderer, false);
+			PAUSE.setVisible(renderer, true);
+			CHAT.setVisible(renderer, true);
+			F3.setVisible(renderer, true);
+			F5.setVisible(renderer, true);
+			PASTE.setVisible(renderer, false);
+			COPY.setVisible(renderer, false);
+			PICK.setVisible(renderer, true);
+			FLY.setVisible(renderer, false);
+			FLY_UP.setVisible(renderer, true);
+			FLY_DOWN.setVisible(renderer, true);
+			FLY_END.setVisible(renderer, true);
+			break;
+		case IN_GAME_WALK_FLYING:
+			DPAD_UP.setVisible(renderer, true);
+			DPAD_LEFT.setVisible(renderer, true);
+			DPAD_RIGHT.setVisible(renderer, true);
+			DPAD_DOWN.setVisible(renderer, true);
+			DPAD_UP_LEFT.setVisible(renderer, true);
+			DPAD_UP_RIGHT.setVisible(renderer, true);
+			JUMP.setVisible(renderer, false);
+			SNEAK.setVisible(renderer, true);
+			BACK.setVisible(renderer, false);
+			BACK_DISABLED.setVisible(renderer, false);
+			KEYBOARD.setVisible(renderer, false);
+			PAUSE.setVisible(renderer, true);
+			CHAT.setVisible(renderer, true);
+			F3.setVisible(renderer, true);
+			F5.setVisible(renderer, true);
+			PASTE.setVisible(renderer, false);
+			COPY.setVisible(renderer, false);
+			PICK.setVisible(renderer, true);
+			FLY.setVisible(renderer, false);
+			FLY_UP.setVisible(renderer, true);
+			FLY_DOWN.setVisible(renderer, true);
+			FLY_END.setVisible(renderer, true);
+			break;
+		default:
+			throw new IllegalStateException();
+		}
+		currentLayout = layout;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/EnumTouchControlPos.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/EnumTouchControlPos.java
new file mode 100755
index 0000000..0b0771f
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/EnumTouchControlPos.java
@@ -0,0 +1,20 @@
+package net.lax1dude.eaglercraft.v1_8.touch_gui;
+
+/**
+ * Copyright (c) 2024 ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumTouchControlPos {
+	TOP_LEFT, TOP, TOP_RIGHT, LEFT, RIGHT, BOTTOM_LEFT, BOTTOM, BOTTOM_RIGHT
+}
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/EnumTouchLayoutState.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/EnumTouchLayoutState.java
new file mode 100755
index 0000000..86c7c71
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/EnumTouchLayoutState.java
@@ -0,0 +1,28 @@
+package net.lax1dude.eaglercraft.v1_8.touch_gui;
+
+/**
+ * Copyright (c) 2024 lax1due. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumTouchLayoutState {
+	IN_GUI,
+	IN_GUI_TYPING,
+	IN_GUI_NO_BACK,
+	IN_GAME,
+	IN_GAME_WALK,
+	IN_GAME_CAN_FLY,
+	IN_GAME_WALK_CAN_FLY,
+	IN_GAME_FLYING,
+	IN_GAME_WALK_FLYING;
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/TouchControlInput.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/TouchControlInput.java
new file mode 100755
index 0000000..29cfd29
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/TouchControlInput.java
@@ -0,0 +1,27 @@
+package net.lax1dude.eaglercraft.v1_8.touch_gui;
+
+/**
+ * Copyright (c) 2024 ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TouchControlInput {
+	public int x;
+	public int y;
+	public final EnumTouchControl control;
+	public TouchControlInput(int x, int y, EnumTouchControl control) {
+		this.x = x;
+		this.y = y;
+		this.control = control;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/TouchControls.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/TouchControls.java
new file mode 100755
index 0000000..94bbaa5
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/TouchControls.java
@@ -0,0 +1,164 @@
+package net.lax1dude.eaglercraft.v1_8.touch_gui;
+
+import net.lax1dude.eaglercraft.v1_8.Touch;
+import net.lax1dude.eaglercraft.v1_8.touch_gui.EnumTouchControl.TouchAction;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
+
+import java.util.*;
+
+/**
+ * Copyright (c) 2024 lax1dude, ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TouchControls {
+
+	public static final Map<Integer, TouchControlInput> touchControls = new HashMap<>();
+	protected static Set<EnumTouchControl> touchControlPressed = EnumSet.noneOf(EnumTouchControl.class);
+
+	protected static boolean isSneakToggled = false;
+
+	public static void update(boolean screenTouched) {
+		Minecraft mc = Minecraft.getMinecraft();
+		int h = mc.displayHeight;
+		final ScaledResolution sr = mc.scaledResolution;
+		int fac = sr.getScaleFactor();
+		if(screenTouched) {
+			int touchPoints = Touch.touchPointCount();
+			int[] loc;
+			for(int i = 0; i < touchPoints; ++i) {
+				int x = Touch.touchPointX(i);
+				int y = h - Touch.touchPointY(i) - 1;
+				int uid = Touch.touchPointUID(i);
+				TouchControlInput input = touchControls.get(uid);
+				if(input != null) {
+					EnumTouchControl ctrl = input.control;
+					loc = ctrl.getLocation(sr, TouchOverlayRenderer._fuck);
+					loc[0] *= fac;
+					loc[1] *= fac;
+					int size = ctrl.getSize() * fac;
+					if (x >= loc[0] && y >= loc[1] && x < loc[0] + size && y < loc[1] + size) {
+						continue;
+					}
+					EnumTouchControl[] en = EnumTouchControl._VALUES;
+					for (int j = 0; j < en.length; ++j) {
+						EnumTouchControl control = en[j];
+						if(!control.visible) continue;
+						loc = control.getLocation(sr, TouchOverlayRenderer._fuck);
+						loc[0] *= fac;
+						loc[1] *= fac;
+						size = control.getSize() * fac;
+						if (x >= loc[0] && y >= loc[1] && x < loc[0] + size && y < loc[1] + size) {
+							touchControls.put(uid, new TouchControlInput(x / fac, y / fac, control));
+							break;
+						}
+					}
+				}
+			}
+			mc.ingameGUI.updateTouchEagler(mc.currentScreen == null);
+		}else {
+			touchControls.clear();
+			touchControlPressed.clear();
+			mc.ingameGUI.updateTouchEagler(false);
+		}
+	}
+
+	public static boolean handleTouchBegin(int uid, int pointX, int pointY) {
+		Minecraft mc = Minecraft.getMinecraft();
+		pointY = mc.displayHeight - pointY - 1;
+		EnumTouchControl control = overlappingControl0(pointX, pointY, mc.scaledResolution);
+		if(control != null) {
+			int fac = mc.scaledResolution.getScaleFactor();
+			touchControls.put(uid, new TouchControlInput(pointX / fac, pointY / fac, control));
+			return true;
+		}else {
+			return mc.currentScreen == null && Minecraft.getMinecraft().ingameGUI.handleTouchBeginEagler(uid, pointX, pointY);
+		}
+	}
+
+	public static boolean handleTouchEnd(int uid, int pointX, int pointY) {
+		if(touchControls.remove(uid) != null) {
+			return true;
+		}else {
+			Minecraft mc = Minecraft.getMinecraft();
+			return mc.currentScreen == null && mc.ingameGUI.handleTouchEndEagler(uid, pointX, mc.displayHeight - pointY - 1);
+		}
+	}
+
+	public static void resetSneak() {
+		isSneakToggled = false;
+	}
+
+	public static void resetSneakInvalidate() {
+		if(isSneakToggled) {
+			isSneakToggled = false;
+			EnumTouchControl.SNEAK.invalid = true;
+			Minecraft.getMinecraft().touchOverlayRenderer.invalidate();
+		}
+	}
+
+	public static void handleInput() {
+		if(!touchControls.isEmpty()) {
+			Set<EnumTouchControl> newPressed = EnumSet.noneOf(EnumTouchControl.class);
+			TouchOverlayRenderer renderer = Minecraft.getMinecraft().touchOverlayRenderer;
+			for (TouchControlInput input : touchControls.values()) {
+				TouchAction action = input.control.getAction();
+				if(action != null) {
+					action.call(input.control, input.x, input.y);
+				}
+				if(input.control.invalid) {
+					renderer.invalidate();
+				}
+				newPressed.add(input.control);
+			}
+			touchControlPressed = newPressed;
+		}else {
+			touchControlPressed.clear();
+		}
+	}
+
+	public static boolean isPressed(EnumTouchControl control) {
+		return touchControlPressed.contains(control);
+	}
+
+	public static boolean getSneakToggled() {
+		return isSneakToggled;
+	}
+
+	public static EnumTouchControl overlappingControl(int tx, int ty) {
+		Minecraft mc = Minecraft.getMinecraft();
+		ty = mc.displayHeight - ty - 1;
+		return overlappingControl0(tx, ty, mc.scaledResolution);
+	}
+
+	private static EnumTouchControl overlappingControl0(int pointX, int pointY, ScaledResolution sr) {
+		EnumTouchControl[] en = EnumTouchControl._VALUES;
+		int[] loc;
+		int fac = sr.getScaleFactor();
+		int size;
+		for (int j = 0; j < en.length; ++j) {
+			EnumTouchControl control = en[j];
+			if(!control.visible) continue;
+			loc = control.getLocation(sr, TouchOverlayRenderer._fuck);
+			loc[0] *= fac;
+			loc[1] *= fac;
+			size = control.getSize() * fac;
+			if (pointX >= loc[0] && pointY >= loc[1] && pointX < loc[0] + size && pointY < loc[1] + size) {
+				return control;
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/TouchOverlayRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/TouchOverlayRenderer.java
new file mode 100755
index 0000000..663196c
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/touch_gui/TouchOverlayRenderer.java
@@ -0,0 +1,197 @@
+package net.lax1dude.eaglercraft.v1_8.touch_gui;
+
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
+import net.lax1dude.eaglercraft.v1_8.Touch;
+import net.lax1dude.eaglercraft.v1_8.opengl.GameOverlayFramebuffer;
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
+
+import java.util.Set;
+
+import com.google.common.collect.Sets;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TouchOverlayRenderer {
+
+	public static final ResourceLocation spriteSheet = new ResourceLocation("eagler:gui/touch_gui.png");
+
+	static final int[] _fuck = new int[2];
+
+	private GameOverlayFramebuffer overlayFramebuffer;
+	private final Minecraft mc;
+	private boolean invalid = false;
+	private boolean invalidDeep = false;
+	private int currentWidth = -1;
+	private int currentHeight = -1;
+
+	public TouchOverlayRenderer(Minecraft mc) {
+		this.mc = mc;
+		this.overlayFramebuffer = new GameOverlayFramebuffer(false);
+		EnumTouchControl.currentLayout = null;
+		EnumTouchControl.setLayoutState(this, EnumTouchLayoutState.IN_GUI);
+	}
+
+	public void invalidate() {
+		invalid = true;
+	}
+
+	public void invalidateDeep() {
+		invalid = true;
+		invalidDeep = true;
+	}
+
+	public void render(int w, int h, ScaledResolution scaledResolution) {
+		if(PointerInputAbstraction.isTouchMode()) {
+			render0(w, h, scaledResolution);
+			if(EnumTouchControl.KEYBOARD.visible) {
+				int[] pos = EnumTouchControl.KEYBOARD.getLocation(scaledResolution, _fuck);
+				int scale = scaledResolution.getScaleFactor();
+				int size = EnumTouchControl.KEYBOARD.size * scale;
+				Touch.touchSetOpenKeyboardZone(pos[0] * scale,
+						(scaledResolution.getScaledHeight() - pos[1] - 1) * scale - size, size, size);
+			}else {
+				Touch.touchSetOpenKeyboardZone(0, 0, 0, 0);
+			}
+		}else {
+			Touch.touchSetOpenKeyboardZone(0, 0, 0, 0);
+		}
+	}
+
+	private void render0(int w, int h, ScaledResolution scaledResolution) {
+		EnumTouchControl.setLayoutState(this, hashLayoutState());
+		int sw = scaledResolution.getScaledWidth();
+		int sh = scaledResolution.getScaledHeight();
+		if(currentWidth != sw || currentHeight != sh) {
+			invalidateDeep();
+		}
+		GlStateManager.disableDepth();
+		GlStateManager.disableBlend();
+		GlStateManager.disableLighting();
+		GlStateManager.enableAlpha();
+		GlStateManager.depthMask(false);
+		if(invalid) {
+			GlStateManager.pushMatrix();
+			invalidDeep |= overlayFramebuffer.beginRender(sw, sh);
+			GlStateManager.viewport(0, 0, sw, sh);
+			if(invalidDeep) {
+				currentWidth = sw;
+				currentHeight = sh;
+				GlStateManager.clearColor(0.0f, 0.0f, 0.0f, 0.0f);
+				GlStateManager.clear(GL_COLOR_BUFFER_BIT);
+			}
+			Set<EnumTouchControl> controls = Sets.newHashSet(EnumTouchControl._VALUES);
+			for (TouchControlInput input : TouchControls.touchControls.values()) {
+				controls.remove(input.control);
+			}
+			for (EnumTouchControl control : controls) {
+				if(invalidDeep || control.invalid) {
+					if(control.visible) {
+						GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+						control.getRender().call(control, 0, 0, false, mc, scaledResolution);
+					}
+					control.invalid = false;
+				}
+			}
+			for (TouchControlInput input : TouchControls.touchControls.values()) {
+				EnumTouchControl control = input.control;
+				if(invalidDeep || control.invalid) {
+					if(control.visible) {
+						GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+						control.getRender().call(control, input.x, input.y, true, mc, scaledResolution);
+					}
+					control.invalid = false;
+				}
+			}
+			overlayFramebuffer.endRender();
+			invalid = false;
+			invalidDeep = false;
+			GlStateManager.popMatrix();
+			GlStateManager.viewport(0, 0, w, h);
+		}
+		GlStateManager.bindTexture(overlayFramebuffer.getTexture());
+		GlStateManager.enableBlend();
+		GlStateManager.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		GlStateManager.enableAlpha();
+		GlStateManager.color(1.0f, 1.0f, 1.0f, MathHelper.clamp_float(mc.gameSettings.touchControlOpacity, 0.0f, 1.0f));
+		Tessellator tessellator = Tessellator.getInstance();
+		WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+		worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
+		worldrenderer.pos(0.0D, (double) sh, 500.0D).tex(0.0D, 0.0D).endVertex();
+		worldrenderer.pos((double) sw, (double) sh, 500.0D).tex(1.0D, 0.0D).endVertex();
+		worldrenderer.pos((double) sw, 0.0D, 500.0D).tex(1.0D, 1.0D).endVertex();
+		worldrenderer.pos(0.0D, 0.0D, 500.0D).tex(0.0D, 1.0D).endVertex();
+		tessellator.draw();
+		GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+		GlStateManager.enableDepth();
+		GlStateManager.depthMask(true);
+	}
+
+	private EnumTouchLayoutState hashLayoutState() {
+		if(mc.currentScreen != null) {
+			return mc.currentScreen.showCopyPasteButtons() ? EnumTouchLayoutState.IN_GUI_TYPING
+					: (mc.currentScreen.canCloseGui() ? EnumTouchLayoutState.IN_GUI
+							: EnumTouchLayoutState.IN_GUI_NO_BACK);
+		}
+		EntityPlayerSP player = mc.thePlayer;
+		if(player != null) {
+			if(player.capabilities.isFlying) {
+				 return showDiagButtons() ? EnumTouchLayoutState.IN_GAME_WALK_FLYING : EnumTouchLayoutState.IN_GAME_FLYING;
+			}else {
+				if(player.capabilities.allowFlying) {
+					return showDiagButtons() ? EnumTouchLayoutState.IN_GAME_WALK_CAN_FLY : EnumTouchLayoutState.IN_GAME_CAN_FLY;
+				}else {
+					return showDiagButtons() ? EnumTouchLayoutState.IN_GAME_WALK : EnumTouchLayoutState.IN_GAME;
+				}
+			}
+		}else {
+			return showDiagButtons() ? EnumTouchLayoutState.IN_GAME_WALK : EnumTouchLayoutState.IN_GAME;
+		}
+	}
+
+	private boolean showDiagButtons() {
+		return TouchControls.isPressed(EnumTouchControl.DPAD_UP)
+				|| TouchControls.isPressed(EnumTouchControl.DPAD_UP_LEFT)
+				|| TouchControls.isPressed(EnumTouchControl.DPAD_UP_RIGHT);
+	}
+
+	protected static void drawTexturedModalRect(float xCoord, float yCoord, int minU, int minV, int maxU, int maxV, int scaleFac) {
+		float f = 0.00390625F;
+		float f1 = 0.00390625F;
+		Tessellator tessellator = Tessellator.getInstance();
+		WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+		worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
+		worldrenderer.pos((double) (xCoord + 0.0F), (double) (yCoord + (float) maxV * scaleFac), 0.0)
+				.tex((double) ((float) (minU + 0) * f), (double) ((float) (minV + maxV) * f1)).endVertex();
+		worldrenderer.pos((double) (xCoord + (float) maxU * scaleFac), (double) (yCoord + (float) maxV * scaleFac), 0.0)
+				.tex((double) ((float) (minU + maxU) * f), (double) ((float) (minV + maxV) * f1)).endVertex();
+		worldrenderer.pos((double) (xCoord + (float) maxU * scaleFac), (double) (yCoord + 0.0F), 0.0)
+				.tex((double) ((float) (minU + maxU) * f), (double) ((float) (minV + 0) * f1)).endVertex();
+		worldrenderer.pos((double) (xCoord + 0.0F), (double) (yCoord + 0.0F), 0.0)
+				.tex((double) ((float) (minU + 0) * f), (double) ((float) (minV + 0) * f1)).endVertex();
+		tessellator.draw();
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateDownloadSuccess.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateDownloadSuccess.java
new file mode 100755
index 0000000..c6111e8
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateDownloadSuccess.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.update;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiUpdateDownloadSuccess extends GuiScreen {
+
+	protected final GuiScreen parent;
+	protected final UpdateDataObj updateData;
+
+	public GuiUpdateDownloadSuccess(GuiScreen parent, UpdateDataObj updateData) {
+		this.parent = parent;
+		this.updateData = updateData;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 56, I18n.format("updateSuccess.downloadOffline")));
+		this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 6 + 86, I18n.format("updateSuccess.installToBootMenu")));
+		this.buttonList.add(new GuiButton(2, this.width / 2 - 100, this.height / 6 + 130, I18n.format("gui.cancel")));
+	}
+
+	public void actionPerformed(GuiButton btn) {
+		if(btn.id == 0) {
+			this.mc.loadingScreen.eaglerShow(I18n.format("updateSuccess.downloading"), null);
+			UpdateService.quine(updateData.clientSignature, updateData.clientBundle);
+			this.mc.displayGuiScreen(parent);
+		}else if(btn.id == 1) {
+			this.mc.displayGuiScreen(new GuiUpdateInstallOptions(this, parent, updateData));
+		}else if(btn.id == 2) {
+			this.mc.displayGuiScreen(parent);
+		}
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, I18n.format("updateSuccess.title"), this.width / 2, 50, 11184810);
+		this.drawCenteredString(fontRendererObj,
+				updateData.clientSignature.bundleDisplayName + " " + updateData.clientSignature.bundleDisplayVersion,
+				this.width / 2, 70, 0xFFFFAA);
+		super.drawScreen(par1, par2, par3);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateInstallOptions.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateInstallOptions.java
new file mode 100755
index 0000000..bcd252d
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateInstallOptions.java
@@ -0,0 +1,84 @@
+package net.lax1dude.eaglercraft.v1_8.update;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiUpdateInstallOptions extends GuiScreen {
+
+	protected final GuiScreen parent;
+	protected final GuiScreen onDone;
+	protected final UpdateDataObj updateData;
+	protected boolean makeDefault;
+	protected boolean enableCountdown;
+	protected GuiButton makeDefaultBtn;
+	protected GuiButton enableCountdownBtn;
+
+	public GuiUpdateInstallOptions(GuiScreen parent, GuiScreen onDone, UpdateDataObj updateData) {
+		this.parent = parent;
+		this.onDone = onDone;
+		this.updateData = updateData;
+		makeDefault = updateData.clientSignature.bundleVersionInteger > EaglercraftVersion.updateBundlePackageVersionInt;
+		enableCountdown = makeDefault;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(makeDefaultBtn = new GuiButton(0, this.width / 2 - 100, this.height / 6 + 46,
+				I18n.format("updateInstall.setDefault") + ": " + I18n.format(makeDefault ? "gui.yes" : "gui.no")));
+		this.buttonList.add(enableCountdownBtn = new GuiButton(1, this.width / 2 - 100, this.height / 6 + 76,
+				I18n.format("updateInstall.setCountdown") + ": "
+						+ I18n.format(enableCountdown ? "gui.yes" : "gui.no")));
+		this.buttonList.add(new GuiButton(2, this.width / 2 - 100, this.height / 6 + 110, I18n.format("updateInstall.install")));
+		this.buttonList.add(new GuiButton(3, this.width / 2 - 100, this.height / 6 + 140, I18n.format("gui.cancel")));
+		
+	}
+
+	public void actionPerformed(GuiButton btn) {
+		if(btn.id == 0) {
+			makeDefault = !makeDefault;
+			makeDefaultBtn.displayString = I18n.format("updateInstall.setDefault") + ": " + I18n.format(makeDefault ? "gui.yes" : "gui.no");
+		}else if(btn.id == 1) {
+			enableCountdown = !enableCountdown;
+			enableCountdownBtn.displayString = I18n.format("updateInstall.setCountdown") + ": " + I18n.format(enableCountdown ? "gui.yes" : "gui.no");
+		}else if(btn.id == 2) {
+			mc.loadingScreen.eaglerShow(I18n.format("updateSuccess.installing"), null);
+			try {
+				UpdateService.installSignedClient(updateData.clientSignature, updateData.clientBundle, makeDefault, enableCountdown);
+			}catch(Throwable t) {
+				mc.displayGuiScreen(new GuiScreenGenericErrorMessage("installFailed.title", t.toString(), onDone));
+				return;
+			}
+			mc.displayGuiScreen(onDone);
+		}else if(btn.id == 3) {
+			mc.displayGuiScreen(parent);
+		}
+	}
+
+	public void drawScreen(int mx, int my, float partialTicks) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, I18n.format("updateInstall.title"), this.width / 2, 40, 11184810);
+		this.drawCenteredString(fontRendererObj,
+				updateData.clientSignature.bundleDisplayName + " " + updateData.clientSignature.bundleDisplayVersion,
+				this.width / 2, 60, 0xFFFFAA);
+		super.drawScreen(mx, my, partialTicks);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionList.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionList.java
index 6943d87..6b2df74 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionList.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionList.java
@@ -1,6 +1,8 @@
 package net.lax1dude.eaglercraft.v1_8.update;
 
 import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -60,12 +62,13 @@ public class GuiUpdateVersionList extends GuiScreen {
 				UpdateService.startClientUpdateFrom(slots.certList.get(selected));
 			}
 		case 0:
-		default:
 			mc.displayGuiScreen(back);
 			break;
 		case 2:
 			this.initGui();
 			break;
+		default:
+			break;
 		}
 	}
 
@@ -79,6 +82,7 @@ public class GuiUpdateVersionList extends GuiScreen {
 		super.drawScreen(par1, par2, par3);
 		if(tooltip != null) {
 			drawHoveringText(mc.fontRendererObj.listFormattedStringToWidth(tooltip, 180), par1, par2);
+			GlStateManager.disableLighting();
 			tooltip = null;
 		}
 	}
@@ -88,4 +92,11 @@ public class GuiUpdateVersionList extends GuiScreen {
 		super.handleMouseInput();
 		slots.handleMouseInput();
 	}
+
+	@Override
+	public void handleTouchInput() throws IOException {
+		super.handleTouchInput();
+		slots.handleTouchInput();
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionSlot.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionSlot.java
index 26e6507..cf3e26a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionSlot.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionSlot.java
@@ -8,7 +8,6 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
@@ -35,7 +34,7 @@ public class GuiUpdateVersionSlot extends GuiSlot {
 
 	private static final ResourceLocation eaglerGuiTex = new ResourceLocation("eagler:gui/eagler_gui.png");
 
-	final List<UpdateCertificate> certList = new ArrayList();
+	final List<UpdateCertificate> certList = new ArrayList<>();
 
 	final GuiUpdateVersionList screen;
 
@@ -86,7 +85,7 @@ public class GuiUpdateVersionSlot extends GuiSlot {
 		screen.drawBackground(0);
 	}
 
-	public static final SimpleDateFormat dateFmt = EagRuntime.fixDateFormat(new SimpleDateFormat("M/dd/yyyy"));
+	public static final SimpleDateFormat dateFmt = new SimpleDateFormat("M/dd/yyyy");
 	private static final char[] hexChars = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 
 	@Override
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/RelayUpdateChecker.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/RelayUpdateChecker.java
index c9e1e88..0d17681 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/RelayUpdateChecker.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/RelayUpdateChecker.java
@@ -13,7 +13,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServerSocket;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket00Handshake;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.RelayPacket00Handshake;
 import net.minecraft.client.Minecraft;
 
 /**
@@ -46,7 +46,7 @@ public class RelayUpdateChecker {
 		
 	}
 
-	private static final List<RelayEntry> relaysList = new ArrayList();
+	private static final List<RelayEntry> relaysList = new ArrayList<>();
 
 	private static long lastUpdateCheck = -1l;
 	private static boolean hasInit = false;
@@ -74,7 +74,8 @@ public class RelayUpdateChecker {
 		}
 		long millis = System.currentTimeMillis();
 		Minecraft mc = Minecraft.getMinecraft();
-		if((mc.theWorld == null || mc.isSingleplayer()) && millis - lastUpdateCheck > updateCheckRate) {
+		if ((mc.theWorld == null || mc.isSingleplayer())
+				&& (millis - lastUpdateCheck > updateCheckRate || millis + 60000l < lastUpdateCheck)) {
 			lastUpdateCheck = millis;
 			try {
 				EaglerOutputStream bao = new EaglerOutputStream(8);
@@ -120,12 +121,13 @@ public class RelayUpdateChecker {
 
 	private static void updateRelay(RelayEntry socket) {
 		try {
+			socket.currentSocket.update();
 			if(socket.currentSocket.isClosed()) {
 				socket.currentSocket = null;
 			}else if(socket.currentSocket.isOpen()) {
 				if(!socket.handshake) {
 					socket.handshake = true;
-					socket.currentSocket.writePacket(new IPacket00Handshake(0x02, RelayManager.preferredRelayVersion, magic));
+					socket.currentSocket.writePacket(new RelayPacket00Handshake(0x02, RelayManager.preferredRelayVersion, magic));
 				}else {
 					// close immediately
 					if(socket.currentSocket.nextPacket() != null) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateDataObj.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateDataObj.java
new file mode 100755
index 0000000..c6a0648
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateDataObj.java
@@ -0,0 +1,28 @@
+package net.lax1dude.eaglercraft.v1_8.update;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class UpdateDataObj {
+
+	public final UpdateCertificate clientSignature;
+	public final byte[] clientBundle;
+
+	public UpdateDataObj(UpdateCertificate clientSignature, byte[] clientBundle) {
+		this.clientSignature = clientSignature;
+		this.clientBundle = clientBundle;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateResultObj.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateResultObj.java
new file mode 100755
index 0000000..8113ced
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateResultObj.java
@@ -0,0 +1,48 @@
+package net.lax1dude.eaglercraft.v1_8.update;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class UpdateResultObj {
+
+	private final boolean success;
+	private final Object dataObj;
+
+	private UpdateResultObj(boolean success, Object dataObj) {
+		this.success = success;
+		this.dataObj = dataObj;
+	}
+
+	public static UpdateResultObj createSuccess(UpdateDataObj dataObj) {
+		return new UpdateResultObj(true, dataObj);
+	}
+
+	public static UpdateResultObj createFailure(String dataObj) {
+		return new UpdateResultObj(false, dataObj);
+	}
+
+	public boolean isSuccess() {
+		return success;
+	}
+
+	public UpdateDataObj getSuccess() {
+		return (UpdateDataObj)dataObj;
+	}
+
+	public String getFailure() {
+		return (String)dataObj;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateService.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateService.java
index 8b74e15..2c1b506 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateService.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateService.java
@@ -37,9 +37,9 @@ public class UpdateService {
 	private static boolean isBundleDataValid = false;
 
 	private static UpdateCertificate latestUpdateFound = null;
-	private static final Set<UpdateCertificate> availableUpdates = new HashSet();
-	private static final Set<RawKnownCertHolder> fastUpdateKnownCheckSet = new HashSet();
-	private static final Set<UpdateCertificate> dismissedUpdates = new HashSet();
+	private static final Set<UpdateCertificate> availableUpdates = new HashSet<>();
+	private static final Set<RawKnownCertHolder> fastUpdateKnownCheckSet = new HashSet<>();
+	private static final Set<UpdateCertificate> dismissedUpdates = new HashSet<>();
 
 	private static class RawKnownCertHolder {
 
@@ -50,7 +50,7 @@ public class UpdateService {
 		public RawKnownCertHolder(byte[] data) {
 			this.data = data;
 			this.hashcode = Arrays.hashCode(data);
-			this.age = System.currentTimeMillis();
+			this.age = EagRuntime.steadyTimeMillis();
 		}
 
 		public int hashCode() {
@@ -176,7 +176,7 @@ public class UpdateService {
 
 	private static void freeMemory() {
 		if(fastUpdateKnownCheckSet.size() > 127) {
-			List<RawKnownCertHolder> lst = new ArrayList(fastUpdateKnownCheckSet);
+			List<RawKnownCertHolder> lst = new ArrayList<>(fastUpdateKnownCheckSet);
 			fastUpdateKnownCheckSet.clear();
 			lst.sort((c1, c2) -> { return (int)(c2.age - c1.age); });
 			for(int i = 0; i < 64; ++i) {
@@ -193,6 +193,15 @@ public class UpdateService {
 		return PlatformUpdateSvc.getUpdatingStatus();
 	}
 
+	public static UpdateResultObj getUpdateResult() {
+		return PlatformUpdateSvc.getUpdateResult();
+	}
+
+	public static void installSignedClient(UpdateCertificate clientCert, byte[] clientPayload, boolean setDefault,
+			boolean setTimeout) {
+		PlatformUpdateSvc.installSignedClient(clientCert, clientPayload, setDefault, setTimeout);
+	}
+
 	public static UpdateCertificate getLatestUpdateFound() {
 		return latestUpdateFound;
 	}
@@ -221,6 +230,10 @@ public class UpdateService {
 		}
 	}
 
+	public static void quine(UpdateCertificate cert, byte[] payload) {
+		PlatformUpdateSvc.quine(cert, payload);
+	}
+
 	public static boolean shouldDisableDownloadButton() {
 		return EagRuntime.getConfiguration().getDownloadOfflineButtonLink() == null && (myUpdateCert == null
 				|| (getClientBundleData() == null && PlatformUpdateSvc.getUpdatingStatus().isBusy));
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/ExpiringSet.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/ExpiringSet.java
index 0401cce..85f0b07 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/ExpiringSet.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/ExpiringSet.java
@@ -5,6 +5,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+
 /**
  * Copyright (c) 2022 ayunami2000. All Rights Reserved.
  * 
@@ -42,7 +44,7 @@ public class ExpiringSet<T> extends HashSet<T> {
 
     public void checkForExpirations() {
         Iterator<T> iterator = this.timestamps.keySet().iterator();
-        long now = System.currentTimeMillis();
+        long now = EagRuntime.steadyTimeMillis();
         while (iterator.hasNext()) {
             T element = iterator.next();
             if (super.contains(element)) {
@@ -61,7 +63,7 @@ public class ExpiringSet<T> extends HashSet<T> {
     public boolean add(T o) {
         checkForExpirations();
         boolean success = super.add(o);
-        if (success) timestamps.put(o, System.currentTimeMillis());
+        if (success) timestamps.put(o, EagRuntime.steadyTimeMillis());
         return success;
     }
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceMenu.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceMenu.java
index 0e69344..3922ee2 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceMenu.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceMenu.java
@@ -5,8 +5,10 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 import java.util.List;
 import java.util.Set;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
+import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiSlider2;
 import net.minecraft.client.Minecraft;
@@ -124,17 +126,8 @@ public class GuiVoiceMenu extends Gui {
 	
 	public void initGui() {
 		this.sliderBlocks = new GuiSlider2(-1, (width - 150) / 2, height / 3 + 20, 150, 20, (VoiceClientController.getVoiceProximity() - 5) / 17.0f, 1.0f) {
-			public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) {
-				if(super.mousePressed(par1Minecraft, par2, par3)) {
-					this.displayString = "" + (int)((sliderValue * 17.0f) + 5.0f) + " Blocks";
-					return true;
-				}else {
-					return false;
-				}
-			}
-			public void mouseDragged(Minecraft par1Minecraft, int par2, int par3) {
-				super.mouseDragged(par1Minecraft, par2, par3);
-				this.displayString = "" + (int)((sliderValue * 17.0f) + 5.0f) + " Blocks";
+			protected String updateDisplayString() {
+				return (int)((sliderValue * 17.0f) + 5.0f) + " Blocks";
 			}
 		};
 		sliderBlocks.displayString = "" + VoiceClientController.getVoiceProximity() + " Blocks";
@@ -386,7 +379,7 @@ public class GuiVoiceMenu extends Gui {
 				}
 				
 			}else if(status == EnumVoiceChannelStatus.CONNECTING) {
-				float fadeTimer = MathHelper.sin((float)((System.currentTimeMillis() % 700l) * 0.0014d) * 3.14159f) * 0.35f + 0.3f;
+				float fadeTimer = MathHelper.sin((float)((EagRuntime.steadyTimeMillis() % 700l) * 0.0014d) * 3.14159f) * 0.35f + 0.3f;
 				txt = I18n.format("voice.connecting");
 				GlStateManager.enableBlend();
 				GlStateManager.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -487,7 +480,7 @@ public class GuiVoiceMenu extends Gui {
 			
 			drawNotice(I18n.format("voice.unsupportedWarning1"), false, I18n.format("voice.unsupportedWarning2"), I18n.format("voice.unsupportedWarning3"),
 					"", I18n.format("voice.unsupportedWarning4"), I18n.format("voice.unsupportedWarning5"), I18n.format("voice.unsupportedWarning6"),
-					I18n.format("voice.unsupportedWarning7"), I18n.format("voice.unsupportedWarning8"), I18n.format("voice.unsupportedWarning9"));
+					I18n.format("voice.unsupportedWarning7"), "", I18n.format("voice.unsupportedWarning8"), I18n.format("voice.unsupportedWarning9"));
 			
 			noticeContinueButton.visible = true;
 			noticeCancelButton.visible = false;
@@ -495,8 +488,7 @@ public class GuiVoiceMenu extends Gui {
 			
 			drawNotice(I18n.format("voice.ipGrabWarning1"), true, I18n.format("voice.ipGrabWarning2"), I18n.format("voice.ipGrabWarning3"),
 					I18n.format("voice.ipGrabWarning4"), "", I18n.format("voice.ipGrabWarning5"), I18n.format("voice.ipGrabWarning6"),
-					I18n.format("voice.ipGrabWarning7"), I18n.format("voice.ipGrabWarning8"), I18n.format("voice.ipGrabWarning9"),
-					I18n.format("voice.ipGrabWarning10"), I18n.format("voice.ipGrabWarning11"), I18n.format("voice.ipGrabWarning12"));
+					I18n.format("voice.ipGrabWarning7"));
 			
 			noticeContinueButton.visible = true;
 			noticeCancelButton.visible = true;
@@ -590,17 +582,21 @@ public class GuiVoiceMenu extends Gui {
 	}
 	
 	public void mouseReleased(int par1, int par2, int par3) {
-		applyRadiusButton.mouseReleased(par1, par2);
-		applyVolumeButton.mouseReleased(par1, par2);
-		noticeContinueButton.mouseReleased(par1, par2);
-		noticeCancelButton.mouseReleased(par1, par2);
+		if(par3 != 0 && par3 != 12345) return;
+		boolean touchMode = PointerInputAbstraction.isTouchMode();
+		if(!touchMode || par3 == 0) {
+			applyRadiusButton.mouseReleased(par1, par2);
+			applyVolumeButton.mouseReleased(par1, par2);
+			noticeContinueButton.mouseReleased(par1, par2);
+			noticeCancelButton.mouseReleased(par1, par2);
+		}
 		if(showSliderBlocks || showSliderVolume) {
 			if(showSliderBlocks) {
-				if(par3 == 0) {
+				if(!touchMode || par3 == 12345) {
 					sliderBlocks.mouseReleased(par1, par2);
 				}
 			}else if(showSliderVolume) {
-				if(par3 == 0) {
+				if(!touchMode || par3 == 12345) {
 					sliderListenVolume.mouseReleased(par1, par2);
 					sliderSpeakVolume.mouseReleased(par1, par2);
 				}
@@ -624,19 +620,23 @@ public class GuiVoiceMenu extends Gui {
 	}
 	
 	public void mouseClicked(int mx, int my, int button) {
+		if(button != 0 && button != 12345) return;
+		boolean touchMode = PointerInputAbstraction.isTouchMode();
 		if(showSliderBlocks || showSliderVolume || showPTTKeyConfig || showingCompatWarning || showingTrackingWarning) {
 			if(showSliderBlocks) {
-				sliderBlocks.mousePressed(mc, mx, my);
+				if(!touchMode || button == 12345) {
+					sliderBlocks.mousePressed(mc, mx, my);
+				}
 			}else if(showSliderVolume) {
-				sliderListenVolume.mousePressed(mc, mx, my);
-				sliderSpeakVolume.mousePressed(mc, mx, my);
-			}
-			if(button == 0) {
-				if(applyRadiusButton.mousePressed(mc, mx, my)) actionPerformed(applyRadiusButton);
-				if(applyVolumeButton.mousePressed(mc, mx, my)) actionPerformed(applyVolumeButton);
-				if(noticeContinueButton.mousePressed(mc, mx, my)) actionPerformed(noticeContinueButton);
-				if(noticeCancelButton.mousePressed(mc, mx, my)) actionPerformed(noticeCancelButton);
+				if(!touchMode || button == 12345) {
+					sliderListenVolume.mousePressed(mc, mx, my);
+					sliderSpeakVolume.mousePressed(mc, mx, my);
+				}
 			}
+			if((!touchMode || button == 0) && applyRadiusButton.mousePressed(mc, mx, my)) actionPerformed(applyRadiusButton);
+			if((!touchMode || button == 0) && applyVolumeButton.mousePressed(mc, mx, my)) actionPerformed(applyVolumeButton);
+			if((!touchMode || button == 0) && noticeContinueButton.mousePressed(mc, mx, my)) actionPerformed(noticeContinueButton);
+			if((!touchMode || button == 0) && noticeCancelButton.mousePressed(mc, mx, my)) actionPerformed(noticeCancelButton);
 			throw new AbortedException();
 		}
 		
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceOverlay.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceOverlay.java
index 6c409ce..2b0aeae 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceOverlay.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceOverlay.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
@@ -82,7 +83,7 @@ public class GuiVoiceOverlay extends Gui {
 			mc.getTextureManager().bindTexture(voiceGuiIcons);
 			
 			if((mc.currentScreen == null || !mc.currentScreen.blockPTTKey()) && Keyboard.isKeyDown(mc.gameSettings.voicePTTKey)) {
-				long millis = System.currentTimeMillis();
+				long millis = EagRuntime.steadyTimeMillis();
 				if(pttTimer == 0l) {
 					pttTimer = millis;
 				}
@@ -118,7 +119,7 @@ public class GuiVoiceOverlay extends Gui {
 					Set<EaglercraftUUID> speakers = VoiceClientController.getVoiceSpeaking();
 					Set<EaglercraftUUID> muted = VoiceClientController.getVoiceMuted();
 					
-					List<EaglercraftUUID> listenerList = new ArrayList();
+					List<EaglercraftUUID> listenerList = new ArrayList<>();
 					listenerList.addAll(listeners);
 					listenerList.removeAll(muted);
 					
@@ -145,7 +146,7 @@ public class GuiVoiceOverlay extends Gui {
 						hh -= 15;
 					}
 					
-					List<String> listenerListStr = new ArrayList(Math.min(5, listenerList.size()));
+					List<String> listenerListStr = new ArrayList<>(Math.min(5, listenerList.size()));
 					
 					int left = 50;
 					for(int i = 0, l = listenerList.size(); i < l && i < 5; ++i) {
@@ -196,7 +197,7 @@ public class GuiVoiceOverlay extends Gui {
 				Set<EaglercraftUUID> speakers = VoiceClientController.getVoiceSpeaking();
 				Set<EaglercraftUUID> muted = VoiceClientController.getVoiceMuted();
 				
-				List<EaglercraftUUID> listenerList = new ArrayList();
+				List<EaglercraftUUID> listenerList = new ArrayList<>();
 				listenerList.addAll(speakers);
 				listenerList.removeAll(muted);
 				
@@ -209,7 +210,7 @@ public class GuiVoiceOverlay extends Gui {
 					hh -= 15;
 				}
 				
-				List<String> listenerListStr = new ArrayList(Math.min(5, listenerList.size()));
+				List<String> listenerListStr = new ArrayList<>(Math.min(5, listenerList.size()));
 				
 				int left = 50;
 				for(int i = 0, l = listenerList.size(); i < l && i < 5; ++i) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceClientController.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceClientController.java
index 8f20eb5..ac04333 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceClientController.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceClientController.java
@@ -1,6 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.voice;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -16,9 +17,11 @@ import net.lax1dude.eaglercraft.v1_8.internal.PlatformVoiceClient;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.*;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketVoiceSignalGlobalEAG;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.PacketBuffer;
 
 /**
  * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
@@ -43,7 +46,8 @@ public class VoiceClientController {
 
 	private static boolean clientSupport = false;
 	private static boolean serverSupport = false;
-	private static Consumer<PacketBuffer> packetSendCallback = null;
+	private static Consumer<GameMessagePacket> packetSendCallback = null;
+	private static int protocolVersion = -1;
 	private static EnumVoiceChannelType voiceChannel = EnumVoiceChannelType.NONE;
 	private static final HashSet<EaglercraftUUID> nearbyPlayers = new HashSet<>();
 	private static final ExpiringSet<EaglercraftUUID> recentlyNearbyPlayers = new ExpiringSet<>(5000, uuid -> {
@@ -71,17 +75,14 @@ public class VoiceClientController {
 		return serverSupport;
 	}
 
-	public static void initializeVoiceClient(Consumer<PacketBuffer> signalSendCallbackIn) {
+	public static void initializeVoiceClient(Consumer<GameMessagePacket> signalSendCallbackIn, int proto) {
 		packetSendCallback = signalSendCallbackIn;
+		protocolVersion = proto;
 		uuidToNameLookup.clear();
 		if (getVoiceChannel() != EnumVoiceChannelType.NONE) sendInitialVoice();
 	}
 
-	public static void handleVoiceSignalPacket(PacketBuffer packetData) {
-		VoiceSignalPackets.handleVoiceSignal(packetData);
-	}
-
-	static void handleVoiceSignalPacketTypeGlobal(EaglercraftUUID[] voicePlayers, String[] voiceNames) {
+	public static void handleVoiceSignalPacketTypeGlobal(EaglercraftUUID[] voicePlayers, String[] voiceNames) {
 		uuidToNameLookup.clear();
 		for (int i = 0; i < voicePlayers.length; i++) {
 			if(voiceNames != null) {
@@ -91,6 +92,17 @@ public class VoiceClientController {
 		}
 	}
 
+	public static void handleVoiceSignalPacketTypeGlobalNew(Collection<SPacketVoiceSignalGlobalEAG.UserData> voicePlayers) {
+		uuidToNameLookup.clear();
+		for (SPacketVoiceSignalGlobalEAG.UserData player : voicePlayers) {
+			EaglercraftUUID uuid = new EaglercraftUUID(player.uuidMost, player.uuidLeast);
+			if(player.username != null) {
+				uuidToNameLookup.put(uuid, player.username);
+			}
+			sendPacketRequestIfNeeded(uuid);
+		}
+	}
+
 	public static void handleServerDisconnect() {
 		if(!isClientSupported()) return;
 		serverSupport = false;
@@ -110,7 +122,7 @@ public class VoiceClientController {
 		activateVoice(false);
 	}
 
-	static void handleVoiceSignalPacketTypeAllowed(boolean voiceAvailableStat, String[] servs) {
+	public static void handleVoiceSignalPacketTypeAllowed(boolean voiceAvailableStat, String[] servs) {
 		serverSupport = voiceAvailableStat;
 		PlatformVoiceClient.setICEServers(servs);
 		if(isSupported()) {
@@ -120,23 +132,23 @@ public class VoiceClientController {
 		}
 	}
 
-	static void handleVoiceSignalPacketTypeConnect(EaglercraftUUID user, boolean offer) {
+	public static void handleVoiceSignalPacketTypeConnect(EaglercraftUUID user, boolean offer) {
 		PlatformVoiceClient.signalConnect(user, offer);
 	}
 
-	static void handleVoiceSignalPacketTypeConnectAnnounce(EaglercraftUUID user) {
+	public static void handleVoiceSignalPacketTypeConnectAnnounce(EaglercraftUUID user) {
 		sendPacketRequest(user);
 	}
 
-	static void handleVoiceSignalPacketTypeDisconnect(EaglercraftUUID user) {
+	public static void handleVoiceSignalPacketTypeDisconnect(EaglercraftUUID user) {
 		PlatformVoiceClient.signalDisconnect(user, true);
 	}
 
-	static void handleVoiceSignalPacketTypeICECandidate(EaglercraftUUID user, String ice) {
+	public static void handleVoiceSignalPacketTypeICECandidate(EaglercraftUUID user, String ice) {
 		PlatformVoiceClient.signalICECandidate(user, ice);
 	}
 
-	static void handleVoiceSignalPacketTypeDescription(EaglercraftUUID user, String desc) {
+	public static void handleVoiceSignalPacketTypeDescription(EaglercraftUUID user, String desc) {
 		PlatformVoiceClient.signalDescription(user, desc);
 	}
 
@@ -211,7 +223,7 @@ public class VoiceClientController {
 			for (EaglercraftUUID uuid : antiConcurrentModificationUUIDs) {
 				PlatformVoiceClient.signalDisconnect(uuid, false);
 			}
-			sendPacketDisconnect(null);
+			sendPacketDisconnect();
 			activateVoice(false);
 		} else if (voiceChannel == EnumVoiceChannelType.PROXIMITY) {
 			for (EaglercraftUUID uuid : nearbyPlayers) {
@@ -222,7 +234,7 @@ public class VoiceClientController {
 			}
 			nearbyPlayers.clear();
 			recentlyNearbyPlayers.clear();
-			sendPacketDisconnect(null);
+			sendPacketDisconnect();
 		} else if(voiceChannel == EnumVoiceChannelType.GLOBAL) {
 			Set<EaglercraftUUID> antiConcurrentModificationUUIDs = new HashSet<>(listeningSet);
 			antiConcurrentModificationUUIDs.removeAll(nearbyPlayers);
@@ -230,7 +242,7 @@ public class VoiceClientController {
 			for (EaglercraftUUID uuid : antiConcurrentModificationUUIDs) {
 				PlatformVoiceClient.signalDisconnect(uuid, false);
 			}
-			sendPacketDisconnect(null);
+			sendPacketDisconnect();
 		}
 		voiceChannel = channel;
 		if (channel != EnumVoiceChannelType.NONE) {
@@ -340,23 +352,35 @@ public class VoiceClientController {
 	}
 
 	public static void sendPacketICE(EaglercraftUUID peerId, String candidate) {
-		packetSendCallback.accept(VoiceSignalPackets.makeVoiceSignalPacketICE(peerId, candidate));
+		packetSendCallback.accept(new CPacketVoiceSignalICEEAG(peerId.msb, peerId.lsb, candidate));
 	}
 
 	public static void sendPacketDesc(EaglercraftUUID peerId, String desc) {
-		packetSendCallback.accept(VoiceSignalPackets.makeVoiceSignalPacketDesc(peerId, desc));
+		packetSendCallback.accept(new CPacketVoiceSignalDescEAG(peerId.msb, peerId.lsb, desc));
 	}
 
-	public static void sendPacketDisconnect(EaglercraftUUID peerId) {
-		packetSendCallback.accept(VoiceSignalPackets.makeVoiceSignalPacketDisconnect(peerId));
+	public static void sendPacketDisconnect() {
+		if(protocolVersion <= 3) {
+			packetSendCallback.accept(new CPacketVoiceSignalDisconnectV3EAG());
+		}else {
+			packetSendCallback.accept(new CPacketVoiceSignalDisconnectV4EAG());
+		}
+	}
+
+	public static void sendPacketDisconnectPeer(EaglercraftUUID peerId) {
+		if(protocolVersion <= 3) {
+			packetSendCallback.accept(new CPacketVoiceSignalDisconnectV3EAG(true, peerId.msb, peerId.lsb));
+		}else {
+			packetSendCallback.accept(new CPacketVoiceSignalDisconnectPeerV4EAG(peerId.msb, peerId.lsb));
+		}
 	}
 
 	public static void sendPacketConnect() {
-		packetSendCallback.accept(VoiceSignalPackets.makeVoiceSignalPacketConnect());
+		packetSendCallback.accept(new CPacketVoiceSignalConnectEAG());
 	}
 
 	public static void sendPacketRequest(EaglercraftUUID peerId) {
-		packetSendCallback.accept(VoiceSignalPackets.makeVoiceSignalPacketRequest(peerId));
+		packetSendCallback.accept(new CPacketVoiceSignalRequestEAG(peerId.msb, peerId.lsb));
 	}
 
 	private static void sendPacketRequestIfNeeded(EaglercraftUUID uuid) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceSignalPackets.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceSignalPackets.java
deleted file mode 100755
index 4b474f9..0000000
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceSignalPackets.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.voice;
-
-import java.nio.charset.StandardCharsets;
-
-import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
-import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
-import net.minecraft.network.PacketBuffer;
-
-/**
- * Copyright (c) 2024 lax1dude, ayunami2000. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class VoiceSignalPackets {
-
-	static final int VOICE_SIGNAL_ALLOWED = 0;
-	static final int VOICE_SIGNAL_REQUEST = 0;
-	static final int VOICE_SIGNAL_CONNECT = 1;
-	static final int VOICE_SIGNAL_DISCONNECT = 2;
-	static final int VOICE_SIGNAL_ICE = 3;
-	static final int VOICE_SIGNAL_DESC = 4;
-	static final int VOICE_SIGNAL_GLOBAL = 5;
-
-	static void handleVoiceSignal(PacketBuffer streamIn) {
-		try {
-			int sig = streamIn.readUnsignedByte();
-			switch(sig) {
-				case VOICE_SIGNAL_ALLOWED: {
-					boolean voiceAvailableStat = streamIn.readUnsignedByte() == 1;
-					String[] servs = null;
-					if(voiceAvailableStat) {
-						servs = new String[streamIn.readVarIntFromBuffer()];
-						for(int i = 0; i < servs.length; i++) {
-							servs[i] = streamIn.readStringFromBuffer(1024);
-						}
-					}
-					VoiceClientController.handleVoiceSignalPacketTypeAllowed(voiceAvailableStat, servs);
-					break;
-				}
-				case VOICE_SIGNAL_GLOBAL: {
-					if (VoiceClientController.getVoiceChannel() != EnumVoiceChannelType.GLOBAL) return;
-					EaglercraftUUID[] voiceIds = new EaglercraftUUID[streamIn.readVarIntFromBuffer()];
-					for(int i = 0; i < voiceIds.length; i++) {
-						voiceIds[i] = streamIn.readUuid();
-					}
-					String[] voiceNames = null;
-					if (streamIn.isReadable()) {
-						voiceNames = new String[voiceIds.length];
-						for(int i = 0; i < voiceNames.length; i++) {
-							voiceNames[i] = streamIn.readStringFromBuffer(16);
-						}
-					}
-					VoiceClientController.handleVoiceSignalPacketTypeGlobal(voiceIds, voiceNames);
-					break;
-				}
-				case VOICE_SIGNAL_CONNECT: {
-					EaglercraftUUID uuid = streamIn.readUuid();
-					if (streamIn.isReadable()) {
-						VoiceClientController.handleVoiceSignalPacketTypeConnect(uuid, streamIn.readBoolean());
-					} else if (VoiceClientController.getVoiceChannel() != EnumVoiceChannelType.PROXIMITY || VoiceClientController.getVoiceListening().contains(uuid)) {
-						VoiceClientController.handleVoiceSignalPacketTypeConnectAnnounce(uuid);
-					}
-					break;
-				}
-				case VOICE_SIGNAL_DISCONNECT: {
-					VoiceClientController.handleVoiceSignalPacketTypeDisconnect(streamIn.readableBytes() > 0 ? streamIn.readUuid() : null);
-					break;
-				}
-				case VOICE_SIGNAL_ICE: {
-					VoiceClientController.handleVoiceSignalPacketTypeICECandidate(streamIn.readUuid(), streamIn.readStringFromBuffer(32767));
-					break;
-				}
-				case VOICE_SIGNAL_DESC: {
-					VoiceClientController.handleVoiceSignalPacketTypeDescription(streamIn.readUuid(), streamIn.readStringFromBuffer(32767));
-					break;
-				}
-				default: {
-					VoiceClientController.logger.error("Unknown voice signal packet '{}'!", sig);
-					break;
-				}
-			}
-		}catch(Throwable ex) {
-			VoiceClientController.logger.error("Failed to handle signal packet!");
-			VoiceClientController.logger.error(ex);
-		}
-	}
-
-	static PacketBuffer makeVoiceSignalPacketRequest(EaglercraftUUID user) {
-		PacketBuffer ret = new PacketBuffer(Unpooled.buffer(17, 17));
-		ret.writeByte(VOICE_SIGNAL_REQUEST);
-		ret.writeUuid(user);
-		return ret;
-	}
-
-	static PacketBuffer makeVoiceSignalPacketICE(EaglercraftUUID user, String icePacket) {
-		byte[] str = icePacket.getBytes(StandardCharsets.UTF_8);
-		int estLen = 17 + PacketBuffer.getVarIntSize(str.length) + str.length;
-		PacketBuffer ret = new PacketBuffer(Unpooled.buffer(estLen, estLen));
-		ret.writeByte(VOICE_SIGNAL_ICE);
-		ret.writeUuid(user);
-		ret.writeByteArray(str);
-		return ret;
-	}
-
-	static PacketBuffer makeVoiceSignalPacketDesc(EaglercraftUUID user, String descPacket) {
-		byte[] str = descPacket.getBytes(StandardCharsets.UTF_8);
-		int estLen = 17 + PacketBuffer.getVarIntSize(str.length) + str.length;
-		PacketBuffer ret = new PacketBuffer(Unpooled.buffer(estLen, estLen));
-		ret.writeByte(VOICE_SIGNAL_DESC);
-		ret.writeUuid(user);
-		ret.writeByteArray(str);
-		return ret;
-	}
-
-	static PacketBuffer makeVoiceSignalPacketDisconnect(EaglercraftUUID user) {
-		if (user == null) {
-			PacketBuffer ret = new PacketBuffer(Unpooled.buffer(1, 1));
-			ret.writeByte(VOICE_SIGNAL_DISCONNECT);
-			return ret;
-		}
-		PacketBuffer ret = new PacketBuffer(Unpooled.buffer(17, 17));
-		ret.writeByte(VOICE_SIGNAL_DISCONNECT);
-		ret.writeUuid(user);
-		return ret;
-	}
-
-	public static PacketBuffer makeVoiceSignalPacketConnect() {
-		PacketBuffer ret = new PacketBuffer(Unpooled.buffer(1, 1));
-		ret.writeByte(VOICE_SIGNAL_CONNECT);
-		return ret;
-	}
-}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceTagRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceTagRenderer.java
index e29aec9..afbfdb1 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceTagRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/VoiceTagRenderer.java
@@ -33,7 +33,7 @@ public class VoiceTagRenderer {
 
 	private static final ResourceLocation voiceGuiIcons = new ResourceLocation("eagler:gui/eagler_gui.png");
 
-	private static final Set<EaglercraftUUID> voiceTagsDrawnThisFrame = new HashSet();
+	private static final Set<EaglercraftUUID> voiceTagsDrawnThisFrame = new HashSet<>();
 
 	public static void renderVoiceNameTag(Minecraft mc, EntityOtherPlayerMP player, int offset) {
 		EaglercraftUUID uuid = player.getUniqueID();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenPhishingWaring.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenPhishingWaring.java
new file mode 100755
index 0000000..3ca323f
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenPhishingWaring.java
@@ -0,0 +1,104 @@
+package net.lax1dude.eaglercraft.v1_8.webview;
+
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenPhishingWaring extends GuiScreen {
+
+	public static boolean hasShownMessage = false;
+
+	private static final ResourceLocation beaconGuiTexture = new ResourceLocation("textures/gui/container/beacon.png");
+
+	private GuiScreen cont;
+	private boolean mouseOverCheck;
+	private boolean hasCheckedBox;
+
+	public GuiScreenPhishingWaring(GuiScreen cont) {
+		this.cont = cont;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 134, I18n.format("webviewPhishingWaring.continue")));
+	}
+
+	public void drawScreen(int mx, int my, float pt) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, EnumChatFormatting.BOLD + I18n.format("webviewPhishingWaring.title"), this.width / 2, 70, 0xFF4444);
+		this.drawCenteredString(fontRendererObj, I18n.format("webviewPhishingWaring.text0"), this.width / 2, 90, 16777215);
+		this.drawCenteredString(fontRendererObj, I18n.format("webviewPhishingWaring.text1"), this.width / 2, 102, 16777215);
+		this.drawCenteredString(fontRendererObj, I18n.format("webviewPhishingWaring.text2"), this.width / 2, 114, 16777215);
+		
+		String dontShowAgain = I18n.format("webviewPhishingWaring.dontShowAgain");
+		int w = fontRendererObj.getStringWidth(dontShowAgain) + 20;
+		int ww = (this.width - w) / 2;
+		this.drawString(fontRendererObj, dontShowAgain, ww + 20, 137, 0xCCCCCC);
+		
+		mouseOverCheck = ww < mx && ww + 17 > mx && 133 < my && 150 > my;
+		
+		if(mouseOverCheck) {
+			GlStateManager.color(0.7f, 0.7f, 1.0f, 1.0f);
+		}else {
+			GlStateManager.color(0.6f, 0.6f, 0.6f, 1.0f);
+		}
+		
+		mc.getTextureManager().bindTexture(beaconGuiTexture);
+		
+		GlStateManager.pushMatrix();
+		GlStateManager.scale(0.75f, 0.75f, 0.75f);
+		drawTexturedModalRect(ww * 4 / 3, 133 * 4 / 3, 22, 219, 22, 22);
+		GlStateManager.popMatrix();
+		
+		if(hasCheckedBox) {
+			GlStateManager.pushMatrix();
+			GlStateManager.color(1.1f, 1.1f, 1.1f, 1.0f);
+			GlStateManager.translate(0.5f, 0.5f, 0.0f);
+			drawTexturedModalRect(ww, 133, 90, 222, 16, 16);
+			GlStateManager.popMatrix();
+		}
+		
+		super.drawScreen(mx, my, pt);
+	}
+
+	protected void actionPerformed(GuiButton par1GuiButton) {
+		if(par1GuiButton.id == 0) {
+			if(hasCheckedBox && !mc.gameSettings.hasHiddenPhishWarning) {
+				mc.gameSettings.hasHiddenPhishWarning = true;
+				mc.gameSettings.saveOptions();
+			}
+			hasShownMessage = true;
+			mc.displayGuiScreen(cont);
+		}
+	}
+
+	@Override
+	protected void mouseClicked(int mx, int my, int btn) {
+		if(btn == 0 && mouseOverCheck) {
+			hasCheckedBox = !hasCheckedBox;
+			mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+			return;
+		}
+		super.mouseClicked(mx, my, btn);
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenRecieveServerInfo.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenRecieveServerInfo.java
new file mode 100755
index 0000000..42dafd9
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenRecieveServerInfo.java
@@ -0,0 +1,203 @@
+package net.lax1dude.eaglercraft.v1_8.webview;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
+import net.lax1dude.eaglercraft.v1_8.IOUtils;
+import net.lax1dude.eaglercraft.v1_8.crypto.SHA1Digest;
+import net.lax1dude.eaglercraft.v1_8.internal.WebViewOptions;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketRequestServerInfoV4EAG;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenRecieveServerInfo extends GuiScreen {
+
+	private static final Logger logger = LogManager.getLogger("GuiScreenRecieveServerInfo");
+
+	protected final GuiScreen parent;
+	protected final byte[] expectHash;
+	protected int timer;
+	protected int timer2;
+	protected String statusString = "recieveServerInfo.checkingCache";
+
+	public GuiScreenRecieveServerInfo(GuiScreen parent, byte[] expectHash) {
+		this.parent = parent;
+		this.expectHash = expectHash;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 106, I18n.format("gui.cancel")));
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, I18n.format("recieveServerInfo.title"), this.width / 2, 70, 11184810);
+		this.drawCenteredString(fontRendererObj, I18n.format(statusString), this.width / 2, 90, 16777215);
+		if(Arrays.equals(ServerInfoCache.chunkRecieveHash, expectHash) && ServerInfoCache.chunkFinalSize > 0) {
+			int progress = ServerInfoCache.chunkCurrentSize * 100 / ServerInfoCache.chunkFinalSize;
+			if(progress < 0) progress = 0;
+			if(progress > 100) progress = 100;
+			if(ServerInfoCache.hasLastChunk) {
+				progress = 100;
+			}
+			Tessellator tessellator = Tessellator.getInstance();
+			WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+			byte b0 = 100;
+			byte b1 = 2;
+			int i1 = width / 2 - b0 / 2;
+			int j1 = 103;
+			GlStateManager.disableTexture2D();
+			worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
+			worldrenderer.pos((double) i1, (double) j1, 0.0D).color(128, 128, 128, 255).endVertex();
+			worldrenderer.pos((double) i1, (double) (j1 + b1), 0.0D).color(128, 128, 128, 255).endVertex();
+			worldrenderer.pos((double) (i1 + b0), (double) (j1 + b1), 0.0D).color(128, 128, 128, 255)
+					.endVertex();
+			worldrenderer.pos((double) (i1 + b0), (double) j1, 0.0D).color(128, 128, 128, 255).endVertex();
+			worldrenderer.pos((double) i1, (double) j1, 0.0D).color(128, 255, 128, 255).endVertex();
+			worldrenderer.pos((double) i1, (double) (j1 + b1), 0.0D).color(128, 255, 128, 255).endVertex();
+			worldrenderer.pos((double) (i1 + progress), (double) (j1 + b1), 0.0D).color(128, 255, 128, 255)
+					.endVertex();
+			worldrenderer.pos((double) (i1 + progress), (double) j1, 0.0D).color(128, 255, 128, 255)
+					.endVertex();
+			tessellator.draw();
+			GlStateManager.enableTexture2D();
+		}
+		super.drawScreen(par1, par2, par3);
+	}
+
+	public void actionPerformed(GuiButton button) {
+		if(button.id == 0) {
+			mc.displayGuiScreen(parent);
+		}
+	}
+
+	public void updateScreen() {
+		if(mc.thePlayer == null) {
+			mc.displayGuiScreen(parent);
+			return;
+		}
+		++timer;
+		if(timer == 1) {
+			byte[] data = ServerInfoCache.loadFromCache(expectHash);
+			if(data != null) {
+				mc.displayGuiScreen(GuiScreenServerInfo.createForCurrentState(parent, data, WebViewOptions.getEmbedOriginUUID(expectHash)));
+			}else {
+				byte[] b = mc.thePlayer.sendQueue.cachedServerInfoData;
+				if(b != null) {
+					if(b.length == 0) {
+						mc.displayGuiScreen(new GuiScreenGenericErrorMessage("serverInfoFailure.title", "serverInfoFailure.desc", parent));
+					}else {
+						ServerInfoCache.storeInCache(expectHash, b);
+						mc.displayGuiScreen(GuiScreenServerInfo.createForCurrentState(parent, b, WebViewOptions.getEmbedOriginUUID(expectHash)));
+					}
+				}else {
+					statusString = "recieveServerInfo.contactingServer";
+					if(!mc.thePlayer.sendQueue.hasRequestedServerInfo) {
+						if(!ServerInfoCache.hasLastChunk || !Arrays.equals(ServerInfoCache.chunkRecieveHash, expectHash)) {
+							ServerInfoCache.clearDownload();
+							mc.thePlayer.sendQueue.sendEaglerMessage(new CPacketRequestServerInfoV4EAG(expectHash));
+							mc.thePlayer.sendQueue.hasRequestedServerInfo = true;
+						}
+					}
+				}
+			}
+		}else if(timer > 1) {
+			if(Arrays.equals(ServerInfoCache.chunkRecieveHash, expectHash)) {
+				if(ServerInfoCache.hasLastChunk) {
+					statusString = "recieveServerInfo.decompressing";
+					++timer2;
+					if(timer2 == 2) {
+						byte[] finalData = new byte[ServerInfoCache.chunkCurrentSize];
+						int i = 0;
+						for(byte[] b : ServerInfoCache.chunkRecieveBuffer) {
+							System.arraycopy(b, 0, finalData, i, b.length);
+							i += b.length;
+						}
+						if(i != ServerInfoCache.chunkCurrentSize) {
+							logger.error("An unknown error occured!");
+							mc.thePlayer.sendQueue.cachedServerInfoData = new byte[0];
+							mc.displayGuiScreen(new GuiScreenGenericErrorMessage("serverInfoFailure.title", "serverInfoFailure.desc", parent));
+							return;
+						}
+						ServerInfoCache.clearDownload();
+						try {
+							EaglerInputStream bis = new EaglerInputStream(finalData);
+							int finalSize = (new DataInputStream(bis)).readInt();
+							if(finalSize < 0) {
+								logger.error("The response data was corrupt, decompressed size is negative!");
+								mc.thePlayer.sendQueue.cachedServerInfoData = new byte[0];
+								mc.displayGuiScreen(new GuiScreenGenericErrorMessage("serverInfoFailure.title", "serverInfoFailure.desc", parent));
+								return;
+							}
+							if(finalSize > ServerInfoCache.CACHE_MAX_SIZE * 2) {
+								logger.error("Failed to decompress/verify server info response! Size is massive, {} " + finalSize + " bytes reported!");
+								logger.error("Aborting decompression. Rejoin the server to try again.");
+								mc.thePlayer.sendQueue.cachedServerInfoData = new byte[0];
+								mc.displayGuiScreen(new GuiScreenGenericErrorMessage("serverInfoFailure.title", "serverInfoFailure.desc", parent));
+								return;
+							}
+							byte[] decompressed = new byte[finalSize];
+							try(InputStream is = EaglerZLIB.newGZIPInputStream(bis)) {
+								IOUtils.readFully(is, decompressed);
+							}
+							SHA1Digest digest = new SHA1Digest();
+							digest.update(decompressed, 0, decompressed.length);
+							byte[] csum = new byte[20];
+							digest.doFinal(csum, 0);
+							if(Arrays.equals(csum, expectHash)) {
+								ServerInfoCache.storeInCache(csum, decompressed);
+								mc.thePlayer.sendQueue.cachedServerInfoData = decompressed;
+								mc.displayGuiScreen(GuiScreenServerInfo.createForCurrentState(parent, decompressed, WebViewOptions.getEmbedOriginUUID(expectHash)));
+							}else {
+								logger.error("The data recieved from the server did not have the correct SHA1 checksum! Rejoin the server to try again.");
+								mc.thePlayer.sendQueue.cachedServerInfoData = new byte[0];
+								mc.displayGuiScreen(new GuiScreenGenericErrorMessage("serverInfoFailure.title", "serverInfoFailure.desc", parent));
+							}
+						}catch(IOException ex) {
+							logger.error("Failed to decompress/verify server info response! Rejoin the server to try again.");
+							logger.error(ex);
+							mc.thePlayer.sendQueue.cachedServerInfoData = new byte[0];
+							mc.displayGuiScreen(new GuiScreenGenericErrorMessage("serverInfoFailure.title", "serverInfoFailure.desc", parent));
+						}
+					}
+				}else {
+					statusString = "recieveServerInfo.recievingData";
+				}
+			}else {
+				statusString = "recieveServerInfo.contactingServer";
+			}
+		}
+	}
+
+	protected boolean isPartOfPauseMenu() {
+		return true;
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenServerInfo.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenServerInfo.java
new file mode 100755
index 0000000..6da3305
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenServerInfo.java
@@ -0,0 +1,128 @@
+package net.lax1dude.eaglercraft.v1_8.webview;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.PauseMenuCustomizeState;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumWebViewContentMode;
+import net.lax1dude.eaglercraft.v1_8.internal.WebViewOptions;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenServerInfo extends GuiScreen {
+
+	private static final Logger logger = LogManager.getLogger("GuiScreenServerInfo");
+
+	private final GuiScreen parent;
+	private final WebViewOptions opts;
+	private boolean isShowing = false;
+
+	public GuiScreenServerInfo(GuiScreen parent, WebViewOptions opts) {
+		this.parent = parent;
+		this.opts = opts;
+	}
+
+	public static GuiScreen createForCurrentState(GuiScreen parent, String url) {
+		URI urlObj;
+		try {
+			urlObj = new URI(url);
+		}catch(URISyntaxException ex) {
+			logger.error("Refusing to iframe an invalid URL: {}", url);
+			logger.error(ex);
+			return new GuiScreenGenericErrorMessage("webviewInvalidURL.title", "webviewInvalidURL.desc", parent);
+		}
+		return createForCurrentState(parent, urlObj);
+	}
+
+	public static GuiScreen createForCurrentState(GuiScreen parent, URI url) {
+		boolean support = WebViewOverlayController.supported();
+		boolean fallbackSupport = WebViewOverlayController.fallbackSupported();
+		if(!support && !fallbackSupport) {
+			return new GuiScreenGenericErrorMessage("webviewNotSupported.title", "webviewNotSupported.desc", parent);
+		}
+		WebViewOptions opts = new WebViewOptions();
+		opts.contentMode = EnumWebViewContentMode.URL_BASED;
+		opts.url = url;
+		setupState(opts);
+		opts.permissionsOriginUUID = WebViewOptions.getURLOriginUUID(url);
+		return support ? new GuiScreenServerInfo(parent, opts) : new GuiScreenServerInfoDesktop(parent, opts);
+	}
+
+	public static GuiScreen createForCurrentState(GuiScreen parent, byte[] blob, EaglercraftUUID permissionsOriginUUID) {
+		boolean support = WebViewOverlayController.supported();
+		boolean fallbackSupport = WebViewOverlayController.fallbackSupported();
+		if(!support && !fallbackSupport) {
+			return new GuiScreenGenericErrorMessage("webviewNotSupported.title", "webviewNotSupported.desc", parent);
+		}
+		WebViewOptions opts = new WebViewOptions();
+		opts.contentMode = EnumWebViewContentMode.BLOB_BASED;
+		opts.blob = blob;
+		setupState(opts);
+		opts.permissionsOriginUUID = permissionsOriginUUID;
+		return support ? new GuiScreenServerInfo(parent, opts) : new GuiScreenServerInfoDesktop(parent, opts);
+	}
+
+	public static void setupState(WebViewOptions opts) {
+		opts.scriptEnabled = (PauseMenuCustomizeState.serverInfoEmbedPerms & PauseMenuCustomizeState.SERVER_INFO_EMBED_PERMS_JAVASCRIPT) != 0;
+		opts.strictCSPEnable = (PauseMenuCustomizeState.serverInfoEmbedPerms & PauseMenuCustomizeState.SERVER_INFO_EMBED_PERMS_STRICT_CSP) != 0;
+		opts.serverMessageAPIEnabled = (PauseMenuCustomizeState.serverInfoEmbedPerms & PauseMenuCustomizeState.SERVER_INFO_EMBED_PERMS_MESSAGE_API) != 0;
+		opts.fallbackTitle = PauseMenuCustomizeState.serverInfoEmbedTitle;
+	}
+
+	public void initGui() {
+		ScaledResolution res = mc.scaledResolution;
+		if(!isShowing) {
+			isShowing = true;
+			WebViewOverlayController.beginShowingSmart(opts, res, 30, 30, width - 60, height - 60);
+		}else {
+			WebViewOverlayController.resizeSmart(res, 30, 30, width - 60, height - 60);
+		}
+		buttonList.clear();
+		buttonList.add(new GuiButton(0, (width - 200) / 2, height - 25, I18n.format("gui.done")));
+	}
+
+	public void onGuiClosed() {
+		if(isShowing) {
+			isShowing = false;
+			WebViewOverlayController.endShowing();
+		}
+	}
+
+	public void actionPerformed(GuiButton btn) {
+		if(btn.id == 0) {
+			mc.displayGuiScreen(parent);
+		}
+	}
+
+	public void drawScreen(int mx, int my, float pt) {
+		drawDefaultBackground();
+		drawCenteredString(fontRendererObj, PauseMenuCustomizeState.serverInfoEmbedTitle == null ? "Server Info"
+				: PauseMenuCustomizeState.serverInfoEmbedTitle, width / 2, 13, 0xFFFFFF);
+		super.drawScreen(mx, my, pt);
+	}
+
+	protected boolean isPartOfPauseMenu() {
+		return true;
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenServerInfoDesktop.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenServerInfoDesktop.java
new file mode 100755
index 0000000..6bcd667
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenServerInfoDesktop.java
@@ -0,0 +1,92 @@
+package net.lax1dude.eaglercraft.v1_8.webview;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.PauseMenuCustomizeState;
+import net.lax1dude.eaglercraft.v1_8.internal.WebViewOptions;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenServerInfoDesktop extends GuiScreen {
+
+	private final GuiScreen parent;
+	private final WebViewOptions opts;
+
+	private int timer = 0;
+	private boolean hasStarted = false;
+
+	private GuiButton btnOpen;
+
+	public GuiScreenServerInfoDesktop(GuiScreen parent, WebViewOptions opts) {
+		this.parent = parent;
+		this.opts = opts;
+	}
+
+	public void initGui() {
+		buttonList.clear();
+		buttonList.add(btnOpen = new GuiButton(0, (width - 200) / 2, height / 6 + 110, I18n.format("fallbackWebViewScreen.openButton")));
+		btnOpen.enabled = false;
+		buttonList.add(new GuiButton(1, (width - 200) / 2, height / 6 + 140, I18n.format("fallbackWebViewScreen.exitButton")));
+	}
+
+	public void updateScreen() {
+		++timer;
+		if(timer == 2) {
+			WebViewOverlayController.endFallbackServer();
+			WebViewOverlayController.launchFallback(opts);
+		}else if(timer > 2) {
+			if(WebViewOverlayController.fallbackRunning()) {
+				btnOpen.enabled = WebViewOverlayController.getFallbackURL() != null;
+				hasStarted = true;
+			}else {
+				btnOpen.enabled = false;
+			}
+		}
+	}
+
+	public void actionPerformed(GuiButton button) {
+		if(button.id == 0) {
+			String link = WebViewOverlayController.getFallbackURL();
+			if(link != null) {
+				EagRuntime.openLink(link);
+			}
+		}else if(button.id == 1) {
+			mc.displayGuiScreen(parent);
+		}
+	}
+
+	public void onGuiClosed() {
+		WebViewOverlayController.endFallbackServer();
+	}
+
+	public void drawScreen(int mx, int my, float pt) {
+		drawDefaultBackground();
+		drawCenteredString(fontRendererObj, PauseMenuCustomizeState.serverInfoEmbedTitle, this.width / 2, 70, 16777215);
+		drawCenteredString(fontRendererObj, I18n.format("fallbackWebViewScreen.text0"), this.width / 2, 90, 11184810);
+		String link = WebViewOverlayController.fallbackRunning() ? WebViewOverlayController.getFallbackURL()
+				: I18n.format(hasStarted ? "fallbackWebViewScreen.exited" : "fallbackWebViewScreen.startingUp");
+		drawCenteredString(fontRendererObj, link != null ? link : I18n.format("fallbackWebViewScreen.pleaseWait"),
+				width / 2, 110, 16777215);
+		super.drawScreen(mx, my, pt);
+	}
+
+	protected boolean isPartOfPauseMenu() {
+		return true;
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/PermissionsCache.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/PermissionsCache.java
new file mode 100755
index 0000000..5892205
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/PermissionsCache.java
@@ -0,0 +1,64 @@
+package net.lax1dude.eaglercraft.v1_8.webview;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PermissionsCache {
+
+	public static class Permission {
+
+		public final int perm;
+		public final boolean choice;
+
+		private Permission(int perm, boolean choice) {
+			this.perm = perm;
+			this.choice = choice;
+		}
+
+	}
+
+	private static final Map<EaglercraftUUID,Permission> javaScriptAllowed = new HashMap<>();
+
+	public static Permission getJavaScriptAllowed(EaglercraftUUID uuid, int flags) {
+		synchronized(javaScriptAllowed) {
+			if(uuid == null) {
+				return null;
+			}
+			Permission p = javaScriptAllowed.get(uuid);
+			if(p == null) {
+				return null;
+			}
+			return (p.perm | flags) != p.perm ? null : p;
+		}
+	}
+
+	public static void setJavaScriptAllowed(EaglercraftUUID uuid, int flags, boolean allowed) {
+		synchronized(javaScriptAllowed) {
+			if(uuid != null) javaScriptAllowed.put(uuid, new Permission(flags, allowed));
+		}
+	}
+
+	public static void clearJavaScriptAllowed(EaglercraftUUID uuid) {
+		synchronized(javaScriptAllowed) {
+			if(uuid != null) javaScriptAllowed.remove(uuid);
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/ServerInfoCache.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/ServerInfoCache.java
new file mode 100755
index 0000000..018d94e
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/ServerInfoCache.java
@@ -0,0 +1,130 @@
+package net.lax1dude.eaglercraft.v1_8.webview;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.HashKey;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketServerInfoDataChunkV4EAG;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ServerInfoCache {
+
+	public static final int CACHE_MAX_SIZE = 0x200000; // 2 MB
+
+	private static final Map<HashKey,CacheEntry> cache = new HashMap<>();
+	private static int cacheSize = 0;
+
+	private static class CacheEntry {
+
+		private final byte[] data;
+		private final HashKey hash;
+		private long lastHit;
+
+		private CacheEntry(byte[] data, HashKey hash) {
+			this.data = data;
+			this.hash = hash;
+			this.lastHit = EagRuntime.steadyTimeMillis();
+		}
+
+	}
+
+	protected static final List<byte[]> chunkRecieveBuffer = new LinkedList<>();
+	protected static byte[] chunkRecieveHash = null;
+	protected static int chunkCurrentSize = 0;
+	protected static int chunkFinalSize = 0;
+	protected static boolean hasLastChunk = false;
+
+	public static void handleChunk(SPacketServerInfoDataChunkV4EAG chunk) {
+		//System.out.println("p: " + chunk.seqId + " " + chunk.finalSize + " " + Base64.encodeBase64String(chunk.finalHash) + " " + chunk.lastChunk);
+		if (chunkRecieveHash == null || hasLastChunk || !Arrays.equals(chunk.finalHash, chunkRecieveHash)
+				|| chunk.seqId != chunkRecieveBuffer.size()) {
+			chunkRecieveBuffer.clear();
+			hasLastChunk = false;
+			chunkRecieveHash = null;
+			chunkCurrentSize = 0;
+			chunkFinalSize = 0;
+			if(chunk.seqId != 0) {
+				return;
+			}
+			chunkRecieveHash = chunk.finalHash;
+		}
+		chunkRecieveBuffer.add(chunk.data);
+		chunkCurrentSize += chunk.data.length;
+		chunkFinalSize = chunk.finalSize;
+		hasLastChunk = chunk.lastChunk;
+	}
+
+	public static void clearDownload() {
+		chunkRecieveBuffer.clear();
+		hasLastChunk = false;
+		chunkRecieveHash = null;
+		chunkCurrentSize = 0;
+		chunkFinalSize = 0;
+	}
+
+	public static byte[] loadFromCache(byte[] hash) {
+		if(hash == null || hash.length != 20) {
+			return null;
+		}
+		CacheEntry etr = cache.get(new HashKey(hash));
+		if(etr != null) {
+			etr.lastHit = EagRuntime.steadyTimeMillis();
+			return etr.data;
+		}else {
+			return null;
+		}
+	}
+
+	public static void storeInCache(byte[] hash, byte[] data) {
+		if(hash == null || hash.length != 20 || data == null) {
+			return;
+		}
+		HashKey hashObj = new HashKey(hash);
+		if(cache.containsKey(hashObj)) {
+			return;
+		}
+		shrink(data.length);
+		cache.put(hashObj, new CacheEntry(data, hashObj));
+		cacheSize += data.length;
+	}
+
+	private static void shrink(int toAdd) {
+		if(toAdd > CACHE_MAX_SIZE) {
+			cache.clear();
+			cacheSize = 0;
+			return;
+		}
+		while(!cache.isEmpty() && cacheSize + toAdd > CACHE_MAX_SIZE) {
+			CacheEntry oldest = null;
+			for(CacheEntry e : cache.values()) {
+				if(oldest == null || e.lastHit < oldest.lastHit) {
+					oldest = e;
+				}
+			}
+			if(cache.remove(oldest.hash) != null) {
+				cacheSize -= oldest.data.length;
+			}else {
+				break; //wtf?
+			}
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/WebViewOverlayController.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/WebViewOverlayController.java
new file mode 100755
index 0000000..6779441
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/WebViewOverlayController.java
@@ -0,0 +1,92 @@
+package net.lax1dude.eaglercraft.v1_8.webview;
+
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebView;
+import net.lax1dude.eaglercraft.v1_8.internal.WebViewOptions;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketWebViewMessageV4EAG;
+import net.minecraft.client.gui.ScaledResolution;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class WebViewOverlayController {
+
+	public static boolean supported() {
+		return PlatformWebView.supported();
+	}
+
+	public static boolean isShowing() {
+		return PlatformWebView.isShowing();
+	}
+
+	public static void beginShowing(WebViewOptions options, int x, int y, int w, int h) {
+		PlatformWebView.beginShowing(options, x, y, w, h);
+	}
+
+	public static void resize(int x, int y, int w, int h) {
+		PlatformWebView.resize(x, y, w, h);
+	}
+
+	public static void beginShowingSmart(WebViewOptions options, ScaledResolution res, int x, int y, int w, int h) {
+		int fac = res.getScaleFactor();
+		PlatformWebView.beginShowing(options, x * fac, y * fac, w * fac, h * fac);
+	}
+
+	public static void resizeSmart(ScaledResolution res, int x, int y, int w, int h) {
+		int fac = res.getScaleFactor();
+		PlatformWebView.resize(x * fac, y * fac, w * fac, h * fac);
+	}
+
+	public static void endShowing() {
+		PlatformWebView.endShowing();
+	}
+
+	public static boolean fallbackSupported() {
+		return PlatformWebView.fallbackSupported();
+	}
+
+	public static void launchFallback(WebViewOptions options) {
+		PlatformWebView.launchFallback(options);
+	}
+
+	public static boolean fallbackRunning() {
+		return PlatformWebView.fallbackRunning();
+	}
+
+	public static String getFallbackURL() {
+		return PlatformWebView.getFallbackURL();
+	}
+
+	public static void endFallbackServer() {
+		PlatformWebView.endFallbackServer();
+	}
+
+	public static void handleMessagePacket(SPacketWebViewMessageV4EAG packet) {
+		PlatformWebView.handleMessageFromServer(packet);
+	}
+
+	public static interface IPacketSendCallback {
+		boolean sendPacket(GameMessagePacket packet);
+	}
+
+	public static void setPacketSendCallback(IPacketSendCallback callback) {
+		PlatformWebView.setPacketSendCallback(callback);
+	}
+
+	public static void runTick() {
+		PlatformWebView.runTick();
+	}
+
+}
diff --git a/src/main/java/net/minecraft/profiler/Profiler.java b/src/main/java/net/minecraft/profiler/Profiler.java
deleted file mode 100755
index 83e330c..0000000
--- a/src/main/java/net/minecraft/profiler/Profiler.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package net.minecraft.profiler;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
-import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-
-/**+
- * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
- * 
- * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!"
- * Mod Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team
- * 
- * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class Profiler {
-	private static final Logger logger = LogManager.getLogger();
-	/**+
-	 * List of parent sections
-	 */
-	private final List<String> sectionList = Lists.newArrayList();
-	/**+
-	 * List of timestamps (System.nanoTime)
-	 */
-	private final List<Long> timestampList = Lists.newArrayList();
-	public boolean profilingEnabled;
-	/**+
-	 * Current profiling section
-	 */
-	private String profilingSection = "";
-	private final Map<String, Long> profilingMap = Maps.newHashMap();
-
-	/**+
-	 * Clear profiling.
-	 */
-	public void clearProfiling() {
-		this.profilingMap.clear();
-		this.profilingSection = "";
-		this.sectionList.clear();
-	}
-
-	/**+
-	 * Start section
-	 */
-	public void startSection(String name) {
-		if (this.profilingEnabled) {
-			if (this.profilingSection.length() > 0) {
-				this.profilingSection = this.profilingSection + ".";
-			}
-
-			this.profilingSection = this.profilingSection + name;
-			this.sectionList.add(this.profilingSection);
-			this.timestampList.add(Long.valueOf(System.nanoTime()));
-		}
-	}
-
-	/**+
-	 * End section
-	 */
-	public void endSection() {
-		if (this.profilingEnabled) {
-			long i = System.nanoTime();
-			long j = ((Long) this.timestampList.remove(this.timestampList.size() - 1)).longValue();
-			this.sectionList.remove(this.sectionList.size() - 1);
-			long k = i - j;
-			if (this.profilingMap.containsKey(this.profilingSection)) {
-				this.profilingMap.put(this.profilingSection,
-						Long.valueOf(((Long) this.profilingMap.get(this.profilingSection)).longValue() + k));
-			} else {
-				this.profilingMap.put(this.profilingSection, Long.valueOf(k));
-			}
-
-			if (k > 100000000L) {
-				logger.warn("Something\'s taking too long! \'" + this.profilingSection + "\' took aprox "
-						+ (double) k / 1000000.0D + " ms");
-			}
-
-			this.profilingSection = !this.sectionList.isEmpty()
-					? (String) this.sectionList.get(this.sectionList.size() - 1)
-					: "";
-		}
-	}
-
-	/**+
-	 * Get profiling data
-	 */
-	public List<Profiler.Result> getProfilingData(String parString1) {
-		if (!this.profilingEnabled) {
-			return null;
-		} else {
-			long i = this.profilingMap.containsKey("root") ? ((Long) this.profilingMap.get("root")).longValue() : 0L;
-			long j = this.profilingMap.containsKey(parString1) ? ((Long) this.profilingMap.get(parString1)).longValue()
-					: -1L;
-			ArrayList arraylist = Lists.newArrayList();
-			if (parString1.length() > 0) {
-				parString1 = parString1 + ".";
-			}
-
-			long k = 0L;
-
-			for (String s : this.profilingMap.keySet()) {
-				if (s.length() > parString1.length() && s.startsWith(parString1)
-						&& s.indexOf(".", parString1.length() + 1) < 0) {
-					k += ((Long) this.profilingMap.get(s)).longValue();
-				}
-			}
-
-			float f = (float) k;
-			if (k < j) {
-				k = j;
-			}
-
-			if (i < k) {
-				i = k;
-			}
-
-			for (String s1 : this.profilingMap.keySet()) {
-				if (s1.length() > parString1.length() && s1.startsWith(parString1)
-						&& s1.indexOf(".", parString1.length() + 1) < 0) {
-					long l = ((Long) this.profilingMap.get(s1)).longValue();
-					double d0 = (double) l * 100.0D / (double) k;
-					double d1 = (double) l * 100.0D / (double) i;
-					String s2 = s1.substring(parString1.length());
-					arraylist.add(new Profiler.Result(s2, d0, d1));
-				}
-			}
-
-			for (String s3 : this.profilingMap.keySet()) {
-				this.profilingMap.put(s3, Long.valueOf(((Long) this.profilingMap.get(s3)).longValue() * 999L / 1000L));
-			}
-
-			if ((float) k > f) {
-				arraylist.add(new Profiler.Result("unspecified", (double) ((float) k - f) * 100.0D / (double) k,
-						(double) ((float) k - f) * 100.0D / (double) i));
-			}
-
-			Collections.sort(arraylist);
-			arraylist.add(0, new Profiler.Result(parString1, 100.0D, (double) k * 100.0D / (double) i));
-			return arraylist;
-		}
-	}
-
-	/**+
-	 * End current section and start a new section
-	 */
-	public void endStartSection(String name) {
-		this.endSection();
-		this.startSection(name);
-	}
-
-	public String getNameOfLastSection() {
-		return this.sectionList.size() == 0 ? "[UNKNOWN]" : (String) this.sectionList.get(this.sectionList.size() - 1);
-	}
-
-	public static final class Result implements Comparable<Profiler.Result> {
-		public double field_76332_a;
-		public double field_76330_b;
-		public String field_76331_c;
-
-		public Result(String parString1, double parDouble1, double parDouble2) {
-			this.field_76331_c = parString1;
-			this.field_76332_a = parDouble1;
-			this.field_76330_b = parDouble2;
-		}
-
-		public int compareTo(Profiler.Result profiler$result) {
-			return profiler$result.field_76332_a < this.field_76332_a ? -1
-					: (profiler$result.field_76332_a > this.field_76332_a ? 1
-							: profiler$result.field_76331_c.compareTo(this.field_76331_c));
-		}
-
-		public int func_76329_a() {
-			return (this.field_76331_c.hashCode() & 11184810) + 4473924;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index e1719b7..14f88e8 100755
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -149,11 +149,40 @@ public class JSONArray implements Iterable<Object> {
      *            A Collection.
      */
     public JSONArray(Collection<?> collection) {
+      this(collection, 0, new JSONParserConfiguration());
+    }
+
+    /**
+     * Construct a JSONArray from a Collection.
+     *
+     * @param collection
+     *            A Collection.
+     * @param jsonParserConfiguration
+     *            Configuration object for the JSON parser
+     */
+    public JSONArray(Collection<?> collection, JSONParserConfiguration jsonParserConfiguration) {
+        this(collection, 0, jsonParserConfiguration);
+    }
+
+    /**
+     * Construct a JSONArray from a collection with recursion depth.
+     *
+     * @param collection
+     *             A Collection.
+     * @param recursionDepth
+     *             Variable for tracking the count of nested object creations.
+     * @param jsonParserConfiguration
+     *             Configuration object for the JSON parser
+     */
+    JSONArray(Collection<?> collection, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
+        if (recursionDepth > jsonParserConfiguration.getMaxNestingDepth()) {
+          throw new JSONException("JSONArray has reached recursion depth limit of " + jsonParserConfiguration.getMaxNestingDepth());
+        }
         if (collection == null) {
             this.myArrayList = new ArrayList<Object>();
         } else {
             this.myArrayList = new ArrayList<Object>(collection.size());
-            this.addAll(collection, true);
+            this.addAll(collection, true, recursionDepth, jsonParserConfiguration);
         }
     }
 
@@ -205,7 +234,7 @@ public class JSONArray implements Iterable<Object> {
             throw new JSONException(
                     "JSONArray initial value should be a string or collection or array.");
         }
-        this.addAll(array, true);
+        this.addAll(array, true, 0);
     }
 
     /**
@@ -599,6 +628,38 @@ public class JSONArray implements Iterable<Object> {
         }
     }
 
+    /**
+     * Get the optional Boolean object associated with an index. It returns false
+     * if there is no value at that index, or if the value is not Boolean.TRUE
+     * or the String "true".
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @return The truth.
+     */
+    public Boolean optBooleanObject(int index) {
+        return this.optBooleanObject(index, false);
+    }
+
+    /**
+     * Get the optional Boolean object associated with an index. It returns the
+     * defaultValue if there is no value at that index or if it is not a Boolean
+     * or the String "true" or "false" (case insensitive).
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @param defaultValue
+     *            A boolean default.
+     * @return The truth.
+     */
+    public Boolean optBooleanObject(int index, Boolean defaultValue) {
+        try {
+            return this.getBoolean(index);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
     /**
      * Get the optional double value associated with an index. NaN is returned
      * if there is no value for the index, or if the value is not a number and
@@ -635,6 +696,42 @@ public class JSONArray implements Iterable<Object> {
         return doubleValue;
     }
 
+    /**
+     * Get the optional Double object associated with an index. NaN is returned
+     * if there is no value for the index, or if the value is not a number and
+     * cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @return The object.
+     */
+    public Double optDoubleObject(int index) {
+        return this.optDoubleObject(index, Double.NaN);
+    }
+
+    /**
+     * Get the optional double value associated with an index. The defaultValue
+     * is returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param index
+     *            subscript
+     * @param defaultValue
+     *            The default object.
+     * @return The object.
+     */
+    public Double optDoubleObject(int index, Double defaultValue) {
+        final Number val = this.optNumber(index, null);
+        if (val == null) {
+            return defaultValue;
+        }
+        final Double doubleValue = val.doubleValue();
+        // if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) {
+        // return defaultValue;
+        // }
+        return doubleValue;
+    }
+
     /**
      * Get the optional float value associated with an index. NaN is returned
      * if there is no value for the index, or if the value is not a number and
@@ -671,6 +768,42 @@ public class JSONArray implements Iterable<Object> {
         return floatValue;
     }
 
+    /**
+     * Get the optional Float object associated with an index. NaN is returned
+     * if there is no value for the index, or if the value is not a number and
+     * cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @return The object.
+     */
+    public Float optFloatObject(int index) {
+        return this.optFloatObject(index, Float.NaN);
+    }
+
+    /**
+     * Get the optional Float object associated with an index. The defaultValue
+     * is returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param index
+     *            subscript
+     * @param defaultValue
+     *            The default object.
+     * @return The object.
+     */
+    public Float optFloatObject(int index, Float defaultValue) {
+        final Number val = this.optNumber(index, null);
+        if (val == null) {
+            return defaultValue;
+        }
+        final Float floatValue = val.floatValue();
+        // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) {
+        // return floatValue;
+        // }
+        return floatValue;
+    }
+
     /**
      * Get the optional int value associated with an index. Zero is returned if
      * there is no value for the index, or if the value is not a number and
@@ -703,6 +836,38 @@ public class JSONArray implements Iterable<Object> {
         return val.intValue();
     }
 
+    /**
+     * Get the optional Integer object associated with an index. Zero is returned if
+     * there is no value for the index, or if the value is not a number and
+     * cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @return The object.
+     */
+    public Integer optIntegerObject(int index) {
+        return this.optIntegerObject(index, 0);
+    }
+
+    /**
+     * Get the optional Integer object associated with an index. The defaultValue is
+     * returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @param defaultValue
+     *            The default object.
+     * @return The object.
+     */
+    public Integer optIntegerObject(int index, Integer defaultValue) {
+        final Number val = this.optNumber(index, null);
+        if (val == null) {
+            return defaultValue;
+        }
+        return val.intValue();
+    }
+
     /**
      * Get the enum value associated with a key.
      * 
@@ -788,30 +953,57 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional JSONArray associated with an index.
+     * Get the optional JSONArray associated with an index. Null is returned if
+     * there is no value at that index or if the value is not a JSONArray.
      *
      * @param index
-     *            subscript
-     * @return A JSONArray value, or null if the index has no value, or if the
-     *         value is not a JSONArray.
+     *            The index must be between 0 and length() - 1.
+     * @return A JSONArray value.
      */
     public JSONArray optJSONArray(int index) {
-        Object o = this.opt(index);
-        return o instanceof JSONArray ? (JSONArray) o : null;
+        return this.optJSONArray(index, null);
+    }
+
+    /**
+     * Get the optional JSONArray associated with an index. The defaultValue is returned if
+     * there is no value at that index or if the value is not a JSONArray.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @param defaultValue
+     *            The default.
+     * @return A JSONArray value.
+     */
+    public JSONArray optJSONArray(int index, JSONArray defaultValue) {
+        Object object = this.opt(index);
+        return object instanceof JSONArray ? (JSONArray) object : defaultValue;
     }
 
     /**
      * Get the optional JSONObject associated with an index. Null is returned if
-     * the key is not found, or null if the index has no value, or if the value
-     * is not a JSONObject.
+     * there is no value at that index or if the value is not a JSONObject.
      *
      * @param index
      *            The index must be between 0 and length() - 1.
      * @return A JSONObject value.
      */
     public JSONObject optJSONObject(int index) {
-        Object o = this.opt(index);
-        return o instanceof JSONObject ? (JSONObject) o : null;
+        return this.optJSONObject(index, null);
+    }
+
+    /**
+     * Get the optional JSONObject associated with an index. The defaultValue is returned if
+     * there is no value at that index or if the value is not a JSONObject.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @param defaultValue
+     *            The default.
+     * @return A JSONObject value.
+     */
+    public JSONObject optJSONObject(int index, JSONObject defaultValue) {
+        Object object = this.opt(index);
+        return object instanceof JSONObject ? (JSONObject) object : defaultValue;
     }
 
     /**
@@ -846,6 +1038,38 @@ public class JSONArray implements Iterable<Object> {
         return val.longValue();
     }
 
+    /**
+     * Get the optional Long object associated with an index. Zero is returned if
+     * there is no value for the index, or if the value is not a number and
+     * cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @return The object.
+     */
+    public Long optLongObject(int index) {
+        return this.optLongObject(index, 0L);
+    }
+
+    /**
+     * Get the optional Long object associated with an index. The defaultValue is
+     * returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @param defaultValue
+     *            The default object.
+     * @return The object.
+     */
+    public Long optLongObject(int index, Long defaultValue) {
+        final Number val = this.optNumber(index, null);
+        if (val == null) {
+            return defaultValue;
+        }
+        return val.longValue();
+    }
+
     /**
      * Get an optional {@link Number} value associated with a key, or <code>null</code>
      * if there is no such key or if the value is not a number. If the value is a string,
@@ -1135,7 +1359,8 @@ public class JSONArray implements Iterable<Object> {
      *            The subscript.
      * @param value
      *            The Map value.
-     * @return this.
+     * @return
+     *             reference to self
      * @throws JSONException
      *             If the index is negative or if the value is an invalid
      *             number.
@@ -1143,7 +1368,27 @@ public class JSONArray implements Iterable<Object> {
      *             If a key in the map is <code>null</code>
      */
     public JSONArray put(int index, Map<?, ?> value) throws JSONException {
-        this.put(index, new JSONObject(value));
+        this.put(index, new JSONObject(value, new JSONParserConfiguration()));
+        return this;
+    }
+
+    /**
+     * Put a value in the JSONArray, where the value will be a JSONObject that
+     * is produced from a Map.
+     *
+     * @param index
+     *          The subscript
+     * @param value
+     *          The Map value.
+     * @param jsonParserConfiguration
+     *          Configuration object for the JSON parser
+     * @return reference to self
+     * @throws JSONException
+     *          If the index is negative or if the value is an invalid
+     *          number.
+     */
+    public JSONArray put(int index, Map<?, ?> value, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
+        this.put(index, new JSONObject(value, jsonParserConfiguration));
         return this;
     }
 
@@ -1451,9 +1696,7 @@ public class JSONArray implements Iterable<Object> {
     @SuppressWarnings("resource")
     public String toString(int indentFactor) throws JSONException {
         StringWriter sw = new StringWriter();
-        synchronized (sw.getBuffer()) {
-            return this.write(sw, indentFactor, 0).toString();
-        }
+        return this.write(sw, indentFactor, 0).toString();
     }
 
     /**
@@ -1586,13 +1829,14 @@ public class JSONArray implements Iterable<Object> {
      * @param wrap
      *            {@code true} to call {@link JSONObject#wrap(Object)} for each item,
      *            {@code false} to add the items directly
-     *            
+     * @param recursionDepth
+     *            Variable for tracking the count of nested object creations.
      */
-    private void addAll(Collection<?> collection, boolean wrap) {
+    private void addAll(Collection<?> collection, boolean wrap, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
         this.myArrayList.ensureCapacity(this.myArrayList.size() + collection.size());
         if (wrap) {
             for (Object o: collection){
-                this.put(JSONObject.wrap(o));
+                this.put(JSONObject.wrap(o, recursionDepth + 1, jsonParserConfiguration));
             }
         } else {
             for (Object o: collection){
@@ -1621,7 +1865,24 @@ public class JSONArray implements Iterable<Object> {
             }
         }
     }
-    
+
+    /**
+     * Add an array's elements to the JSONArray.
+     *
+     * @param array
+     *          Array. If the parameter passed is null, or not an array,
+     *          JSONArray, Collection, or Iterable, an exception will be
+     *          thrown.
+     * @param wrap
+     *          {@code true} to call {@link JSONObject#wrap(Object)} for each item,
+     *          {@code false} to add the items directly
+     * @throws JSONException
+     *          If not an array or if an array value is non-finite number.
+     */
+    private void addAll(Object array, boolean wrap) throws JSONException {
+      this.addAll(array, wrap, 0);
+    }
+
     /**
      * Add an array's elements to the JSONArray.
      *
@@ -1630,21 +1891,40 @@ public class JSONArray implements Iterable<Object> {
      *            JSONArray, Collection, or Iterable, an exception will be
      *            thrown.
      * @param wrap
+     *          {@code true} to call {@link JSONObject#wrap(Object)} for each item,
+     *          {@code false} to add the items directly
+     * @param recursionDepth
+     *          Variable for tracking the count of nested object creations.
+     */
+    private void addAll(Object array, boolean wrap, int recursionDepth) {
+        addAll(array, wrap, recursionDepth, new JSONParserConfiguration());
+    }
+    /**
+     * Add an array's elements to the JSONArray.
+     *`
+     * @param array
+     *            Array. If the parameter passed is null, or not an array,
+     *            JSONArray, Collection, or Iterable, an exception will be
+     *            thrown.
+     * @param wrap
      *            {@code true} to call {@link JSONObject#wrap(Object)} for each item,
      *            {@code false} to add the items directly
-     *
+     * @param recursionDepth
+     *            Variable for tracking the count of nested object creations.
+     * @param jsonParserConfiguration
+     *            Variable to pass parser custom configuration for json parsing.
      * @throws JSONException
      *            If not an array or if an array value is non-finite number.
      * @throws NullPointerException
      *            Thrown if the array parameter is null.
      */
-    private void addAll(Object array, boolean wrap) throws JSONException {
+    private void addAll(Object array, boolean wrap, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         if (array.getClass().isArray()) {
             int length = Array.getLength(array);
             this.myArrayList.ensureCapacity(this.myArrayList.size() + length);
             if (wrap) {
                 for (int i = 0; i < length; i += 1) {
-                    this.put(JSONObject.wrap(Array.get(array, i)));
+                    this.put(JSONObject.wrap(Array.get(array, i), recursionDepth + 1, jsonParserConfiguration));
                 }
             } else {
                 for (int i = 0; i < length; i += 1) {
@@ -1657,7 +1937,7 @@ public class JSONArray implements Iterable<Object> {
             // JSONArray
             this.myArrayList.addAll(((JSONArray)array).myArrayList);
         } else if (array instanceof Collection) {
-            this.addAll((Collection<?>)array, wrap);
+            this.addAll((Collection<?>)array, wrap, recursionDepth);
         } else if (array instanceof Iterable) {
             this.addAll((Iterable<?>)array, wrap);
         } else {
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 515c9f6..8aae654 100755
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -145,6 +145,11 @@ public class JSONObject {
      */
     private final Map<String, Object> map;
 
+    /**
+     * Retrieves the type of the underlying Map in this class.
+     *
+     * @return The class object representing the type of the underlying Map.
+     */
     public Class<? extends Map> getMapType() {
         return map.getClass();
     }
@@ -208,22 +213,14 @@ public class JSONObject {
             throw x.syntaxError("A JSONObject text must begin with '{'");
         }
         for (;;) {
-            char prev = x.getPrevious();
             c = x.nextClean();
             switch (c) {
             case 0:
                 throw x.syntaxError("A JSONObject text must end with '}'");
             case '}':
                 return;
-            case '{':
-            case '[':
-                if(prev=='{') {
-                    throw x.syntaxError("A JSON Object can not directly nest another JSON Object or JSON Array.");
-                }
-                // fall through
             default:
-                x.back();
-                key = x.nextValue().toString();
+                key = x.nextSimpleValue(c).toString();
             }
 
             // The key is followed by ':'.
@@ -237,12 +234,10 @@ public class JSONObject {
 
             if (key != null) {
                 // Check if key exists
-				/*
                 if (this.opt(key) != null) {
                     // key already exists
                     throw x.syntaxError("Duplicate key \"" + key + "\"");
                 }
-                */
                 // Only add value if non-null
                 Object value = x.nextValue();
                 if (value!=null) {
@@ -258,6 +253,9 @@ public class JSONObject {
                 if (x.nextClean() == '}') {
                     return;
                 }
+                if (x.end()) {
+                    throw x.syntaxError("A JSONObject text must end with '}'");
+                }
                 x.back();
                 break;
             case '}':
@@ -280,6 +278,30 @@ public class JSONObject {
      *            If a key in the map is <code>null</code>
      */
     public JSONObject(Map<?, ?> m) {
+      this(m, 0, new JSONParserConfiguration());
+    }
+
+    /**
+     * Construct a JSONObject from a Map with custom json parse configurations.
+     *
+     * @param m
+     *            A map object that can be used to initialize the contents of
+     *            the JSONObject.
+     * @param jsonParserConfiguration
+     *            Variable to pass parser custom configuration for json parsing.
+     */
+    public JSONObject(Map<?, ?> m, JSONParserConfiguration jsonParserConfiguration) {
+        this(m, 0, jsonParserConfiguration);
+    }
+
+    /**
+     * Construct a JSONObject from a map with recursion depth.
+     *
+     */
+    private JSONObject(Map<?, ?> m, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
+        if (recursionDepth > jsonParserConfiguration.getMaxNestingDepth()) {
+          throw new JSONException("JSONObject has reached recursion depth limit of " + jsonParserConfiguration.getMaxNestingDepth());
+        }
         if (m == null) {
             this.map = new HashMap<String, Object>();
         } else {
@@ -290,7 +312,8 @@ public class JSONObject {
         	    }
                 final Object value = e.getValue();
                 if (value != null) {
-                    this.map.put(String.valueOf(e.getKey()), wrap(value));
+                    testValidity(value);
+                    this.map.put(String.valueOf(e.getKey()), wrap(value, recursionDepth + 1, jsonParserConfiguration));
                 }
             }
         }
@@ -348,11 +371,12 @@ public class JSONObject {
      * &#64;JSONPropertyIgnore
      * public String getName() { return this.name; }
      * </pre>
-     * <p>
      *
      * @param bean
      *            An object that has getter methods that should be used to make
      *            a JSONObject.
+     * @throws JSONException
+     *            If a getter returned a non-finite number.
      */
     public JSONObject(Object bean) {
         this();
@@ -1133,6 +1157,45 @@ public class JSONObject {
         }
     }
 
+    /**
+     * Get an optional boolean object associated with a key. It returns false if there
+     * is no such key, or if the value is not Boolean.TRUE or the String "true".
+     *
+     * @param key
+     *            A key string.
+     * @return The truth.
+     */
+    public Boolean optBooleanObject(String key) {
+        return this.optBooleanObject(key, false);
+    }
+
+    /**
+     * Get an optional boolean object associated with a key. It returns the
+     * defaultValue if there is no such key, or if it is not a Boolean or the
+     * String "true" or "false" (case insensitive).
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return The truth.
+     */
+    public Boolean optBooleanObject(String key, Boolean defaultValue) {
+        Object val = this.opt(key);
+        if (NULL.equals(val)) {
+            return defaultValue;
+        }
+        if (val instanceof Boolean){
+            return ((Boolean) val).booleanValue();
+        }
+        try {
+            // we'll use the get anyway because it does string conversion.
+            return this.getBoolean(key);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
     /**
      * Get an optional BigDecimal associated with a key, or the defaultValue if
      * there is no such key or if its value is not a number. If the value is a
@@ -1292,15 +1355,43 @@ public class JSONObject {
         if (val == null) {
             return defaultValue;
         }
-        final double doubleValue = val.doubleValue();
-        // if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) {
-        // return defaultValue;
-        // }
-        return doubleValue;
+        return val.doubleValue();
     }
 
     /**
-     * Get the optional double value associated with an index. NaN is returned
+     * Get an optional Double object associated with a key, or NaN if there is no such
+     * key or if its value is not a number. If the value is a string, an attempt
+     * will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A string which is the key.
+     * @return An object which is the value.
+     */
+    public Double optDoubleObject(String key) {
+        return this.optDoubleObject(key, Double.NaN);
+    }
+
+    /**
+     * Get an optional Double object associated with a key, or the defaultValue if
+     * there is no such key or if its value is not a number. If the value is a
+     * string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return An object which is the value.
+     */
+    public Double optDoubleObject(String key, Double defaultValue) {
+        Number val = this.optNumber(key);
+        if (val == null) {
+            return defaultValue;
+        }
+        return val.doubleValue();
+    }
+
+    /**
+     * Get the optional float value associated with an index. NaN is returned
      * if there is no value for the index, or if the value is not a number and
      * cannot be converted to a number.
      *
@@ -1313,7 +1404,7 @@ public class JSONObject {
     }
 
     /**
-     * Get the optional double value associated with an index. The defaultValue
+     * Get the optional float value associated with an index. The defaultValue
      * is returned if there is no value for the index, or if the value is not a
      * number and cannot be converted to a number.
      *
@@ -1335,6 +1426,42 @@ public class JSONObject {
         return floatValue;
     }
 
+    /**
+     * Get the optional Float object associated with an index. NaN is returned
+     * if there is no value for the index, or if the value is not a number and
+     * cannot be converted to a number.
+     *
+     * @param key
+     *            A key string.
+     * @return The object.
+     */
+    public Float optFloatObject(String key) {
+        return this.optFloatObject(key, Float.NaN);
+    }
+
+    /**
+     * Get the optional Float object associated with an index. The defaultValue
+     * is returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default object.
+     * @return The object.
+     */
+    public Float optFloatObject(String key, Float defaultValue) {
+        Number val = this.optNumber(key);
+        if (val == null) {
+            return defaultValue;
+        }
+        final Float floatValue = val.floatValue();
+        // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) {
+        // return defaultValue;
+        // }
+        return floatValue;
+    }
+
     /**
      * Get an optional int value associated with a key, or zero if there is no
      * such key or if the value is not a number. If the value is a string, an
@@ -1367,6 +1494,38 @@ public class JSONObject {
         return val.intValue();
     }
 
+    /**
+     * Get an optional Integer object associated with a key, or zero if there is no
+     * such key or if the value is not a number. If the value is a string, an
+     * attempt will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A key string.
+     * @return An object which is the value.
+     */
+    public Integer optIntegerObject(String key) {
+        return this.optIntegerObject(key, 0);
+    }
+
+    /**
+     * Get an optional Integer object associated with a key, or the default if there
+     * is no such key or if the value is not a number. If the value is a string,
+     * an attempt will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return An object which is the value.
+     */
+    public Integer optIntegerObject(String key, Integer defaultValue) {
+        final Number val = this.optNumber(key, null);
+        if (val == null) {
+            return defaultValue;
+        }
+        return val.intValue();
+    }
+
     /**
      * Get an optional JSONArray associated with a key. It returns null if there
      * is no such key, or if its value is not a JSONArray.
@@ -1376,8 +1535,22 @@ public class JSONObject {
      * @return A JSONArray which is the value.
      */
     public JSONArray optJSONArray(String key) {
-        Object o = this.opt(key);
-        return o instanceof JSONArray ? (JSONArray) o : null;
+        return this.optJSONArray(key, null);
+    }
+
+    /**
+     * Get an optional JSONArray associated with a key, or the default if there
+     * is no such key, or if its value is not a JSONArray.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return A JSONArray which is the value.
+     */
+    public JSONArray optJSONArray(String key, JSONArray defaultValue) {
+        Object object = this.opt(key);
+        return object instanceof JSONArray ? (JSONArray) object : defaultValue;
     }
 
     /**
@@ -1438,6 +1611,39 @@ public class JSONObject {
         return val.longValue();
     }
 
+    /**
+     * Get an optional Long object associated with a key, or zero if there is no
+     * such key or if the value is not a number. If the value is a string, an
+     * attempt will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A key string.
+     * @return An object which is the value.
+     */
+    public Long optLongObject(String key) {
+        return this.optLongObject(key, 0L);
+    }
+
+    /**
+     * Get an optional Long object associated with a key, or the default if there
+     * is no such key or if the value is not a number. If the value is a string,
+     * an attempt will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return An object which is the value.
+     */
+    public Long optLongObject(String key, Long defaultValue) {
+        final Number val = this.optNumber(key, null);
+        if (val == null) {
+            return defaultValue;
+        }
+
+        return val.longValue();
+    }
+
     /**
      * Get an optional {@link Number} value associated with a key, or <code>null</code>
      * if there is no such key or if the value is not a number. If the value is a string,
@@ -1516,6 +1722,8 @@ public class JSONObject {
      *
      * @param bean
      *            the bean
+     * @throws JSONException
+     *            If a getter returned a non-finite number.
      */
     private void populateMap(Object bean) {
         populateMap(bean, Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>()));
@@ -1543,21 +1751,22 @@ public class JSONObject {
                         final Object result = method.invoke(bean);
                         if (result != null) {
                             // check cyclic dependency and throw error if needed
-                            // the wrap and populateMap combination method is 
+                            // the wrap and populateMap combination method is
                             // itself DFS recursive
                             if (objectsRecord.contains(result)) {
                                 throw recursivelyDefinedObjectException(key);
                             }
-                            
+
                             objectsRecord.add(result);
 
+                            testValidity(result);
                             this.map.put(key, wrap(result, objectsRecord));
 
                             objectsRecord.remove(result);
 
                             // we don't use the result anywhere outside of wrap
                             // if it's a resource we should be sure to close it
-                            // after calling toString 
+                            // after calling toString
                             if (result instanceof Closeable) {
                                 try {
                                     ((Closeable) result).close();
@@ -1657,6 +1866,10 @@ public class JSONObject {
             }
         }
 
+        //If the superclass is Object, no annotations will be found any more
+        if (c.getSuperclass().equals(Object.class))
+            return null;
+
         try {
             return getAnnotation(
                     c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()),
@@ -1711,6 +1924,10 @@ public class JSONObject {
             }
         }
 
+        //If the superclass is Object, no annotations will be found any more
+        if (c.getSuperclass().equals(Object.class))
+            return -1;
+
         try {
             int d = getAnnotationDepth(
                     c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()),
@@ -2008,16 +2225,22 @@ public class JSONObject {
     @SuppressWarnings("resource")
     public static String quote(String string) {
         StringWriter sw = new StringWriter();
-        synchronized (sw.getBuffer()) {
-            try {
-                return quote(string, sw).toString();
-            } catch (IOException ignored) {
-                // will never happen - we are writing to a string writer
-                return "";
-            }
+        try {
+            return quote(string, sw).toString();
+        } catch (IOException ignored) {
+            // will never happen - we are writing to a string writer
+            return "";
         }
     }
 
+    /**
+     * Quotes a string and appends the result to a given Writer.
+     *
+     * @param string The input string to be quoted.
+     * @param w      The Writer to which the quoted string will be appended.
+     * @return The same Writer instance after appending the quoted string.
+     * @throws IOException If an I/O error occurs while writing to the Writer.
+     */
     public static Writer quote(String string, Writer w) throws IOException {
         if (string == null || string.isEmpty()) {
             w.write("\"\"");
@@ -2201,6 +2424,49 @@ public class JSONObject {
                 || val.indexOf('E') > -1 || "-0".equals(val);
     }
 
+    /**
+     * Try to convert a string into a number, boolean, or null. If the string
+     * can't be converted, return the string.
+     *
+     * @param string
+     *            A String. can not be null.
+     * @return A simple JSON value.
+     * @throws NullPointerException
+     *             Thrown if the string is null.
+     */
+    // Changes to this method must be copied to the corresponding method in
+    // the XML class to keep full support for Android
+    public static Object stringToValue(String string) {
+        if ("".equals(string)) {
+            return string;
+        }
+
+        // check JSON key words true/false/null
+        if ("true".equalsIgnoreCase(string)) {
+            return Boolean.TRUE;
+        }
+        if ("false".equalsIgnoreCase(string)) {
+            return Boolean.FALSE;
+        }
+        if ("null".equalsIgnoreCase(string)) {
+            return JSONObject.NULL;
+        }
+
+        /*
+         * If it might be a number, try converting it. If a number cannot be
+         * produced, then the value will just be a string.
+         */
+
+        char initial = string.charAt(0);
+        if ((initial >= '0' && initial <= '9') || initial == '-') {
+            try {
+                return stringToNumber(string);
+            } catch (Exception ignore) {
+            }
+        }
+        return string;
+    }
+
     /**
      * Converts a string to a number using the narrowest possible type. Possible
      * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
@@ -2271,49 +2537,6 @@ public class JSONObject {
         throw new NumberFormatException("val ["+val+"] is not a valid number.");
     }
 
-    /**
-     * Try to convert a string into a number, boolean, or null. If the string
-     * can't be converted, return the string.
-     *
-     * @param string
-     *            A String. can not be null.
-     * @return A simple JSON value.
-     * @throws NullPointerException
-     *             Thrown if the string is null.
-     */
-    // Changes to this method must be copied to the corresponding method in
-    // the XML class to keep full support for Android
-    public static Object stringToValue(String string) {
-        if ("".equals(string)) {
-            return string;
-        }
-
-        // check JSON key words true/false/null
-        if ("true".equalsIgnoreCase(string)) {
-            return Boolean.TRUE;
-        }
-        if ("false".equalsIgnoreCase(string)) {
-            return Boolean.FALSE;
-        }
-        if ("null".equalsIgnoreCase(string)) {
-            return JSONObject.NULL;
-        }
-
-        /*
-         * If it might be a number, try converting it. If a number cannot be
-         * produced, then the value will just be a string.
-         */
-
-        char initial = string.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-') {
-            try {
-                return stringToNumber(string);
-            } catch (Exception ignore) {
-            }
-        }
-        return string;
-    }
-
     /**
      * Throw an exception if the object is a NaN or infinite number.
      *
@@ -2401,9 +2624,7 @@ public class JSONObject {
     @SuppressWarnings("resource")
     public String toString(int indentFactor) throws JSONException {
         StringWriter w = new StringWriter();
-        synchronized (w.getBuffer()) {
-            return this.write(w, indentFactor, 0).toString();
-        }
+        return this.write(w, indentFactor, 0).toString();
     }
 
     /**
@@ -2454,7 +2675,31 @@ public class JSONObject {
         return wrap(object, null);
     }
 
+    /**
+     * Wrap an object, if necessary. If the object is <code>null</code>, return the NULL
+     * object. If it is an array or collection, wrap it in a JSONArray. If it is
+     * a map, wrap it in a JSONObject. If it is a standard property (Double,
+     * String, et al) then it is already wrapped. Otherwise, if it comes from
+     * one of the java packages, turn it into a string. And if it doesn't, try
+     * to wrap it in a JSONObject. If the wrapping fails, then null is returned.
+     *
+     * @param object
+     *            The object to wrap
+     * @param recursionDepth
+     *            Variable for tracking the count of nested object creations.
+     * @param jsonParserConfiguration
+     *            Variable to pass parser custom configuration for json parsing.
+     * @return The wrapped value
+     */
+    static Object wrap(Object object, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
+      return wrap(object, null, recursionDepth, jsonParserConfiguration);
+    }
+
     private static Object wrap(Object object, Set<Object> objectsRecord) {
+      return wrap(object, objectsRecord, 0, new JSONParserConfiguration());
+    }
+
+    private static Object wrap(Object object, Set<Object> objectsRecord, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
         try {
             if (NULL.equals(object)) {
                 return NULL;
@@ -2472,14 +2717,14 @@ public class JSONObject {
 
             if (object instanceof Collection) {
                 Collection<?> coll = (Collection<?>) object;
-                return new JSONArray(coll);
+                return new JSONArray(coll, recursionDepth, jsonParserConfiguration);
             }
             if (object.getClass().isArray()) {
                 return new JSONArray(object);
             }
             if (object instanceof Map) {
                 Map<?, ?> map = (Map<?, ?>) object;
-                return new JSONObject(map);
+                return new JSONObject(map, recursionDepth, jsonParserConfiguration);
             }
             Package objectPackage = object.getClass().getPackage();
             String objectPackageName = objectPackage != null ? objectPackage
@@ -2715,4 +2960,24 @@ public class JSONObject {
             "JavaBean object contains recursively defined member variable of key " + quote(key)
         );
     }
+
+    /**
+     * For a prospective number, remove the leading zeros
+     * @param value prospective number
+     * @return number without leading zeros
+     */
+    private static String removeLeadingZerosOfNumber(String value){
+        if (value.equals("-")){return value;}
+        boolean negativeFirstChar = (value.charAt(0) == '-');
+        int counter = negativeFirstChar ? 1:0;
+        while (counter < value.length()){
+            if (value.charAt(counter) != '0'){
+                if (negativeFirstChar) {return "-".concat(value.substring(counter));}
+                return value.substring(counter);
+            }
+            ++counter;
+        }
+        if (negativeFirstChar) {return "-0";}
+        return "0";
+    }
 }
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
new file mode 100755
index 0000000..a5a5db0
--- /dev/null
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -0,0 +1,26 @@
+package org.json;
+
+/**
+ * Configuration object for the JSON parser. The configuration is immutable.
+ */
+public class JSONParserConfiguration extends ParserConfiguration {
+
+  /**
+   * Configuration with the default values.
+   */
+  public JSONParserConfiguration() {
+    super();
+  }
+
+  @Override
+  protected JSONParserConfiguration clone() {
+    return new JSONParserConfiguration();
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public JSONParserConfiguration withMaxNestingDepth(final int maxNestingDepth) {
+    return super.withMaxNestingDepth(maxNestingDepth);
+  }
+
+}
diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/org/json/JSONPointer.java
index c568b78..b8cf044 100755
--- a/src/main/java/org/json/JSONPointer.java
+++ b/src/main/java/org/json/JSONPointer.java
@@ -42,6 +42,12 @@ public class JSONPointer {
      */
     public static class Builder {
 
+        /**
+         * Constructs a new Builder object.
+         */
+        public Builder() {
+        }
+
         // Segments for the eventual JSONPointer string
         private final List<String> refTokens = new ArrayList<String>();
 
@@ -163,6 +169,12 @@ public class JSONPointer {
         //}
     }
 
+    /**
+     * Constructs a new JSONPointer instance with the provided list of reference tokens.
+     *
+     * @param refTokens A list of strings representing the reference tokens for the JSON Pointer.
+     *                  Each token identifies a step in the path to the targeted value.
+     */
     public JSONPointer(List<String> refTokens) {
         this.refTokens = new ArrayList<String>(refTokens);
     }
diff --git a/src/main/java/org/json/JSONPointerException.java b/src/main/java/org/json/JSONPointerException.java
index 911da89..3b23c7d 100755
--- a/src/main/java/org/json/JSONPointerException.java
+++ b/src/main/java/org/json/JSONPointerException.java
@@ -14,10 +14,21 @@ Public Domain.
 public class JSONPointerException extends JSONException {
     private static final long serialVersionUID = 8872944667561856751L;
 
+    /**
+     * Constructs a new JSONPointerException with the specified error message.
+     *
+     * @param message The detail message describing the reason for the exception.
+     */
     public JSONPointerException(String message) {
         super(message);
     }
 
+    /**
+     * Constructs a new JSONPointerException with the specified error message and cause.
+     *
+     * @param message The detail message describing the reason for the exception.
+     * @param cause   The cause of the exception.
+     */
     public JSONPointerException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/src/main/java/org/json/JSONPropertyIgnore.java b/src/main/java/org/json/JSONPropertyIgnore.java
index 0bab6fb..b81bd0a 100755
--- a/src/main/java/org/json/JSONPropertyIgnore.java
+++ b/src/main/java/org/json/JSONPropertyIgnore.java
@@ -11,13 +11,13 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-@Documented
-@Retention(RUNTIME)
-@Target({METHOD})
 /**
  * Use this annotation on a getter method to override the Bean name
  * parser for Bean -&gt; JSONObject mapping. If this annotation is
  * present at any level in the class hierarchy, then the method will
  * not be serialized from the bean into the JSONObject.
  */
+@Documented
+@Retention(RUNTIME)
+@Target({METHOD})
 public @interface JSONPropertyIgnore { }
diff --git a/src/main/java/org/json/JSONPropertyName.java b/src/main/java/org/json/JSONPropertyName.java
index 481933f..1c3a3a2 100755
--- a/src/main/java/org/json/JSONPropertyName.java
+++ b/src/main/java/org/json/JSONPropertyName.java
@@ -11,16 +11,17 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-@Documented
-@Retention(RUNTIME)
-@Target({METHOD})
 /**
  * Use this annotation on a getter method to override the Bean name
  * parser for Bean -&gt; JSONObject mapping. A value set to empty string <code>""</code>
  * will have the Bean parser fall back to the default field name processing.
  */
+@Documented
+@Retention(RUNTIME)
+@Target({METHOD})
 public @interface JSONPropertyName {
     /**
+     * The value of the JSON property.
      * @return The name of the property as to be used in the JSON Object.
      */
     String value();
diff --git a/src/main/java/org/json/JSONString.java b/src/main/java/org/json/JSONString.java
index 4ececeb..b6a091e 100755
--- a/src/main/java/org/json/JSONString.java
+++ b/src/main/java/org/json/JSONString.java
@@ -21,3 +21,4 @@ public interface JSONString {
      */
     public String toJSONString();
 }
+
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 0fb324a..225e9ee 100755
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -1,11 +1,7 @@
 package org.json;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
+import java.io.*;
+import java.nio.charset.Charset;
 
 /*
 Public Domain.
@@ -61,7 +57,7 @@ public class JSONTokener {
      * @param inputStream The source.
      */
     public JSONTokener(InputStream inputStream) {
-        this(new InputStreamReader(inputStream));
+        this(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
     }
 
 
@@ -125,7 +121,7 @@ public class JSONTokener {
 
     /**
      * Checks if the end of the input has been reached.
-     *  
+     *
      * @return true if at the end of the file and we didn't step back
      */
     public boolean end() {
@@ -189,7 +185,7 @@ public class JSONTokener {
         this.previous = (char) c;
         return this.previous;
     }
-    
+
     /**
      * Get the last character read from the input or '\0' if nothing has been read yet.
      * @return the last character read from the input.
@@ -301,9 +297,9 @@ public class JSONTokener {
             c = this.next();
             switch (c) {
             case 0:
+            case '\n':
+            case '\r':
                 throw this.syntaxError("Unterminated string");
-			case '\r':
-				break;
             case '\\':
                 c = this.next();
                 switch (c) {
@@ -406,12 +402,7 @@ public class JSONTokener {
      */
     public Object nextValue() throws JSONException {
         char c = this.nextClean();
-        String string;
-
         switch (c) {
-        case '"':
-        case '\'':
-            return this.nextString(c);
         case '{':
             this.back();
             try {
@@ -427,6 +418,17 @@ public class JSONTokener {
                 throw new JSONException("JSON Array or Object depth too large to process.", e);
             }
         }
+        return nextSimpleValue(c);
+    }
+
+    Object nextSimpleValue(char c) {
+        String string;
+
+        switch (c) {
+        case '"':
+        case '\'':
+            return this.nextString(c);
+        }
 
         /*
          * Handle unquoted text. This could be the values true, false, or
@@ -522,4 +524,15 @@ public class JSONTokener {
         return " at " + this.index + " [character " + this.character + " line " +
                 this.line + "]";
     }
+
+    /**
+     * Closes the underlying reader, releasing any resources associated with it.
+     *
+     * @throws IOException If an I/O error occurs while closing the reader.
+     */
+    public void close() throws IOException {
+        if(reader!=null){
+            reader.close();
+        }
+    }
 }
diff --git a/src/main/java/org/json/ParserConfiguration.java b/src/main/java/org/json/ParserConfiguration.java
new file mode 100755
index 0000000..17d565a
--- /dev/null
+++ b/src/main/java/org/json/ParserConfiguration.java
@@ -0,0 +1,126 @@
+package org.json;
+/*
+Public Domain.
+*/
+
+/**
+ * Configuration base object for parsers. The configuration is immutable.
+ */
+@SuppressWarnings({""})
+public class ParserConfiguration {
+    /**
+     * Used to indicate there's no defined limit to the maximum nesting depth when parsing a document.
+     */
+    public static final int UNDEFINED_MAXIMUM_NESTING_DEPTH = -1;
+
+    /**
+     * The default maximum nesting depth when parsing a document.
+     */
+    public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512;
+
+    /**
+     * Specifies if values should be kept as strings (<code>true</code>), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string)
+     */
+    protected boolean keepStrings;
+
+    /**
+     * The maximum nesting depth when parsing a document.
+     */
+    protected int maxNestingDepth;
+
+    /**
+     * Constructs a new ParserConfiguration with default settings.
+     */
+    public ParserConfiguration() {
+        this.keepStrings = false;
+        this.maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
+    }
+
+    /**
+     * Constructs a new ParserConfiguration with the specified settings.
+     *
+     * @param keepStrings     A boolean indicating whether to preserve strings during parsing.
+     * @param maxNestingDepth An integer representing the maximum allowed nesting depth.
+     */
+    protected ParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
+        this.keepStrings = keepStrings;
+        this.maxNestingDepth = maxNestingDepth;
+    }
+
+    /**
+     * Provides a new instance of the same configuration.
+     */
+    @Override
+    protected ParserConfiguration clone() {
+        // future modifications to this method should always ensure a "deep"
+        // clone in the case of collections. i.e. if a Map is added as a configuration
+        // item, a new map instance should be created and if possible each value in the
+        // map should be cloned as well. If the values of the map are known to also
+        // be immutable, then a shallow clone of the map is acceptable.
+        return new ParserConfiguration(
+            this.keepStrings,
+            this.maxNestingDepth
+        );
+    }
+
+    /**
+     * When parsing the XML into JSONML, specifies if values should be kept as strings (<code>true</code>), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string)
+     *
+     * @return The <code>keepStrings</code> configuration value.
+     */
+    public boolean isKeepStrings() {
+        return this.keepStrings;
+    }
+
+    /**
+     * When parsing the XML into JSONML, specifies if values should be kept as strings (<code>true</code>), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string)
+     *
+     * @param newVal
+     *      new value to use for the <code>keepStrings</code> configuration option.
+     * @param <T> the type of the configuration object
+     * 
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends ParserConfiguration> T withKeepStrings(final boolean newVal) {
+        T newConfig = (T)this.clone();
+        newConfig.keepStrings = newVal;
+        return newConfig;
+    }
+
+    /**
+     * The maximum nesting depth that the parser will descend before throwing an exception
+     * when parsing the XML into JSONML.
+     * @return the maximum nesting depth set for this configuration
+     */
+    public int getMaxNestingDepth() {
+        return maxNestingDepth;
+    }
+
+    /**
+     * Defines the maximum nesting depth that the parser will descend before throwing an exception
+     * when parsing the XML into JSONML. The default max nesting depth is 512, which means the parser
+     * will throw a JsonException if the maximum depth is reached.
+     * Using any negative value as a parameter is equivalent to setting no limit to the nesting depth,
+     * which means the parses will go as deep as the maximum call stack size allows.
+     * @param maxNestingDepth the maximum nesting depth allowed to the XML parser
+     * @param <T> the type of the configuration object
+     * 
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends ParserConfiguration> T withMaxNestingDepth(int maxNestingDepth) {
+        T newConfig = (T)this.clone();
+
+        if (maxNestingDepth > UNDEFINED_MAXIMUM_NESTING_DEPTH) {
+            newConfig.maxNestingDepth = maxNestingDepth;
+        } else {
+            newConfig.maxNestingDepth = UNDEFINED_MAXIMUM_NESTING_DEPTH;
+        }
+
+        return newConfig;
+    }
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePacketInputBuffer.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePacketInputBuffer.java
new file mode 100755
index 0000000..bc95f90
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePacketInputBuffer.java
@@ -0,0 +1,44 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface GamePacketInputBuffer extends DataInput {
+
+	void skipAllBytes(int n) throws IOException;
+
+	int readVarInt() throws IOException;
+
+	long readVarLong() throws IOException;
+
+	String readStringMC(int maxLen) throws IOException;
+
+	String readStringEaglerASCII8() throws IOException;
+
+	String readStringEaglerASCII16() throws IOException;
+
+	byte[] readByteArrayMC() throws IOException;
+
+	int available() throws IOException;
+
+	InputStream stream();
+
+	byte[] toByteArray() throws IOException;
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePacketOutputBuffer.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePacketOutputBuffer.java
new file mode 100755
index 0000000..0f31767
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePacketOutputBuffer.java
@@ -0,0 +1,61 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol;
+
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface GamePacketOutputBuffer extends DataOutput {
+
+	void writeVarInt(int i) throws IOException;
+
+	void writeVarLong(long i) throws IOException;
+
+	void writeStringMC(String str) throws IOException;
+
+	void writeStringEaglerASCII8(String str) throws IOException;
+
+	void writeStringEaglerASCII16(String str) throws IOException;
+
+	void writeByteArrayMC(byte[] bytes) throws IOException;
+
+	OutputStream stream();
+
+	public static int getVarIntSize(int input) {
+		for (int i = 1; i < 5; ++i) {
+			if ((input & -1 << i * 7) == 0) {
+				return i;
+			}
+		}
+
+		return 5;
+	}
+
+	public static int getVarLongSize(long input) {
+		for (int i = 1; i < 9; ++i) {
+			if ((input & -1 << i * 7) == 0) {
+				return i;
+			}
+		}
+
+		return 9;
+	}
+
+	public static int getArrayMCSize(int len) {
+		return getVarIntSize(len) + len;
+	}
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePluginMessageConstants.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePluginMessageConstants.java
new file mode 100755
index 0000000..9bbf3a9
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePluginMessageConstants.java
@@ -0,0 +1,52 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GamePluginMessageConstants {
+
+	public static final String V3_SKIN_CHANNEL = "EAG|Skins-1.8";
+	public static final String V3_CAPE_CHANNEL = "EAG|Capes-1.8";
+	public static final String V3_VOICE_CHANNEL = "EAG|Voice-1.8";
+	public static final String V3_UPDATE_CHANNEL = "EAG|UpdateCert-1.8";
+	public static final String V3_FNAW_EN_CHANNEL = "EAG|FNAWSEn-1.8";
+
+	public static final String V4_CHANNEL = "EAG|1.8";
+
+	public static final int CLIENT_TO_SERVER = 0;
+	public static final int SERVER_TO_CLIENT = 1;
+
+	public static String getDirectionString(int dir) {
+		switch(dir) {
+		case CLIENT_TO_SERVER:
+			return "CLIENT_TO_SERVER";
+		case SERVER_TO_CLIENT:
+			return "SERVER_TO_CLIENT";
+		default:
+			return "UNKNOWN";
+		}
+	}
+
+	public static int oppositeDirection(int dir) {
+		switch(dir) {
+		case CLIENT_TO_SERVER:
+			return SERVER_TO_CLIENT;
+		case SERVER_TO_CLIENT:
+			return CLIENT_TO_SERVER;
+		default:
+			throw new IllegalArgumentException("Invalid direction: " + dir);
+		}
+	}
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePluginMessageProtocol.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePluginMessageProtocol.java
new file mode 100755
index 0000000..95c89fb
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePluginMessageProtocol.java
@@ -0,0 +1,230 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.*;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.*;
+
+import static net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageConstants.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum GamePluginMessageProtocol {
+	V3(3,
+			define(V3_SKIN_CHANNEL, 0x03, CLIENT_TO_SERVER, CPacketGetOtherSkinEAG.class),
+			define(V3_SKIN_CHANNEL, 0x04, SERVER_TO_CLIENT, SPacketOtherSkinPresetEAG.class),
+			define(V3_SKIN_CHANNEL, 0x05, SERVER_TO_CLIENT, SPacketOtherSkinCustomV3EAG.class),
+			define(V3_SKIN_CHANNEL, 0x06, CLIENT_TO_SERVER, CPacketGetSkinByURLEAG.class),
+			define(V3_SKIN_CHANNEL, 0x07, CLIENT_TO_SERVER, CPacketInstallSkinSPEAG.class),
+			define(V3_CAPE_CHANNEL, 0x03, CLIENT_TO_SERVER, CPacketGetOtherCapeEAG.class),
+			define(V3_CAPE_CHANNEL, 0x04, SERVER_TO_CLIENT, SPacketOtherCapePresetEAG.class),
+			define(V3_CAPE_CHANNEL, 0x05, SERVER_TO_CLIENT, SPacketOtherCapeCustomEAG.class),
+			define(V3_VOICE_CHANNEL, 0x00, SERVER_TO_CLIENT, SPacketVoiceSignalAllowedEAG.class),
+			define(V3_VOICE_CHANNEL, 0x00, CLIENT_TO_SERVER, CPacketVoiceSignalRequestEAG.class),
+			define(V3_VOICE_CHANNEL, 0x01, CLIENT_TO_SERVER, CPacketVoiceSignalConnectEAG.class),
+			define(V3_VOICE_CHANNEL, 0x01, SERVER_TO_CLIENT, SPacketVoiceSignalConnectV3EAG.class),
+			define(V3_VOICE_CHANNEL, 0x02, CLIENT_TO_SERVER, CPacketVoiceSignalDisconnectV3EAG.class),
+			define(V3_VOICE_CHANNEL, 0x02, SERVER_TO_CLIENT, SPacketVoiceSignalDisconnectPeerEAG.class),
+			define(V3_VOICE_CHANNEL, 0x03, CLIENT_TO_SERVER, CPacketVoiceSignalICEEAG.class),
+			define(V3_VOICE_CHANNEL, 0x03, SERVER_TO_CLIENT, SPacketVoiceSignalICEEAG.class),
+			define(V3_VOICE_CHANNEL, 0x04, CLIENT_TO_SERVER, CPacketVoiceSignalDescEAG.class),
+			define(V3_VOICE_CHANNEL, 0x04, SERVER_TO_CLIENT, SPacketVoiceSignalDescEAG.class),
+			define(V3_VOICE_CHANNEL, 0x05, SERVER_TO_CLIENT, SPacketVoiceSignalGlobalEAG.class),
+			define(V3_UPDATE_CHANNEL, -1, SERVER_TO_CLIENT, SPacketUpdateCertEAG.class),
+			define(V3_FNAW_EN_CHANNEL, -1, SERVER_TO_CLIENT, SPacketEnableFNAWSkinsEAG.class)
+	), V4(4,
+			define(V4_CHANNEL, 0x01, CLIENT_TO_SERVER, CPacketGetOtherSkinEAG.class),
+			define(V4_CHANNEL, 0x02, SERVER_TO_CLIENT, SPacketOtherSkinPresetEAG.class),
+			define(V4_CHANNEL, 0x03, SERVER_TO_CLIENT, SPacketOtherSkinCustomV4EAG.class),
+			define(V4_CHANNEL, 0x04, CLIENT_TO_SERVER, CPacketGetSkinByURLEAG.class),
+			define(V4_CHANNEL, 0x05, CLIENT_TO_SERVER, CPacketInstallSkinSPEAG.class),
+			define(V4_CHANNEL, 0x06, CLIENT_TO_SERVER, CPacketGetOtherCapeEAG.class),
+			define(V4_CHANNEL, 0x07, SERVER_TO_CLIENT, SPacketOtherCapePresetEAG.class),
+			define(V4_CHANNEL, 0x08, SERVER_TO_CLIENT, SPacketOtherCapeCustomEAG.class),
+			define(V4_CHANNEL, 0x09, SERVER_TO_CLIENT, SPacketVoiceSignalAllowedEAG.class),
+			define(V4_CHANNEL, 0x0A, CLIENT_TO_SERVER, CPacketVoiceSignalRequestEAG.class),
+			define(V4_CHANNEL, 0x0B, CLIENT_TO_SERVER, CPacketVoiceSignalConnectEAG.class),
+			define(V4_CHANNEL, 0x0C, SERVER_TO_CLIENT, SPacketVoiceSignalConnectV4EAG.class),
+			define(V4_CHANNEL, 0x0D, SERVER_TO_CLIENT, SPacketVoiceSignalConnectAnnounceV4EAG.class),
+			define(V4_CHANNEL, 0x0E, CLIENT_TO_SERVER, CPacketVoiceSignalDisconnectV4EAG.class),
+			define(V4_CHANNEL, 0x0F, CLIENT_TO_SERVER, CPacketVoiceSignalDisconnectPeerV4EAG.class),
+			define(V4_CHANNEL, 0x10, SERVER_TO_CLIENT, SPacketVoiceSignalDisconnectPeerEAG.class),
+			define(V4_CHANNEL, 0x11, CLIENT_TO_SERVER, CPacketVoiceSignalICEEAG.class),
+			define(V4_CHANNEL, 0x12, SERVER_TO_CLIENT, SPacketVoiceSignalICEEAG.class),
+			define(V4_CHANNEL, 0x13, CLIENT_TO_SERVER, CPacketVoiceSignalDescEAG.class),
+			define(V4_CHANNEL, 0x14, SERVER_TO_CLIENT, SPacketVoiceSignalDescEAG.class),
+			define(V4_CHANNEL, 0x15, SERVER_TO_CLIENT, SPacketVoiceSignalGlobalEAG.class),
+			define(V4_CHANNEL, 0x16, SERVER_TO_CLIENT, SPacketUpdateCertEAG.class),
+			define(V4_CHANNEL, 0x17, SERVER_TO_CLIENT, SPacketEnableFNAWSkinsEAG.class),
+			define(V4_CHANNEL, 0x18, SERVER_TO_CLIENT, SPacketForceClientSkinPresetV4EAG.class),
+			define(V4_CHANNEL, 0x19, SERVER_TO_CLIENT, SPacketForceClientSkinCustomV4EAG.class),
+			define(V4_CHANNEL, 0x1A, SERVER_TO_CLIENT, SPacketSetServerCookieV4EAG.class),
+			define(V4_CHANNEL, 0x1B, SERVER_TO_CLIENT, SPacketRedirectClientV4EAG.class),
+			define(V4_CHANNEL, 0x1C, CLIENT_TO_SERVER, CPacketGetOtherClientUUIDV4EAG.class),
+			define(V4_CHANNEL, 0x1D, SERVER_TO_CLIENT, SPacketOtherPlayerClientUUIDV4EAG.class),
+			define(V4_CHANNEL, 0x1E, SERVER_TO_CLIENT, SPacketForceClientCapePresetV4EAG.class),
+			define(V4_CHANNEL, 0x1F, SERVER_TO_CLIENT, SPacketForceClientCapeCustomV4EAG.class),
+			define(V4_CHANNEL, 0x20, SERVER_TO_CLIENT, SPacketInvalidatePlayerCacheV4EAG.class),
+			define(V4_CHANNEL, 0x21, SERVER_TO_CLIENT, SPacketUnforceClientV4EAG.class),
+			define(V4_CHANNEL, 0x22, SERVER_TO_CLIENT, SPacketCustomizePauseMenuV4EAG.class),
+			define(V4_CHANNEL, 0x23, CLIENT_TO_SERVER, CPacketRequestServerInfoV4EAG.class),
+			define(V4_CHANNEL, 0x24, SERVER_TO_CLIENT, SPacketServerInfoDataChunkV4EAG.class),
+			define(V4_CHANNEL, 0x25, CLIENT_TO_SERVER, CPacketWebViewMessageEnV4EAG.class),
+			define(V4_CHANNEL, 0x26, CLIENT_TO_SERVER, CPacketWebViewMessageV4EAG.class),
+			define(V4_CHANNEL, 0x27, SERVER_TO_CLIENT, SPacketWebViewMessageV4EAG.class),
+			define(V4_CHANNEL, 0x28, SERVER_TO_CLIENT, SPacketNotifIconsRegisterV4EAG.class),
+			define(V4_CHANNEL, 0x29, SERVER_TO_CLIENT, SPacketNotifIconsReleaseV4EAG.class),
+			define(V4_CHANNEL, 0x2A, SERVER_TO_CLIENT, SPacketNotifBadgeShowV4EAG.class),
+			define(V4_CHANNEL, 0x2B, SERVER_TO_CLIENT, SPacketNotifBadgeHideV4EAG.class)
+	);
+
+	public final int ver;
+
+	private final Map<String, Object>[] channelMap;
+	private final Map<Class<? extends GameMessagePacket>, PacketDef>[] classMap;
+	private final Set<String> notChannelMap = new HashSet<>(); // populated in clinit
+
+	private static final GamePluginMessageProtocol[] PROTOCOLS_MAP = new GamePluginMessageProtocol[5];
+	private static final Set<String> allChannels = new HashSet<>();
+
+	private GamePluginMessageProtocol(int versionInt, PacketDef... packets) {
+		ver = versionInt;
+		channelMap = new Map[] { new HashMap<>(), new HashMap<>() };
+		classMap = new Map[] { new HashMap<>(), new HashMap<>() };
+		for(int i = 0; i < packets.length; ++i) {
+			PacketDef pkt = packets[i];
+			classMap[pkt.dir].put(pkt.clazz, pkt);
+			if(pkt.id == -1) {
+				channelMap[pkt.dir].put(pkt.channel, pkt);
+			}else {
+				PacketDef[] map = (PacketDef[])channelMap[pkt.dir].get(pkt.channel);
+				if(map == null || map.length <= pkt.id) {
+					PacketDef[] newMap = new PacketDef[((pkt.id + 1) & 0xF0) + 0x0F];
+					if(map != null) {
+						System.arraycopy(map, 0, newMap, 0, map.length);
+					}
+					map = newMap;
+					channelMap[pkt.dir].put(pkt.channel, map);
+				}
+				map[pkt.id] = pkt;
+			}
+		}
+	}
+
+	private static PacketDef define(String channel, int id, int dir, Class<? extends GameMessagePacket> clazz) {
+		return new PacketDef(channel, id, dir, clazz);
+	}
+
+	private static class PacketDef {
+		
+		private final String channel;
+		private final int id;
+		private final int dir;
+		private final Class<? extends GameMessagePacket> clazz;
+		
+		private PacketDef(String channel, int id, int dir, Class<? extends GameMessagePacket> clazz) {
+			this.channel = channel;
+			this.id = id;
+			this.dir = dir;
+			this.clazz = clazz;
+		}
+		
+	}
+
+	public GameMessagePacket readPacket(String channel, int direction, GamePacketInputBuffer buffer) throws IOException {
+		Object obj = channelMap[direction].get(channel);
+		if(obj == null) {
+			return null;
+		}
+		PacketDef toRead;
+		if(obj instanceof PacketDef) {
+			toRead = (PacketDef)obj;
+		}else {
+			int pktId = buffer.readUnsignedByte();
+			PacketDef[] pkts = (PacketDef[])obj;
+			if(pktId < 0 || pktId >= pkts.length || (toRead = pkts[pktId]) == null) {
+				throw new IOException("[" + channel + "] Unknown packet ID: " + pktId);
+			}
+		}
+		GameMessagePacket ret;
+		try {
+			ret = toRead.clazz.newInstance();
+		}catch(Throwable t) {
+			throw new RuntimeException("Reflection failed to call packet constructor! (Is it defined?)", t);
+		}
+		ret.readPacket(buffer);
+		return ret;
+	}
+
+	public String writePacket(int direction, GamePacketOutputBuffer stream, GameMessagePacket packet) throws IOException {
+		Class<? extends GameMessagePacket> clazz = packet.getClass();
+		PacketDef def = classMap[direction].get(clazz);
+		if(def == null) {
+			throw new IOException("Unknown packet type or wrong direction: " + clazz);
+		}
+		if(def.id != -1) {
+			stream.writeByte(def.id);
+		}
+		packet.writePacket(stream);
+		return def.channel;
+	}
+
+	public List<String> filterProtocols(Collection<String> data) {
+		List<String> ret = new ArrayList<>(data.size());
+		for(String str : data) {
+			if(!notChannelMap.contains(str)) {
+				ret.add(str);
+			}
+		}
+		return ret;
+	}
+
+	public static GamePluginMessageProtocol getByVersion(int ver) {
+		if(ver < 0 || ver > PROTOCOLS_MAP.length) {
+			return null;
+		}
+		return PROTOCOLS_MAP[ver];
+	}
+
+	public static Set<String> getAllChannels() {
+		return allChannels;
+	}
+
+	static {
+		GamePluginMessageProtocol[] _values = values();
+		PROTOCOLS_MAP[2] = V3;
+		for(int i = 0; i < _values.length; ++i) {
+			GamePluginMessageProtocol protocol = _values[i];
+			PROTOCOLS_MAP[protocol.ver] = protocol;
+			allChannels.addAll(protocol.channelMap[CLIENT_TO_SERVER].keySet());
+			allChannels.addAll(protocol.channelMap[SERVER_TO_CLIENT].keySet());
+		}
+		for(int i = 0; i < _values.length; ++i) {
+			GamePluginMessageProtocol protocol = _values[i];
+			protocol.notChannelMap.addAll(allChannels);
+			protocol.notChannelMap.removeAll(protocol.channelMap[CLIENT_TO_SERVER].keySet());
+			protocol.notChannelMap.removeAll(protocol.channelMap[SERVER_TO_CLIENT].keySet());
+		}
+	}
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/GameMessageHandler.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/GameMessageHandler.java
new file mode 100755
index 0000000..f82abba
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/GameMessageHandler.java
@@ -0,0 +1,207 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.*;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.*;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface GameMessageHandler {
+
+	default void handleClient(CPacketGetOtherCapeEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketGetOtherSkinEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketGetSkinByURLEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketInstallSkinSPEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketVoiceSignalConnectEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketVoiceSignalDescEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketVoiceSignalDisconnectV3EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketVoiceSignalDisconnectV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketVoiceSignalDisconnectPeerV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketVoiceSignalICEEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketVoiceSignalRequestEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketGetOtherClientUUIDV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketRequestServerInfoV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketWebViewMessageV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleClient(CPacketWebViewMessageEnV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketEnableFNAWSkinsEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketOtherCapeCustomEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketOtherCapePresetEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketOtherSkinCustomV3EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketOtherSkinCustomV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketOtherSkinPresetEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketUpdateCertEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketVoiceSignalAllowedEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketVoiceSignalConnectV3EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketVoiceSignalConnectV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketVoiceSignalConnectAnnounceV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketVoiceSignalDescEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketVoiceSignalDisconnectPeerEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketVoiceSignalGlobalEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketVoiceSignalICEEAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketForceClientSkinPresetV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketForceClientSkinCustomV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketSetServerCookieV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketRedirectClientV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketOtherPlayerClientUUIDV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketForceClientCapePresetV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketForceClientCapeCustomV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketInvalidatePlayerCacheV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketUnforceClientV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketCustomizePauseMenuV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketServerInfoDataChunkV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketWebViewMessageV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketNotifIconsRegisterV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketNotifIconsReleaseV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketNotifBadgeShowV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+	default void handleServer(SPacketNotifBadgeHideV4EAG packet) {
+		throw new WrongPacketException();
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/GameMessagePacket.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/GameMessagePacket.java
new file mode 100755
index 0000000..5c2f2f7
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/GameMessagePacket.java
@@ -0,0 +1,33 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface GameMessagePacket {
+
+	void readPacket(GamePacketInputBuffer buffer) throws IOException;
+
+	void writePacket(GamePacketOutputBuffer buffer) throws IOException;
+
+	void handlePacket(GameMessageHandler handler);
+
+	int length();
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/WrongPacketException.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/WrongPacketException.java
new file mode 100755
index 0000000..fbab52d
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/WrongPacketException.java
@@ -0,0 +1,24 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class WrongPacketException extends RuntimeException {
+
+	public WrongPacketException() {
+		super("Wrong packet type recieved for the current handler!");
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetOtherCapeEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetOtherCapeEAG.java
new file mode 100755
index 0000000..d94ee04
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetOtherCapeEAG.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketGetOtherCapeEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+
+	public CPacketGetOtherCapeEAG() {
+	}
+
+	public CPacketGetOtherCapeEAG(long uuidMost, long uuidLeast) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 16;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetOtherClientUUIDV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetOtherClientUUIDV4EAG.java
new file mode 100755
index 0000000..97e7418
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetOtherClientUUIDV4EAG.java
@@ -0,0 +1,64 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketGetOtherClientUUIDV4EAG implements GameMessagePacket {
+
+	public int requestId;
+	public long playerUUIDMost;
+	public long playerUUIDLeast;
+
+	public CPacketGetOtherClientUUIDV4EAG() {
+	}
+
+	public CPacketGetOtherClientUUIDV4EAG(int requestId, long playerUUIDMost, long playerUUIDLeast) {
+		this.requestId = requestId;
+		this.playerUUIDMost = playerUUIDMost;
+		this.playerUUIDLeast = playerUUIDLeast;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		requestId = buffer.readVarInt();
+		playerUUIDMost = buffer.readLong();
+		playerUUIDLeast = buffer.readLong();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeVarInt(requestId);
+		buffer.writeLong(playerUUIDMost);
+		buffer.writeLong(playerUUIDLeast);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return GamePacketOutputBuffer.getVarIntSize(requestId) + 16;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetOtherSkinEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetOtherSkinEAG.java
new file mode 100755
index 0000000..9d61138
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetOtherSkinEAG.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketGetOtherSkinEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+
+	public CPacketGetOtherSkinEAG() {
+	}
+
+	public CPacketGetOtherSkinEAG(long uuidMost, long uuidLeast) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 16;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetSkinByURLEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetSkinByURLEAG.java
new file mode 100755
index 0000000..7ebca6f
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketGetSkinByURLEAG.java
@@ -0,0 +1,64 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketGetSkinByURLEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public String url;
+
+	public CPacketGetSkinByURLEAG() {
+	}
+
+	public CPacketGetSkinByURLEAG(long uuidMost, long uuidLeast, String url) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.url = url;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		url = buffer.readStringEaglerASCII16();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.writeStringEaglerASCII16(url);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 18 + url.length();
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketInstallSkinSPEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketInstallSkinSPEAG.java
new file mode 100755
index 0000000..417b603
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketInstallSkinSPEAG.java
@@ -0,0 +1,58 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketInstallSkinSPEAG implements GameMessagePacket {
+
+	public byte[] customSkin;
+
+	public CPacketInstallSkinSPEAG() {
+	}
+
+	public CPacketInstallSkinSPEAG(byte[] customSkin) {
+		this.customSkin = customSkin;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		customSkin = new byte[buffer.readUnsignedShort()];
+		buffer.readFully(customSkin);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeShort(customSkin.length);
+		buffer.write(customSkin);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 2 + customSkin.length;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketRequestServerInfoV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketRequestServerInfoV4EAG.java
new file mode 100755
index 0000000..eec1287
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketRequestServerInfoV4EAG.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketRequestServerInfoV4EAG implements GameMessagePacket {
+
+	public byte[] requestHash;
+
+	public CPacketRequestServerInfoV4EAG() {
+	}
+
+	public CPacketRequestServerInfoV4EAG(byte[] requestHash) {
+		this.requestHash = requestHash;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		requestHash = new byte[20];
+		buffer.readFully(requestHash);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(requestHash.length != 20) {
+			throw new IOException("Hash must be 20 bytes! (" + requestHash.length + " given)");
+		}
+		buffer.write(requestHash);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 20;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalConnectEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalConnectEAG.java
new file mode 100755
index 0000000..873baf4
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalConnectEAG.java
@@ -0,0 +1,48 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketVoiceSignalConnectEAG implements GameMessagePacket {
+
+	public CPacketVoiceSignalConnectEAG() {
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 0;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDescEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDescEAG.java
new file mode 100755
index 0000000..539bd45
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDescEAG.java
@@ -0,0 +1,80 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketVoiceSignalDescEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public byte[] desc;
+
+	public CPacketVoiceSignalDescEAG() {
+	}
+
+	public CPacketVoiceSignalDescEAG(long uuidMost, long uuidLeast, byte[] desc) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.desc = desc;
+	}
+
+	public CPacketVoiceSignalDescEAG(long uuidMost, long uuidLeast, String desc) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.desc = desc.getBytes(StandardCharsets.UTF_8);
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		int descLen = buffer.readVarInt();
+		if(descLen > 32750) {
+			throw new IOException("Voice signal packet DESC too long!");
+		}
+		desc = new byte[descLen];
+		buffer.readFully(desc);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(desc.length > 32750) {
+			throw new IOException("Voice signal packet DESC too long!");
+		}
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.writeVarInt(desc.length);
+		buffer.write(desc);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 16 + GamePacketOutputBuffer.getArrayMCSize(desc.length);
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDisconnectPeerV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDisconnectPeerV4EAG.java
new file mode 100755
index 0000000..caad482
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDisconnectPeerV4EAG.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketVoiceSignalDisconnectPeerV4EAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+
+	public CPacketVoiceSignalDisconnectPeerV4EAG() {
+	}
+
+	public CPacketVoiceSignalDisconnectPeerV4EAG(long uuidMost, long uuidLeast) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 16;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDisconnectV3EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDisconnectV3EAG.java
new file mode 100755
index 0000000..8c99cdf
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDisconnectV3EAG.java
@@ -0,0 +1,69 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketVoiceSignalDisconnectV3EAG implements GameMessagePacket {
+
+	public boolean isPeerType;
+	public long uuidMost;
+	public long uuidLeast;
+
+	public CPacketVoiceSignalDisconnectV3EAG() {
+	}
+
+	public CPacketVoiceSignalDisconnectV3EAG(boolean isPeerType, long uuidMost, long uuidLeast) {
+		this.isPeerType = isPeerType;
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		if(buffer.available() > 0) {
+			isPeerType = true;
+			uuidMost = buffer.readLong();
+			uuidLeast = buffer.readLong();
+		}else {
+			isPeerType = false;
+		}
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(isPeerType) {
+			buffer.writeLong(uuidMost);
+			buffer.writeLong(uuidLeast);
+		}
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return isPeerType ? 16 : 0;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDisconnectV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDisconnectV4EAG.java
new file mode 100755
index 0000000..c65ced8
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalDisconnectV4EAG.java
@@ -0,0 +1,48 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketVoiceSignalDisconnectV4EAG implements GameMessagePacket {
+
+	public CPacketVoiceSignalDisconnectV4EAG() {
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 0;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalICEEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalICEEAG.java
new file mode 100755
index 0000000..8de5fca
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalICEEAG.java
@@ -0,0 +1,80 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketVoiceSignalICEEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public byte[] ice;
+
+	public CPacketVoiceSignalICEEAG() {
+	}
+
+	public CPacketVoiceSignalICEEAG(long uuidMost, long uuidLeast, byte[] ice) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.ice = ice;
+	}
+
+	public CPacketVoiceSignalICEEAG(long uuidMost, long uuidLeast, String ice) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.ice = ice.getBytes(StandardCharsets.UTF_8);
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		int iceLen = buffer.readVarInt();
+		if(iceLen > 32750) {
+			throw new IOException("Voice signal packet ICE too long!");
+		}
+		ice = new byte[iceLen];
+		buffer.readFully(ice);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(ice.length > 32750) {
+			throw new IOException("Voice signal packet ICE too long!");
+		}
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.writeVarInt(ice.length);
+		buffer.write(ice);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 16 + GamePacketOutputBuffer.getArrayMCSize(ice.length);
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalRequestEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalRequestEAG.java
new file mode 100755
index 0000000..7ccd93f
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketVoiceSignalRequestEAG.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketVoiceSignalRequestEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+
+	public CPacketVoiceSignalRequestEAG() {
+	}
+
+	public CPacketVoiceSignalRequestEAG(long uuidMost, long uuidLeast) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 16;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketWebViewMessageEnV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketWebViewMessageEnV4EAG.java
new file mode 100755
index 0000000..c355c34
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketWebViewMessageEnV4EAG.java
@@ -0,0 +1,71 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketWebViewMessageEnV4EAG implements GameMessagePacket {
+
+	public boolean messageChannelOpen;
+	public String channelName;
+
+	public CPacketWebViewMessageEnV4EAG() {
+	}
+
+	public CPacketWebViewMessageEnV4EAG(boolean messageChannelOpen, String channelName) {
+		this.messageChannelOpen = messageChannelOpen;
+		this.channelName = channelName;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		messageChannelOpen = buffer.readBoolean();
+		if(messageChannelOpen) {
+			channelName = buffer.readStringEaglerASCII8();
+		}
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeBoolean(messageChannelOpen);
+		if(messageChannelOpen) {
+			if(channelName != null) {
+				if(channelName.length() > 255) {
+					throw new IOException("Channel name too long! (255 max, " + channelName.length() + " given)");
+				}
+				buffer.writeStringEaglerASCII8(channelName);
+			}else {
+				buffer.writeByte(0);
+			}
+		}
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return messageChannelOpen ? 2 + (channelName != null ? channelName.length() : 0) : 1;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketWebViewMessageV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketWebViewMessageV4EAG.java
new file mode 100755
index 0000000..501390c
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/client/CPacketWebViewMessageV4EAG.java
@@ -0,0 +1,74 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class CPacketWebViewMessageV4EAG implements GameMessagePacket {
+
+	public static final int TYPE_STRING = 0;
+	public static final int TYPE_BINARY = 1;
+
+	public int type;
+	public byte[] data;
+
+	public CPacketWebViewMessageV4EAG() {
+	}
+
+	public CPacketWebViewMessageV4EAG(int type, byte[] data) {
+		this.type = type;
+		this.data = data;
+	}
+
+	public CPacketWebViewMessageV4EAG(String str) {
+		this.type = TYPE_STRING;
+		this.data = str.getBytes(StandardCharsets.UTF_8);
+	}
+
+	public CPacketWebViewMessageV4EAG(byte[] data) {
+		this.type = TYPE_BINARY;
+		this.data = data;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		type = buffer.readUnsignedByte();
+		data = buffer.readByteArrayMC();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeByte(type);
+		buffer.writeByteArrayMC(data);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleClient(this);
+	}
+
+	@Override
+	public int length() {
+		return 1 + GamePacketOutputBuffer.getVarIntSize(data.length) + data.length;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketCustomizePauseMenuV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketCustomizePauseMenuV4EAG.java
new file mode 100755
index 0000000..be8e07a
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketCustomizePauseMenuV4EAG.java
@@ -0,0 +1,193 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.util.PacketImageData;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketCustomizePauseMenuV4EAG implements GameMessagePacket {
+
+	public static final int SERVER_INFO_MODE_NONE = 0;
+	public static final int SERVER_INFO_MODE_EXTERNAL_URL = 1;
+	public static final int SERVER_INFO_MODE_SHOW_EMBED_OVER_HTTP = 2;
+	public static final int SERVER_INFO_MODE_SHOW_EMBED_OVER_WS = 3;
+
+	public static final int SERVER_INFO_EMBED_PERMS_JAVASCRIPT = 1;
+	public static final int SERVER_INFO_EMBED_PERMS_MESSAGE_API = 2;
+	public static final int SERVER_INFO_EMBED_PERMS_STRICT_CSP = 4;
+
+	public static final int DISCORD_MODE_NONE = 0;
+	public static final int DISCORD_MODE_INVITE_URL = 1;
+
+	public int serverInfoMode;
+	public String serverInfoButtonText;
+	public String serverInfoURL;
+	public byte[] serverInfoHash;
+	public int serverInfoEmbedPerms;
+	public String serverInfoEmbedTitle;
+	public int discordButtonMode;
+	public String discordButtonText;
+	public String discordInviteURL;
+
+	public Map<String,Integer> imageMappings;
+	public List<PacketImageData> imageData;
+
+	public SPacketCustomizePauseMenuV4EAG() {
+	}
+
+	public SPacketCustomizePauseMenuV4EAG(int serverInfoMode, String serverInfoButtonText, String serverInfoURL,
+			byte[] serverInfoHash, int serverInfoEmbedPerms, String serverInfoEmbedTitle, int discordButtonMode,
+			String discordButtonText, String discordInviteURL, Map<String, Integer> imageMappings,
+			List<PacketImageData> imageData) {
+		this.serverInfoMode = serverInfoMode;
+		this.serverInfoButtonText = serverInfoButtonText;
+		this.serverInfoURL = serverInfoURL;
+		this.serverInfoHash = serverInfoHash;
+		this.serverInfoEmbedPerms = serverInfoEmbedPerms;
+		this.serverInfoEmbedTitle = serverInfoEmbedTitle;
+		this.discordButtonMode = discordButtonMode;
+		this.discordButtonText = discordButtonText;
+		this.discordInviteURL = discordInviteURL;
+		this.imageMappings = imageMappings;
+		this.imageData = imageData;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		imageMappings = null;
+		imageData = null;
+		int flags = buffer.readUnsignedByte();
+		serverInfoMode = (flags & 15);
+		discordButtonMode = ((flags >> 4) & 15);
+		switch(serverInfoMode) {
+		case SERVER_INFO_MODE_EXTERNAL_URL:
+			serverInfoButtonText = buffer.readStringMC(127);
+			serverInfoURL = buffer.readStringEaglerASCII16();
+			serverInfoEmbedPerms = 0;
+			serverInfoHash = null;
+			break;
+		case SERVER_INFO_MODE_SHOW_EMBED_OVER_HTTP:
+			serverInfoButtonText = buffer.readStringMC(127);
+			serverInfoURL = buffer.readStringEaglerASCII16();
+			serverInfoEmbedPerms = buffer.readUnsignedByte();
+			serverInfoHash = null;
+			serverInfoEmbedTitle = buffer.readStringMC(127);
+			break;
+		case SERVER_INFO_MODE_SHOW_EMBED_OVER_WS:
+			serverInfoButtonText = buffer.readStringMC(127);
+			serverInfoURL = null;
+			serverInfoEmbedPerms = buffer.readUnsignedByte();
+			serverInfoHash = new byte[20];
+			serverInfoEmbedTitle = buffer.readStringMC(127);
+			buffer.readFully(serverInfoHash);
+			break;
+		default:
+			serverInfoButtonText = null;
+			serverInfoURL = null;
+			serverInfoEmbedPerms = 0;
+			serverInfoHash = null;
+			break;
+		}
+		if(discordButtonMode == DISCORD_MODE_INVITE_URL) {
+			discordButtonText = buffer.readStringMC(127);
+			discordInviteURL = buffer.readStringEaglerASCII16();
+		}else {
+			discordButtonText = null;
+			discordInviteURL = null;
+		}
+		int mappingsCount = buffer.readVarInt();
+		if(mappingsCount > 0) {
+			imageMappings = new HashMap<>();
+			imageData = new ArrayList<>();
+			for(int i = 0; i < mappingsCount; ++i) {
+				imageMappings.put(buffer.readStringEaglerASCII8(), buffer.readVarInt());
+			}
+			int imageDataCount = buffer.readVarInt();
+			for(int i = 0; i < imageDataCount; ++i) {
+				imageData.add(PacketImageData.readRGB16(buffer));
+			}
+		}
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeByte(serverInfoMode | (discordButtonMode << 4));
+		switch(serverInfoMode) {
+		case SERVER_INFO_MODE_EXTERNAL_URL:
+			buffer.writeStringMC(serverInfoButtonText);
+			buffer.writeStringEaglerASCII16(serverInfoURL);
+			break;
+		case SERVER_INFO_MODE_SHOW_EMBED_OVER_HTTP:
+			buffer.writeStringMC(serverInfoButtonText);
+			buffer.writeStringEaglerASCII16(serverInfoURL);
+			buffer.writeByte(serverInfoEmbedPerms);
+			buffer.writeStringMC(serverInfoEmbedTitle);
+			break;
+		case SERVER_INFO_MODE_SHOW_EMBED_OVER_WS:
+			buffer.writeStringMC(serverInfoButtonText);
+			buffer.writeByte(serverInfoEmbedPerms);
+			buffer.writeStringMC(serverInfoEmbedTitle);
+			if(serverInfoHash.length != 20) {
+				throw new IOException("Hash must be 20 bytes! (" + serverInfoHash.length + " given)");
+			}
+			buffer.write(serverInfoHash);
+			break;
+		default:
+			break;
+		}
+		if(discordButtonMode == DISCORD_MODE_INVITE_URL) {
+			buffer.writeStringMC(discordButtonText);
+			buffer.writeStringEaglerASCII16(discordInviteURL);
+		}
+		if(imageMappings != null && !imageMappings.isEmpty()) {
+			buffer.writeVarInt(imageMappings.size());
+			for(Entry<String,Integer> etr : imageMappings.entrySet()) {
+				buffer.writeStringEaglerASCII8(etr.getKey());
+				buffer.writeVarInt(etr.getValue().intValue());
+			}
+			buffer.writeVarInt(imageData.size());
+			for(PacketImageData etr : imageData) {
+				if(etr.width < 1 || etr.width > 64 || etr.height < 1 || etr.height > 64) {
+					throw new IOException("Invalid image dimensions in packet, must be between 1x1 and 64x64, got " + etr.width + "x" + etr.height);
+				}
+				PacketImageData.writeRGB16(buffer, etr);
+			}
+		}else {
+			buffer.writeByte(0);
+		}
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return -1;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketEnableFNAWSkinsEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketEnableFNAWSkinsEAG.java
new file mode 100755
index 0000000..a8b7fe6
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketEnableFNAWSkinsEAG.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketEnableFNAWSkinsEAG implements GameMessagePacket {
+
+	public boolean enableSkins;
+	public boolean force;
+
+	public SPacketEnableFNAWSkinsEAG() {
+	}
+
+	public SPacketEnableFNAWSkinsEAG(boolean enableSkins, boolean force) {
+		this.enableSkins = enableSkins;
+		this.force = force;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		int i = buffer.readUnsignedByte();
+		enableSkins = (i & 1) != 0;
+		force = (i & 2) != 0;
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeByte((enableSkins ? 1 : 0) | (force ? 2 : 0));
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 1;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientCapeCustomV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientCapeCustomV4EAG.java
new file mode 100755
index 0000000..1b46e5f
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientCapeCustomV4EAG.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketForceClientCapeCustomV4EAG implements GameMessagePacket {
+
+	public byte[] customCape;
+
+	public SPacketForceClientCapeCustomV4EAG() {
+	}
+
+	public SPacketForceClientCapeCustomV4EAG(byte[] customCape) {
+		this.customCape = customCape;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		customCape = new byte[1173];
+		buffer.readFully(customCape);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(customCape.length != 1173) {
+			throw new IOException("Custom cape data length is not 1173 bytes! (" + customCape.length + ")");
+		}
+		buffer.write(customCape);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 1173;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientCapePresetV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientCapePresetV4EAG.java
new file mode 100755
index 0000000..ed84090
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientCapePresetV4EAG.java
@@ -0,0 +1,56 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketForceClientCapePresetV4EAG implements GameMessagePacket {
+
+	public int presetCape;
+
+	public SPacketForceClientCapePresetV4EAG() {
+	}
+
+	public SPacketForceClientCapePresetV4EAG(int presetCape) {
+		this.presetCape = presetCape;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		presetCape = buffer.readInt();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeInt(presetCape);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 4;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientSkinCustomV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientSkinCustomV4EAG.java
new file mode 100755
index 0000000..2488d70
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientSkinCustomV4EAG.java
@@ -0,0 +1,64 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketForceClientSkinCustomV4EAG implements GameMessagePacket {
+
+	public int modelID;
+	public byte[] customSkin;
+
+	public SPacketForceClientSkinCustomV4EAG() {
+	}
+
+	public SPacketForceClientSkinCustomV4EAG(int modelID, byte[] customSkin) {
+		this.modelID = modelID;
+		this.customSkin = customSkin;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		modelID = buffer.readUnsignedByte();
+		customSkin = new byte[12288];
+		buffer.readFully(customSkin);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(customSkin.length != 12288) {
+			throw new IOException("Custom skin data length is not 12288 bytes! (" + customSkin.length + ")");
+		}
+		buffer.write(modelID);
+		buffer.write(customSkin);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 12289;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientSkinPresetV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientSkinPresetV4EAG.java
new file mode 100755
index 0000000..d7e8aa7
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketForceClientSkinPresetV4EAG.java
@@ -0,0 +1,56 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketForceClientSkinPresetV4EAG implements GameMessagePacket {
+
+	public int presetSkin;
+
+	public SPacketForceClientSkinPresetV4EAG() {
+	}
+
+	public SPacketForceClientSkinPresetV4EAG(int presetSkin) {
+		this.presetSkin = presetSkin;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		presetSkin = buffer.readInt();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeInt(presetSkin);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 4;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketInvalidatePlayerCacheV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketInvalidatePlayerCacheV4EAG.java
new file mode 100755
index 0000000..414bffb
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketInvalidatePlayerCacheV4EAG.java
@@ -0,0 +1,114 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.RandomAccess;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketInvalidatePlayerCacheV4EAG implements GameMessagePacket {
+
+	public Collection<InvalidateRequest> players;
+
+	public static class InvalidateRequest {
+		
+		public final boolean invalidateSkin;
+		public final boolean invalidateCape;
+		public final long uuidMost;
+		public final long uuidLeast;
+		
+		public InvalidateRequest(boolean invalidateSkin, boolean invalidateCape, long uuidMost, long uuidLeast) {
+			this.invalidateSkin = invalidateSkin;
+			this.invalidateCape = invalidateCape;
+			this.uuidMost = uuidMost;
+			this.uuidLeast = uuidLeast;
+		}
+		
+	}
+
+	public SPacketInvalidatePlayerCacheV4EAG() {
+	}
+
+	public SPacketInvalidatePlayerCacheV4EAG(Collection<InvalidateRequest> players) {
+		this.players = players;
+	}
+
+	public SPacketInvalidatePlayerCacheV4EAG(InvalidateRequest... players) {
+		this.players = Arrays.asList(players);
+	}
+
+	public SPacketInvalidatePlayerCacheV4EAG(boolean invalidateSkin, boolean invalidateCape, long uuidMost, long uuidLeast) {
+		this.players = Arrays.asList(new InvalidateRequest(invalidateSkin, invalidateCape, uuidMost, uuidLeast));
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		int cnt = buffer.readVarInt();
+		List<InvalidateRequest> userList = (List<InvalidateRequest>)(players = new ArrayList<>(cnt));
+		if(cnt > 0) {
+			for(int i = 0; i < cnt; ++i) {
+				int flags = buffer.readUnsignedByte();
+				userList.add(new InvalidateRequest((flags & 1) != 0, (flags & 2) != 0, buffer.readLong(), buffer.readLong()));
+			}
+		}
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(players == null || players.size() == 0) {
+			buffer.write(0);
+		}else {
+			if(players instanceof RandomAccess) {
+				List<InvalidateRequest> userList = (List<InvalidateRequest>)players;
+				int cnt = userList.size();
+				buffer.writeVarInt(cnt);
+				for(int i = 0; i < cnt; ++i) {
+					InvalidateRequest dt = userList.get(i);
+					buffer.writeByte((dt.invalidateSkin ? 1 : 0) | (dt.invalidateCape ? 2 : 0));
+					buffer.writeLong(dt.uuidMost);
+					buffer.writeLong(dt.uuidLeast);
+				}
+			}else {
+				buffer.writeVarInt(players.size());
+				for(InvalidateRequest dt : players) {
+					buffer.writeByte((dt.invalidateSkin ? 1 : 0) | (dt.invalidateCape ? 2 : 0));
+					buffer.writeLong(dt.uuidMost);
+					buffer.writeLong(dt.uuidLeast);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		int cnt = players.size();
+		return GamePacketOutputBuffer.getVarIntSize(cnt) + 17 * cnt;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifBadgeHideV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifBadgeHideV4EAG.java
new file mode 100755
index 0000000..2fb67b4
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifBadgeHideV4EAG.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketNotifBadgeHideV4EAG implements GameMessagePacket {
+
+	public long badgeUUIDMost;
+	public long badgeUUIDLeast;
+
+	public SPacketNotifBadgeHideV4EAG() {
+	}
+
+	public SPacketNotifBadgeHideV4EAG(long badgeUUIDMost, long badgeUUIDLeast) {
+		this.badgeUUIDMost = badgeUUIDMost;
+		this.badgeUUIDLeast = badgeUUIDLeast;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		badgeUUIDMost = buffer.readLong();
+		badgeUUIDLeast = buffer.readLong();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(badgeUUIDMost);
+		buffer.writeLong(badgeUUIDLeast);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 16;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifBadgeShowV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifBadgeShowV4EAG.java
new file mode 100755
index 0000000..2a22028
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifBadgeShowV4EAG.java
@@ -0,0 +1,172 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketNotifBadgeShowV4EAG implements GameMessagePacket {
+
+	public static enum EnumBadgePriority {
+		LOW(0), NORMAL(1), HIGHER(2), HIGHEST(3);
+		
+		public final int priority;
+		
+		private EnumBadgePriority(int priority) {
+			this.priority = priority;
+		}
+		
+		private static final EnumBadgePriority[] lookup = new EnumBadgePriority[4];
+		
+		public static EnumBadgePriority getByID(int id) {
+			if(id >= 0 && id < lookup.length) {
+				return lookup[id];
+			}else {
+				return NORMAL;
+			}
+		}
+		
+		static {
+			EnumBadgePriority[] _values = values();
+			for(int i = 0; i < _values.length; ++i) {
+				lookup[_values[i].priority] = _values[i];
+			}
+		}
+	}
+
+	public long badgeUUIDMost;
+	public long badgeUUIDLeast;
+	public String bodyComponent;
+	public String titleComponent;
+	public String sourceComponent;
+	public long originalTimestampSec;
+	public boolean silent;
+	public EnumBadgePriority priority;
+	public long mainIconUUIDMost;
+	public long mainIconUUIDLeast;
+	public long titleIconUUIDMost;
+	public long titleIconUUIDLeast;
+	public int hideAfterSec;
+	public int expireAfterSec;
+	public int backgroundColor;
+	public int bodyTxtColor;
+	public int titleTxtColor;
+	public int sourceTxtColor;
+
+	public SPacketNotifBadgeShowV4EAG() {
+	}
+
+	public SPacketNotifBadgeShowV4EAG(long badgeUUIDMost, long badgeUUIDLeast, String bodyComponent,
+			String titleComponent, String sourceComponent, long originalTimestampSec, boolean silent,
+			EnumBadgePriority priority, long mainIconUUIDMost, long mainIconUUIDLeast, long titleIconUUIDMost,
+			long titleIconUUIDLeast, int hideAfterSec, int expireAfterSec, int backgroundColor, int bodyTxtColor,
+			int titleTxtColor, int sourceTxtColor) {
+		this.badgeUUIDMost = badgeUUIDMost;
+		this.badgeUUIDLeast = badgeUUIDLeast;
+		this.bodyComponent = bodyComponent;
+		this.titleComponent = titleComponent;
+		this.sourceComponent = sourceComponent;
+		this.originalTimestampSec = originalTimestampSec;
+		this.silent = silent;
+		this.priority = priority;
+		this.mainIconUUIDMost = mainIconUUIDMost;
+		this.mainIconUUIDLeast = mainIconUUIDLeast;
+		this.titleIconUUIDMost = titleIconUUIDMost;
+		this.titleIconUUIDLeast = titleIconUUIDLeast;
+		this.hideAfterSec = hideAfterSec;
+		this.expireAfterSec = expireAfterSec;
+		this.backgroundColor = backgroundColor;
+		this.bodyTxtColor = bodyTxtColor;
+		this.titleTxtColor = titleTxtColor;
+		this.sourceTxtColor = sourceTxtColor;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		badgeUUIDMost = buffer.readLong();
+		badgeUUIDLeast = buffer.readLong();
+		bodyComponent = buffer.readStringMC(32767);
+		titleComponent = buffer.readStringMC(255);
+		sourceComponent = buffer.readStringMC(255);
+		originalTimestampSec = ((long)buffer.readUnsignedShort() << 32l) | ((long)buffer.readInt() & 0xFFFFFFFFl);
+		int flags = buffer.readUnsignedByte();
+		silent = (flags & 1) != 0;
+		priority = EnumBadgePriority.getByID((flags >>> 1) & 3);
+		hideAfterSec = buffer.readUnsignedByte();
+		expireAfterSec = buffer.readUnsignedShort();
+		mainIconUUIDMost = (flags & 8) != 0 ? buffer.readLong() : 0l;
+		mainIconUUIDLeast = (flags & 8) != 0 ? buffer.readLong() : 0l;
+		titleIconUUIDMost = (flags & 16) != 0 ? buffer.readLong() : 0l;
+		titleIconUUIDLeast = (flags & 16) != 0 ? buffer.readLong() : 0l;
+		backgroundColor = (buffer.readUnsignedByte() << 16) | (buffer.readUnsignedByte() << 8) | buffer.readUnsignedByte();
+		bodyTxtColor = (buffer.readUnsignedByte() << 16) | (buffer.readUnsignedByte() << 8) | buffer.readUnsignedByte();
+		titleTxtColor = (buffer.readUnsignedByte() << 16) | (buffer.readUnsignedByte() << 8) | buffer.readUnsignedByte();
+		sourceTxtColor = (buffer.readUnsignedByte() << 16) | (buffer.readUnsignedByte() << 8) | buffer.readUnsignedByte();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(badgeUUIDMost);
+		buffer.writeLong(badgeUUIDLeast);
+		buffer.writeStringMC(bodyComponent);
+		buffer.writeStringMC(titleComponent);
+		buffer.writeStringMC(sourceComponent);
+		buffer.writeShort((int)((originalTimestampSec >>> 32l) & 0xFFFFl));
+		buffer.writeInt((int)(originalTimestampSec & 0xFFFFFFFFl));
+		int flags = (silent ? 1 : 0);
+		flags |= ((priority != null ? priority.priority : 1) << 1);
+		flags |= ((mainIconUUIDMost != 0l || mainIconUUIDLeast != 0l) ? 8 : 0);
+		flags |= ((titleIconUUIDMost != 0l || titleIconUUIDLeast != 0l) ? 16 : 0);
+		buffer.writeByte(flags);
+		buffer.writeByte(hideAfterSec);
+		buffer.writeShort(expireAfterSec);
+		if((flags & 8) != 0) {
+			buffer.writeLong(mainIconUUIDMost);
+			buffer.writeLong(mainIconUUIDLeast);
+		}
+		if((flags & 16) != 0) {
+			buffer.writeLong(titleIconUUIDMost);
+			buffer.writeLong(titleIconUUIDLeast);
+		}
+		buffer.writeByte((backgroundColor >>> 16) & 0xFF);
+		buffer.writeByte((backgroundColor >>> 8) & 0xFF);
+		buffer.writeByte(backgroundColor & 0xFF);
+		buffer.writeByte((bodyTxtColor >>> 16) & 0xFF);
+		buffer.writeByte((bodyTxtColor >>> 8) & 0xFF);
+		buffer.writeByte(bodyTxtColor & 0xFF);
+		buffer.writeByte((titleTxtColor >>> 16) & 0xFF);
+		buffer.writeByte((titleTxtColor >>> 8) & 0xFF);
+		buffer.writeByte(titleTxtColor & 0xFF);
+		buffer.writeByte((sourceTxtColor >>> 16) & 0xFF);
+		buffer.writeByte((sourceTxtColor >>> 8) & 0xFF);
+		buffer.writeByte(sourceTxtColor & 0xFF);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return -1;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifIconsRegisterV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifIconsRegisterV4EAG.java
new file mode 100755
index 0000000..5644b2a
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifIconsRegisterV4EAG.java
@@ -0,0 +1,111 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.RandomAccess;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.util.PacketImageData;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketNotifIconsRegisterV4EAG implements GameMessagePacket {
+
+	public static class CreateIcon {
+
+		public long uuidMost;
+		public long uuidLeast;
+		public PacketImageData imageData;
+
+		public CreateIcon(long uuidMost, long uuidLeast, PacketImageData imageData) {
+			this.uuidMost = uuidMost;
+			this.uuidLeast = uuidLeast;
+			this.imageData = imageData;
+		}
+
+		public int length() {
+			return 16 + imageData.getByteLengthRGB16();
+		}
+
+	}
+
+	public Collection<CreateIcon> iconsToCreate = null;
+
+	public SPacketNotifIconsRegisterV4EAG() {
+	}
+
+	public SPacketNotifIconsRegisterV4EAG(Collection<CreateIcon> iconsToCreate) {
+		this.iconsToCreate = iconsToCreate;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		int len = buffer.readVarInt();
+		iconsToCreate = new ArrayList<>(len);
+		for(int i = 0; i < len; ++i) {
+			iconsToCreate.add(new CreateIcon(buffer.readLong(), buffer.readLong(), PacketImageData.readRGB16(buffer)));
+		}
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(iconsToCreate instanceof RandomAccess) {
+			int len = iconsToCreate.size();
+			buffer.writeVarInt(len);
+			List<CreateIcon> vigg = (List<CreateIcon>)iconsToCreate;
+			for(int i = 0, l = vigg.size(); i < l; ++i) {
+				CreateIcon icn = vigg.get(i);
+				buffer.writeLong(icn.uuidMost);
+				buffer.writeLong(icn.uuidLeast);
+				PacketImageData.writeRGB16(buffer, icn.imageData);
+			}
+		}else {
+			buffer.writeVarInt(iconsToCreate.size());
+			for(CreateIcon icn : iconsToCreate) {
+				buffer.writeLong(icn.uuidMost);
+				buffer.writeLong(icn.uuidLeast);
+				PacketImageData.writeRGB16(buffer, icn.imageData);
+			}
+		}
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		int len = GamePacketOutputBuffer.getVarIntSize(iconsToCreate.size());
+		if(iconsToCreate instanceof RandomAccess) {
+			List<CreateIcon> vigg = (List<CreateIcon>)iconsToCreate;
+			for(int i = 0, l = vigg.size(); i < l; ++i) {
+				len += vigg.get(i).length();
+			}
+		}else {
+			for(CreateIcon icn : iconsToCreate) {
+				len += icn.length();
+			}
+		}
+		return len;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifIconsReleaseV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifIconsReleaseV4EAG.java
new file mode 100755
index 0000000..64858fe
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketNotifIconsReleaseV4EAG.java
@@ -0,0 +1,92 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.RandomAccess;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketNotifIconsReleaseV4EAG implements GameMessagePacket {
+
+	public static class DestroyIcon {
+
+		public long uuidMost;
+		public long uuidLeast;
+
+		public DestroyIcon(long uuidMost, long uuidLeast) {
+			this.uuidMost = uuidMost;
+			this.uuidLeast = uuidLeast;
+		}
+
+	}
+
+	public Collection<DestroyIcon> iconsToDestroy = null;
+
+	public SPacketNotifIconsReleaseV4EAG() {
+	}
+
+	public SPacketNotifIconsReleaseV4EAG(Collection<DestroyIcon> iconsToDestroy) {
+		this.iconsToDestroy = iconsToDestroy;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		int len = buffer.readVarInt();
+		iconsToDestroy = new ArrayList<>(len);
+		for(int i = 0; i < len; ++i) {
+			iconsToDestroy.add(new DestroyIcon(buffer.readLong(), buffer.readLong()));
+		}
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(iconsToDestroy instanceof RandomAccess) {
+			int len = iconsToDestroy.size();
+			buffer.writeVarInt(len);
+			List<DestroyIcon> vigg = (List<DestroyIcon>)iconsToDestroy;
+			for(int i = 0; i < len; ++i) {
+				DestroyIcon icn = vigg.get(i);
+				buffer.writeLong(icn.uuidMost);
+				buffer.writeLong(icn.uuidLeast);
+			}
+		}else {
+			buffer.writeVarInt(iconsToDestroy.size());
+			for(DestroyIcon icn : iconsToDestroy) {
+				buffer.writeLong(icn.uuidMost);
+				buffer.writeLong(icn.uuidLeast);
+			}
+		}
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		int len = iconsToDestroy.size();
+		return GamePacketOutputBuffer.getVarIntSize(len) + (len << 4);
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherCapeCustomEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherCapeCustomEAG.java
new file mode 100755
index 0000000..9526662
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherCapeCustomEAG.java
@@ -0,0 +1,68 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketOtherCapeCustomEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public byte[] customCape;
+
+	public SPacketOtherCapeCustomEAG() {
+	}
+
+	public SPacketOtherCapeCustomEAG(long uuidMost, long uuidLeast, byte[] customCape) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.customCape = customCape;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		customCape = new byte[1173];
+		buffer.readFully(customCape);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(customCape.length != 1173) {
+			throw new IOException("Custom cape data length is not 1173 bytes! (" + customCape.length + ")");
+		}
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.write(customCape);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 1189;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherCapePresetEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherCapePresetEAG.java
new file mode 100755
index 0000000..1631188
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherCapePresetEAG.java
@@ -0,0 +1,64 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketOtherCapePresetEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public int presetCape;
+
+	public SPacketOtherCapePresetEAG() {
+	}
+
+	public SPacketOtherCapePresetEAG(long uuidMost, long uuidLeast, int presetCape) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.presetCape = presetCape;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		presetCape = buffer.readInt();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.writeInt(presetCape);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 20;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherPlayerClientUUIDV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherPlayerClientUUIDV4EAG.java
new file mode 100755
index 0000000..70593d8
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherPlayerClientUUIDV4EAG.java
@@ -0,0 +1,64 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketOtherPlayerClientUUIDV4EAG implements GameMessagePacket {
+
+	public int requestId;
+	public long clientUUIDMost;
+	public long clientUUIDLeast;
+
+	public SPacketOtherPlayerClientUUIDV4EAG() {
+	}
+
+	public SPacketOtherPlayerClientUUIDV4EAG(int requestId, long playerUUIDMost, long playerUUIDLeast) {
+		this.requestId = requestId;
+		this.clientUUIDMost = playerUUIDMost;
+		this.clientUUIDLeast = playerUUIDLeast;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		requestId = buffer.readVarInt();
+		clientUUIDMost = buffer.readLong();
+		clientUUIDLeast = buffer.readLong();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeVarInt(requestId);
+		buffer.writeLong(clientUUIDMost);
+		buffer.writeLong(clientUUIDLeast);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return GamePacketOutputBuffer.getVarIntSize(requestId) + 16;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherSkinCustomV3EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherSkinCustomV3EAG.java
new file mode 100755
index 0000000..24bf190
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherSkinCustomV3EAG.java
@@ -0,0 +1,72 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketOtherSkinCustomV3EAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public int modelID;
+	public byte[] customSkin;
+
+	public SPacketOtherSkinCustomV3EAG() {
+	}
+
+	public SPacketOtherSkinCustomV3EAG(long uuidMost, long uuidLeast, int modelID, byte[] customSkin) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.modelID = modelID;
+		this.customSkin = customSkin;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		modelID = buffer.readUnsignedByte();
+		customSkin = new byte[16384];
+		buffer.readFully(customSkin);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(customSkin.length != 16384) {
+			throw new IOException("Custom skin data length is not 16384 bytes! (" + customSkin.length + ")");
+		}
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.writeByte(modelID);
+		buffer.write(customSkin);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 16401;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherSkinCustomV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherSkinCustomV4EAG.java
new file mode 100755
index 0000000..2ae61e2
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherSkinCustomV4EAG.java
@@ -0,0 +1,72 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketOtherSkinCustomV4EAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public int modelID;
+	public byte[] customSkin;
+
+	public SPacketOtherSkinCustomV4EAG() {
+	}
+
+	public SPacketOtherSkinCustomV4EAG(long uuidMost, long uuidLeast, int modelID, byte[] customSkin) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.modelID = modelID;
+		this.customSkin = customSkin;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		modelID = buffer.readUnsignedByte();
+		customSkin = new byte[12288];
+		buffer.readFully(customSkin);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(customSkin.length != 12288) {
+			throw new IOException("Custom skin data length is not 12288 bytes! (" + customSkin.length + ")");
+		}
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.write(modelID);
+		buffer.write(customSkin);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 12305;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherSkinPresetEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherSkinPresetEAG.java
new file mode 100755
index 0000000..7d6b6f4
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketOtherSkinPresetEAG.java
@@ -0,0 +1,64 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketOtherSkinPresetEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public int presetSkin;
+
+	public SPacketOtherSkinPresetEAG() {
+	}
+
+	public SPacketOtherSkinPresetEAG(long uuidMost, long uuidLeast, int presetSkin) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.presetSkin = presetSkin;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		presetSkin = buffer.readInt();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.writeInt(presetSkin);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 20;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketRedirectClientV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketRedirectClientV4EAG.java
new file mode 100755
index 0000000..02bc8ca
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketRedirectClientV4EAG.java
@@ -0,0 +1,56 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketRedirectClientV4EAG implements GameMessagePacket {
+
+	public String redirectURI;
+
+	public SPacketRedirectClientV4EAG() {
+	}
+
+	public SPacketRedirectClientV4EAG(String redirectURI) {
+		this.redirectURI = redirectURI;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		redirectURI = buffer.readStringEaglerASCII16();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeStringEaglerASCII16(redirectURI);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 2 + redirectURI.length();
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketServerInfoDataChunkV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketServerInfoDataChunkV4EAG.java
new file mode 100755
index 0000000..60e5ba5
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketServerInfoDataChunkV4EAG.java
@@ -0,0 +1,79 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketServerInfoDataChunkV4EAG implements GameMessagePacket {
+
+	public boolean lastChunk;
+	public int seqId;
+	public int finalSize;
+	public byte[] finalHash;
+	public byte[] data;
+
+	public SPacketServerInfoDataChunkV4EAG() {
+	}
+
+	public SPacketServerInfoDataChunkV4EAG(boolean lastChunk, int seqId, byte[] finalHash, int finalSize, byte[] data) {
+		this.lastChunk = lastChunk;
+		this.seqId = seqId;
+		this.finalHash = finalHash;
+		this.finalSize = finalSize;
+		this.data = data;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		lastChunk = buffer.readBoolean();
+		seqId = buffer.readVarInt();
+		finalSize = buffer.readVarInt();
+		finalHash = new byte[20];
+		buffer.readFully(finalHash);
+		data = new byte[buffer.readVarInt()];
+		buffer.readFully(data);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(finalHash.length != 20) {
+			throw new IOException("Hash must be 20 bytes! (" + finalHash.length + " given)");
+		}
+		buffer.writeBoolean(lastChunk);
+		buffer.writeVarInt(seqId);
+		buffer.writeVarInt(finalSize);
+		buffer.write(finalHash);
+		buffer.writeVarInt(data.length);
+		buffer.write(data);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 21 + GamePacketOutputBuffer.getVarIntSize(finalSize) + GamePacketOutputBuffer.getVarIntSize(seqId)
+				+ GamePacketOutputBuffer.getVarIntSize(data.length) + data.length;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketSetServerCookieV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketSetServerCookieV4EAG.java
new file mode 100755
index 0000000..cdbc33a
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketSetServerCookieV4EAG.java
@@ -0,0 +1,85 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketSetServerCookieV4EAG implements GameMessagePacket {
+
+	public boolean revokeQuerySupported;
+	public boolean saveCookieToDisk;
+	public long expires;
+	public byte[] data;
+
+	public SPacketSetServerCookieV4EAG() {
+	}
+
+	public SPacketSetServerCookieV4EAG(byte[] data, long expires, boolean revokeQuerySupported, boolean saveCookieToDisk) {
+		if(data.length > 255) {
+			throw new IllegalArgumentException("Cookie is too large! (Max 255 bytes)");
+		}
+		this.data = data;
+		this.expires = expires;
+		this.revokeQuerySupported = revokeQuerySupported;
+		this.saveCookieToDisk = saveCookieToDisk;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		byte b = buffer.readByte();
+		revokeQuerySupported = (b & 1) != 0;
+		saveCookieToDisk = (b & 2) != 0;
+		expires = buffer.readVarLong();
+		int len = buffer.readUnsignedByte();
+		if(len > 0) {
+			data = new byte[len];
+			buffer.readFully(data);
+		}else {
+			data = null;
+		}
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(data != null && data.length > 255) {
+			throw new IOException("Cookie is too large! (Max 255 bytes)");
+		}
+		buffer.writeByte((revokeQuerySupported ? 1 : 0) | (saveCookieToDisk ? 2 : 0));
+		buffer.writeVarLong(expires);
+		if(data != null) {
+			buffer.writeByte(data.length);
+			buffer.write(data);
+		}else {
+			buffer.writeByte(0);
+		}
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return GamePacketOutputBuffer.getVarLongSize(expires) + 2 + data.length;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketUnforceClientV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketUnforceClientV4EAG.java
new file mode 100755
index 0000000..a010515
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketUnforceClientV4EAG.java
@@ -0,0 +1,63 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketUnforceClientV4EAG implements GameMessagePacket {
+
+	public boolean resetSkin;
+	public boolean resetCape;
+	public boolean resetFNAW;
+
+	public SPacketUnforceClientV4EAG() {
+	}
+
+	public SPacketUnforceClientV4EAG(boolean resetSkin, boolean resetCape, boolean resetFNAW) {
+		this.resetSkin = resetSkin;
+		this.resetCape = resetCape;
+		this.resetFNAW = resetFNAW;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		int i = buffer.readUnsignedByte();
+		resetSkin = (i & 1) != 0;
+		resetCape = (i & 2) != 0;
+		resetFNAW = (i & 4) != 0;
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeByte((resetSkin ? 1 : 0) | (resetCape ? 2 : 0) | (resetFNAW ? 4 : 0));
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 1;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketUpdateCertEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketUpdateCertEAG.java
new file mode 100755
index 0000000..9e175fe
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketUpdateCertEAG.java
@@ -0,0 +1,58 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketUpdateCertEAG implements GameMessagePacket {
+
+	public byte[] updateCert;
+
+	public SPacketUpdateCertEAG() {
+	}
+
+	public SPacketUpdateCertEAG(byte[] updateCert) {
+		this.updateCert = updateCert;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		updateCert = buffer.toByteArray();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		// note: its better to send the raw bytes directly instead of
+		// using this class when programming a backend (for efficiency)
+		buffer.write(updateCert);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return updateCert.length;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalAllowedEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalAllowedEAG.java
new file mode 100755
index 0000000..1a8d267
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalAllowedEAG.java
@@ -0,0 +1,79 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketVoiceSignalAllowedEAG implements GameMessagePacket {
+
+	public boolean allowed;
+	public String[] iceServers;
+
+	public SPacketVoiceSignalAllowedEAG() {
+	}
+
+	public SPacketVoiceSignalAllowedEAG(boolean allowed, String[] iceServers) {
+		this.allowed = allowed;
+		this.iceServers = iceServers;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		allowed = buffer.readBoolean();
+		if(allowed) {
+			int numIce = buffer.readVarInt();
+			if(numIce > 64) {
+				throw new IOException("Too many STUN/TURN servers recieved! (" + numIce + ", max is 64!)");
+			}
+			iceServers = new String[numIce];
+			for(int i = 0; i < iceServers.length; ++i) {
+				iceServers[i] = buffer.readStringMC(1024);
+			}
+		}else {
+			iceServers = null;
+		}
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(allowed && iceServers.length > 64) {
+			throw new IOException("Too many STUN/TURN servers to send! (" + iceServers.length + ", max is 64!)");
+		}
+		buffer.writeBoolean(allowed);
+		if(allowed) {
+			buffer.writeVarInt(iceServers.length);
+			for(int i = 0; i < iceServers.length; ++i) {
+				buffer.writeStringMC(iceServers[i]);
+			}
+		}
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return -1;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalConnectAnnounceV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalConnectAnnounceV4EAG.java
new file mode 100755
index 0000000..13d5cdd
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalConnectAnnounceV4EAG.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketVoiceSignalConnectAnnounceV4EAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+
+	public SPacketVoiceSignalConnectAnnounceV4EAG() {
+	}
+
+	public SPacketVoiceSignalConnectAnnounceV4EAG(long uuidMost, long uuidLeast) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 16;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalConnectV3EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalConnectV3EAG.java
new file mode 100755
index 0000000..2eec170
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalConnectV3EAG.java
@@ -0,0 +1,73 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketVoiceSignalConnectV3EAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public boolean isAnnounceType;
+	public boolean offer;
+
+	public SPacketVoiceSignalConnectV3EAG() {
+	}
+
+	public SPacketVoiceSignalConnectV3EAG(long uuidMost, long uuidLeast, boolean isAnnounceType, boolean offer) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.isAnnounceType = isAnnounceType;
+		this.offer = offer;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		if(buffer.available() > 0) {
+			isAnnounceType = false;
+			offer = buffer.readBoolean();
+		}else {
+			isAnnounceType = true;
+		}
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		if(!isAnnounceType) {
+			buffer.writeBoolean(offer);
+		}
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return isAnnounceType ? 16 : 17;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalConnectV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalConnectV4EAG.java
new file mode 100755
index 0000000..014ec2c
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalConnectV4EAG.java
@@ -0,0 +1,64 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketVoiceSignalConnectV4EAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public boolean offer;
+
+	public SPacketVoiceSignalConnectV4EAG() {
+	}
+
+	public SPacketVoiceSignalConnectV4EAG(long uuidMost, long uuidLeast, boolean offer) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.offer = offer;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		offer = buffer.readBoolean();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.writeBoolean(offer);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 17;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalDescEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalDescEAG.java
new file mode 100755
index 0000000..d7db44e
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalDescEAG.java
@@ -0,0 +1,73 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketVoiceSignalDescEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public byte[] desc;
+
+	public SPacketVoiceSignalDescEAG() {
+	}
+
+	public SPacketVoiceSignalDescEAG(long uuidMost, long uuidLeast, byte[] desc) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.desc = desc;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		int descLen = buffer.readVarInt();
+		if(descLen > 32750) {
+			throw new IOException("Voice signal packet DESC too long!");
+		}
+		desc = new byte[descLen];
+		buffer.readFully(desc);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(desc.length > 32750) {
+			throw new IOException("Voice signal packet DESC too long!");
+		}
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.writeVarInt(desc.length);
+		buffer.write(desc);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 16 + GamePacketOutputBuffer.getArrayMCSize(desc.length);
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalDisconnectPeerEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalDisconnectPeerEAG.java
new file mode 100755
index 0000000..7534675
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalDisconnectPeerEAG.java
@@ -0,0 +1,60 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketVoiceSignalDisconnectPeerEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+
+	public SPacketVoiceSignalDisconnectPeerEAG() {
+	}
+
+	public SPacketVoiceSignalDisconnectPeerEAG(long uuidMost, long uuidLeast) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 16;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalGlobalEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalGlobalEAG.java
new file mode 100755
index 0000000..dc028db
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalGlobalEAG.java
@@ -0,0 +1,110 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.RandomAccess;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketVoiceSignalGlobalEAG implements GameMessagePacket {
+
+	public Collection<UserData> users;
+
+	public static class UserData {
+
+		public long uuidMost;
+		public long uuidLeast;
+		public String username;
+
+		public UserData(long uuidMost, long uuidLeast, String username) {
+			this.uuidMost = uuidMost;
+			this.uuidLeast = uuidLeast;
+			this.username = username;
+		}
+
+	}
+
+	public SPacketVoiceSignalGlobalEAG() {
+	}
+
+	public SPacketVoiceSignalGlobalEAG(Collection<UserData> users) {
+		this.users = users;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		int cnt = buffer.readVarInt();
+		List<UserData> userList = (List<UserData>)(users = new ArrayList<>(cnt));
+		if(cnt > 0) {
+			for(int i = 0; i < cnt; ++i) {
+				userList.add(new UserData(buffer.readLong(), buffer.readLong(), null));
+			}
+			if(buffer.available() > 0) {
+				for(int i = 0; i < cnt; ++i) {
+					userList.get(i).username = buffer.readStringMC(16);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(users == null || users.size() == 0) {
+			buffer.write(0);
+		}else {
+			if(users instanceof RandomAccess) {
+				List<UserData> userList = (List<UserData>)users;
+				int cnt = userList.size();
+				buffer.writeVarInt(cnt);
+				for(int i = 0; i < cnt; ++i) {
+					UserData dt = userList.get(i);
+					buffer.writeLong(dt.uuidMost);
+					buffer.writeLong(dt.uuidLeast);
+				}
+				for(int i = 0; i < cnt; ++i) {
+					buffer.writeStringMC(userList.get(i).username);
+				}
+			}else {
+				buffer.writeVarInt(users.size());
+				for(UserData dt : users) {
+					buffer.writeLong(dt.uuidMost);
+					buffer.writeLong(dt.uuidLeast);
+				}
+				for(UserData dt : users) {
+					buffer.writeStringMC(dt.username);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return -1;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalICEEAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalICEEAG.java
new file mode 100755
index 0000000..91043f8
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketVoiceSignalICEEAG.java
@@ -0,0 +1,73 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketVoiceSignalICEEAG implements GameMessagePacket {
+
+	public long uuidMost;
+	public long uuidLeast;
+	public byte[] ice;
+
+	public SPacketVoiceSignalICEEAG() {
+	}
+
+	public SPacketVoiceSignalICEEAG(long uuidMost, long uuidLeast, byte[] ice) {
+		this.uuidMost = uuidMost;
+		this.uuidLeast = uuidLeast;
+		this.ice = ice;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		uuidMost = buffer.readLong();
+		uuidLeast = buffer.readLong();
+		int iceLen = buffer.readVarInt();
+		if(iceLen > 32750) {
+			throw new IOException("Voice signal packet ICE too long!");
+		}
+		ice = new byte[iceLen];
+		buffer.readFully(ice);
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		if(ice.length > 32750) {
+			throw new IOException("Voice signal packet ICE too long!");
+		}
+		buffer.writeLong(uuidMost);
+		buffer.writeLong(uuidLeast);
+		buffer.writeVarInt(ice.length);
+		buffer.write(ice);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 16 + GamePacketOutputBuffer.getArrayMCSize(ice.length);
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketWebViewMessageV4EAG.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketWebViewMessageV4EAG.java
new file mode 100755
index 0000000..7bc6f66
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/pkt/server/SPacketWebViewMessageV4EAG.java
@@ -0,0 +1,74 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessageHandler;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SPacketWebViewMessageV4EAG implements GameMessagePacket {
+
+	public static final int TYPE_STRING = 0;
+	public static final int TYPE_BINARY = 1;
+
+	public int type;
+	public byte[] data;
+
+	public SPacketWebViewMessageV4EAG() {
+	}
+
+	public SPacketWebViewMessageV4EAG(int type, byte[] data) {
+		this.type = type;
+		this.data = data;
+	}
+
+	public SPacketWebViewMessageV4EAG(String str) {
+		this.type = TYPE_STRING;
+		this.data = str.getBytes(StandardCharsets.UTF_8);
+	}
+
+	public SPacketWebViewMessageV4EAG(byte[] data) {
+		this.type = TYPE_BINARY;
+		this.data = data;
+	}
+
+	@Override
+	public void readPacket(GamePacketInputBuffer buffer) throws IOException {
+		type = buffer.readUnsignedByte();
+		data = buffer.readByteArrayMC();
+	}
+
+	@Override
+	public void writePacket(GamePacketOutputBuffer buffer) throws IOException {
+		buffer.writeByte(type);
+		buffer.writeByteArrayMC(data);
+	}
+
+	@Override
+	public void handlePacket(GameMessageHandler handler) {
+		handler.handleServer(this);
+	}
+
+	@Override
+	public int length() {
+		return 1 + GamePacketOutputBuffer.getVarIntSize(data.length) + data.length;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/PacketImageData.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/PacketImageData.java
new file mode 100755
index 0000000..8e9b1a0
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/PacketImageData.java
@@ -0,0 +1,79 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.util;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PacketImageData {
+
+	public final int width;
+	public final int height;
+	public final int[] rgba;
+
+	public PacketImageData(int width, int height, int[] rgba) {
+		this.width = width;
+		this.height = height;
+		this.rgba = rgba;
+	}
+
+	public int getByteLengthRGB16() {
+		return 2 + (rgba.length << 1);
+	}
+
+	public static PacketImageData readRGB16(GamePacketInputBuffer buffer) throws IOException {
+		int w = buffer.readUnsignedByte();
+		int h = buffer.readUnsignedByte();
+		int pixelCount = w * h;
+		int[] pixels = new int[pixelCount];
+		for(int j = 0, p, pR, pG, pB; j < pixelCount; ++j) {
+			p = buffer.readUnsignedShort();
+			pR = (p >>> 11) & 0x1F;
+			pG = (p >>> 5) & 0x3F;
+			pB = p & 0x1F;
+			if(pR + pG + pB > 0) {
+				pB = (int)((pB - 1) * 8.5f);
+				pixels[j] = 0xFF000000 | (pR << 19) | (pG << 10) | pB;
+			}else {
+				pixels[j] = 0;
+			}
+		}
+		return new PacketImageData(w, h, pixels);
+	}
+
+	public static void writeRGB16(GamePacketOutputBuffer buffer, PacketImageData imageData) throws IOException {
+		if(imageData.width < 1 || imageData.width > 255 || imageData.height < 1 || imageData.height > 255) {
+			throw new IOException("Invalid image dimensions in packet, must be between 1x1 and 255x255, got " + imageData.width + "x" + imageData.height);
+		}
+		buffer.writeByte(imageData.width);
+		buffer.writeByte(imageData.height);
+		int pixelCount = imageData.width * imageData.height;
+		for(int j = 0, p, pR, pG, pB; j < pixelCount; ++j) {
+			p = imageData.rgba[j];
+			if((p >>> 24) > 0x7F) {
+				pR = (p >>> 19) & 0x1F;
+				pG = (p >>> 10) & 0x3F;
+				pB = (int)((p & 0xFF) * 0.1176471f) + 1;
+				buffer.writeShort((pR << 11) | (pG << 5) | pB);
+			}else {
+				buffer.writeShort(0);
+			}
+		}
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/ReusableByteArrayInputStream.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/ReusableByteArrayInputStream.java
new file mode 100755
index 0000000..0b6e88f
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/ReusableByteArrayInputStream.java
@@ -0,0 +1,80 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ReusableByteArrayInputStream extends InputStream {
+
+	private volatile byte[] currentBuffer = null;
+	private int idx = 0;
+	private int markIDX = 0;
+
+	public void feedBuffer(byte[] b) {
+		currentBuffer = b;
+		idx = 0;
+		markIDX = 0;
+	}
+
+	@Override
+	public int read() throws IOException {
+		if(currentBuffer.length <= idx) throw new IOException("ReusableByteArrayInputStream buffer underflow, no bytes remaining");
+		return (int)currentBuffer[idx++] & 0xFF;
+	}
+
+	@Override
+	public int read(byte b[], int off, int len) throws IOException {
+		if(idx + len > currentBuffer.length) {
+			throw new IOException(
+					"ReusableByteArrayInputStream buffer underflow, tried to read " + len + " when there are only "
+							+ (currentBuffer.length - idx) + " bytes remaining",
+					new ArrayIndexOutOfBoundsException(idx + len - 1));
+		}
+		if(off + len > b.length) {
+			throw new ArrayIndexOutOfBoundsException(off + len - 1);
+		}
+		System.arraycopy(currentBuffer, idx, b, off, len);
+		idx += len;
+		return len;
+	}
+
+	public void mark() {
+		markIDX = idx;
+	}
+
+	public void reset() {
+		idx = markIDX;
+	}
+
+	public int getReaderIndex() {
+		return idx;
+	}
+
+	public int available() {
+		return Math.max(currentBuffer.length - idx, 0);
+	}
+
+	public void setReaderIndex(int i) {
+		idx = i;
+		markIDX = idx;
+	}
+
+	public boolean markSupported() {
+		return true;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/ReusableByteArrayOutputStream.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/ReusableByteArrayOutputStream.java
new file mode 100755
index 0000000..3392e13
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/ReusableByteArrayOutputStream.java
@@ -0,0 +1,81 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.util;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ReusableByteArrayOutputStream extends OutputStream {
+
+	private volatile byte[] currentBuffer = null;
+	private int idx = 0;
+	private int originalSize = 0;
+	
+	public void feedBuffer(byte[] buf) {
+		currentBuffer = buf;
+		idx = 0;
+		originalSize = buf == null ? 0 : buf.length;
+	}
+
+	public boolean hasGrown() {
+		return currentBuffer.length != originalSize;
+	}
+
+	public byte[] returnBuffer() {
+		return currentBuffer.length == idx ? currentBuffer : Arrays.copyOf(currentBuffer, idx);
+	}
+
+	private void growBuffer(int i) {
+		int ii = currentBuffer.length;
+		int iii = i - ii;
+		if(iii > 0) {
+			int j = ii + (ii >> 1);
+			while(j < i) {
+				j += (j >> 1);
+			}
+			byte[] n = new byte[j];
+			System.arraycopy(currentBuffer, 0, n, 0, ii);
+			currentBuffer = n;
+		}
+	}
+
+	public int getWriterIndex() {
+		return idx;
+	}
+
+	public void setWriterIndex(int i) {
+		idx = i;
+	}
+
+	@Override
+	public void write(int b) throws IOException {
+		if(idx >= currentBuffer.length) {
+			growBuffer(idx + 1);
+		}
+		currentBuffer[idx++] = (byte) b;
+	}
+
+	@Override
+	public void write(byte b[], int off, int len) throws IOException {
+		if(idx + len > currentBuffer.length) {
+			growBuffer(idx + len);
+		}
+		System.arraycopy(b, off, currentBuffer, idx, len);
+		idx += len;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/SimpleInputBufferImpl.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/SimpleInputBufferImpl.java
new file mode 100755
index 0000000..8af6cf7
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/SimpleInputBufferImpl.java
@@ -0,0 +1,209 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketInputBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SimpleInputBufferImpl extends DataInputStream implements GamePacketInputBuffer {
+
+	protected byte[] toByteArrayReturns;
+
+	public SimpleInputBufferImpl(InputStream in) {
+		super(in);
+		this.toByteArrayReturns = null;
+	}
+
+	public SimpleInputBufferImpl(InputStream in, byte[] toByteArrayReturns) {
+		super(in);
+		this.toByteArrayReturns = toByteArrayReturns;
+	}
+
+	public void setStream(InputStream parent) {
+		in = parent;
+		toByteArrayReturns = null;
+	}
+
+	public void setToByteArrayReturns(byte[] toByteArrayReturns) {
+		this.toByteArrayReturns = toByteArrayReturns;
+	}
+
+	@Override
+	public void skipAllBytes(int n) throws IOException {
+		if(skipBytes(n) != n) {
+			throw new EOFException();
+		}
+	}
+
+	@Override
+	public int readVarInt() throws IOException {
+		int i = 0;
+		int j = 0;
+
+		while (true) {
+			int b0 = in.read();
+			if(b0 < 0) {
+				throw new EOFException();
+			}
+			i |= (b0 & 127) << j++ * 7;
+			if (j > 5) {
+				throw new IOException("VarInt too big");
+			}
+
+			if ((b0 & 128) != 128) {
+				break;
+			}
+		}
+
+		return i;
+	}
+
+	@Override
+	public long readVarLong() throws IOException {
+		long i = 0L;
+		int j = 0;
+
+		while (true) {
+			int b0 = in.read();
+			if(b0 < 0) {
+				throw new EOFException();
+			}
+			i |= (long) (b0 & 127) << j++ * 7;
+			if (j > 10) {
+				throw new IOException("VarLong too big");
+			}
+
+			if ((b0 & 128) != 128) {
+				break;
+			}
+		}
+
+		return i;
+	}
+
+	@Override
+	public String readStringMC(int maxLen) throws IOException {
+		int i = this.readVarInt();
+		if (i > (maxLen << 2)) {
+			throw new IOException("The received encoded string buffer length is longer than maximum allowed (" + i
+					+ " > " + (maxLen << 2) + ")");
+		} else if (i < 0) {
+			throw new IOException("The received encoded string buffer length is less than zero! Weird string!");
+		} else {
+			byte[] toRead = new byte[i];
+			this.readFully(toRead);
+			String s = new String(toRead, StandardCharsets.UTF_8);
+			if (s.length() > maxLen) {
+				throw new IOException(
+						"The received string length is longer than maximum allowed (" + i + " > " + maxLen + ")");
+			} else {
+				return s;
+			}
+		}
+	}
+
+	@Override
+	public String readStringEaglerASCII8() throws IOException {
+		int len = in.read();
+		if(len < 0) {
+			throw new EOFException();
+		}
+		char[] ret = new char[len];
+		for(int i = 0, j; i < len; ++i) {
+			j = in.read();
+			if(j < 0) {
+				throw new EOFException();
+			}
+			ret[i] = (char)j;
+		}
+		return new String(ret);
+	}
+
+	@Override
+	public String readStringEaglerASCII16() throws IOException {
+		int len = readUnsignedShort();
+		char[] ret = new char[len];
+		for(int i = 0, j; i < len; ++i) {
+			j = in.read();
+			if(j < 0) {
+				throw new EOFException();
+			}
+			ret[i] = (char)j;
+		}
+		return new String(ret);
+	}
+
+	@Override
+	public byte[] readByteArrayMC() throws IOException {
+		byte[] abyte = new byte[this.readVarInt()];
+		this.readFully(abyte);
+		return abyte;
+	}
+
+	@Override
+	public InputStream stream() {
+		return in;
+	}
+
+	@Override
+	public byte[] toByteArray() throws IOException {
+		if(toByteArrayReturns != null) {
+			return toByteArrayReturns;
+		}else if(in instanceof ByteArrayInputStream) {
+			ByteArrayInputStream bis = (ByteArrayInputStream)in;
+			byte[] ret = new byte[bis.available()];
+			bis.read(ret);
+			return ret;
+		}else {
+			ByteArrayOutputStream bao = null;
+			byte[] copyBuffer = new byte[in.available()];
+			int i = in.read(copyBuffer);
+			if(i == copyBuffer.length) {
+				int j = in.read();
+				if(j == -1) {
+					return copyBuffer;
+				}else {
+					int k = Math.max(copyBuffer.length, 64);
+					bao = new ByteArrayOutputStream(k + 1);
+					bao.write(copyBuffer);
+					bao.write(j);
+					if(k != copyBuffer.length) {
+						copyBuffer = new byte[k];
+					}
+				}
+			}else {
+				int j = Math.max(copyBuffer.length, 64);
+				bao = new ByteArrayOutputStream(j);
+				bao.write(copyBuffer);
+				if(j != copyBuffer.length) {
+					copyBuffer = new byte[j];
+				}
+			}
+			while((i = in.read(copyBuffer)) != -1) {
+				bao.write(copyBuffer, 0, i);
+			}
+			return bao.toByteArray();
+		}
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/SimpleOutputBufferImpl.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/SimpleOutputBufferImpl.java
new file mode 100755
index 0000000..7fcd7f1
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/SimpleOutputBufferImpl.java
@@ -0,0 +1,107 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.util;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePacketOutputBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SimpleOutputBufferImpl extends DataOutputStream implements GamePacketOutputBuffer {
+
+	public SimpleOutputBufferImpl(OutputStream out) {
+		super(out);
+	}
+
+	public void setStream(OutputStream parent) {
+		out = parent;
+	}
+
+	@Override
+	public void writeVarInt(int i) throws IOException {
+		while ((i & -128) != 0) {
+			out.write(i & 127 | 128);
+			i >>>= 7;
+		}
+		out.write(i);
+	}
+
+	@Override
+	public void writeVarLong(long i) throws IOException {
+		while ((i & -128L) != 0L) {
+			out.write((int) (i & 127L) | 128);
+			i >>>= 7;
+		}
+		out.write((int) i);
+	}
+
+	@Override
+	public void writeStringMC(String str) throws IOException {
+		byte[] abyte = str.getBytes(StandardCharsets.UTF_8);
+		if (abyte.length > 32767) {
+			throw new IOException("String too big (was " + str.length() + " bytes encoded, max " + 32767 + ")");
+		} else {
+			this.writeVarInt(abyte.length);
+			this.write(abyte);
+		}
+	}
+
+	@Override
+	public void writeStringEaglerASCII8(String str) throws IOException {
+		int len = str.length();
+		if(len > 255) {
+			throw new IOException("String is longer than 255 chars! (" + len + ")");
+		}
+		out.write(len);
+		for(int i = 0, j; i < len; ++i) {
+			j = (int)str.charAt(i);
+			if(j > 255) {
+				j = (int)'?';
+			}
+			out.write(j);
+		}
+	}
+
+	@Override
+	public void writeStringEaglerASCII16(String str) throws IOException {
+		int len = str.length();
+		if(len > 65535) {
+			throw new IOException("String is longer than 65535 chars! (" + len + ")");
+		}
+		writeShort(len);
+		for(int i = 0, j; i < len; ++i) {
+			j = (int)str.charAt(i);
+			if(j > 255) {
+				j = (int)'?';
+			}
+			out.write(j);
+		}
+	}
+
+	@Override
+	public void writeByteArrayMC(byte[] bytes) throws IOException {
+		this.writeVarInt(bytes.length);
+		this.write(bytes);
+	}
+
+	@Override
+	public OutputStream stream() {
+		return out;
+	}
+
+}
diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/SkinPacketVersionCache.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/SkinPacketVersionCache.java
new file mode 100755
index 0000000..7374c4a
--- /dev/null
+++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/util/SkinPacketVersionCache.java
@@ -0,0 +1,360 @@
+package net.lax1dude.eaglercraft.v1_8.socket.protocol.util;
+
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.GamePluginMessageProtocol;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.*;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SkinPacketVersionCache {
+
+	public GameMessagePacket skinPacketV3;
+	public GameMessagePacket skinPacketV4;
+
+	public SkinPacketVersionCache(GameMessagePacket skinPacketV3, GameMessagePacket skinPacketV4) {
+		this.skinPacketV3 = skinPacketV3;
+		this.skinPacketV4 = skinPacketV4;
+	}
+
+	public static SkinPacketVersionCache createPreset(long uuidMost, long uuidLeast) {
+		long hilo = uuidMost ^ uuidLeast;
+		GameMessagePacket pkt = new SPacketOtherSkinPresetEAG(uuidMost, uuidLeast,
+				((((int) (hilo >> 32)) ^ (int) hilo) & 1) != 0 ? 1 : 0);
+        return new SkinPacketVersionCache(pkt, pkt);
+	}
+
+	public static SkinPacketVersionCache createPreset(long uuidMost, long uuidLeast, int presetID) {
+		GameMessagePacket pkt = new SPacketOtherSkinPresetEAG(uuidMost, uuidLeast, presetID);
+		return new SkinPacketVersionCache(pkt, pkt);
+	}
+
+	public static SkinPacketVersionCache createCustomV3(long uuidMost, long uuidLeast, int modelID, byte[] texture) {
+		return new SkinPacketVersionCache(new SPacketOtherSkinCustomV3EAG(uuidMost, uuidLeast, modelID, texture), null);
+	}
+
+	public static SkinPacketVersionCache createCustomV4(long uuidMost, long uuidLeast, int modelID, byte[] texture) {
+		return new SkinPacketVersionCache(null, new SPacketOtherSkinCustomV4EAG(uuidMost, uuidLeast, modelID, texture));
+	}
+
+	public GameMessagePacket get(GamePluginMessageProtocol vers) {
+		switch(vers) {
+		case V3:
+			return getV3();
+		case V4:
+			return getV4();
+		default:
+			return null;
+		}
+	}
+
+	public GameMessagePacket get(GamePluginMessageProtocol vers, long rewriteUUIDMost, long rewriteUUIDLeast) {
+		switch(vers) {
+		case V3:
+			return getV3(rewriteUUIDMost, rewriteUUIDLeast);
+		case V4:
+			return getV4(rewriteUUIDMost, rewriteUUIDLeast);
+		default:
+			return null;
+		}
+	}
+
+	public GameMessagePacket get(GamePluginMessageProtocol vers, long rewriteUUIDMost, long rewriteUUIDLeast, int rewriteModel) {
+		switch(vers) {
+		case V3:
+			return getV3(rewriteUUIDMost, rewriteUUIDLeast, rewriteModel);
+		case V4:
+			return getV4(rewriteUUIDMost, rewriteUUIDLeast, rewriteModel);
+		default:
+			return null;
+		}
+	}
+
+	public GameMessagePacket getV3() {
+		if(skinPacketV3 != null) {
+			return skinPacketV3;
+		}else {
+			if(skinPacketV4 == null) {
+				return null;
+			}
+			return skinPacketV3 = convertToV3(skinPacketV4);
+		}
+	}
+
+	public GameMessagePacket getV4() {
+		if(skinPacketV4 != null) {
+			return skinPacketV4;
+		}else {
+			if(skinPacketV3 == null) {
+				return null;
+			}
+			return skinPacketV4 = convertToV4(skinPacketV3);
+		}
+	}
+
+	public GameMessagePacket getV3(long rewriteUUIDMost, long rewriteUUIDLeast) {
+		if(skinPacketV3 != null) {
+			return rewriteUUID(skinPacketV3, rewriteUUIDMost, rewriteUUIDLeast);
+		}else {
+			if(skinPacketV4 == null) {
+				return null;
+			}
+			return skinPacketV3 = convertToV3RewriteUUID(skinPacketV4, rewriteUUIDMost, rewriteUUIDLeast);
+		}
+	}
+
+	public GameMessagePacket getV4(long rewriteUUIDMost, long rewriteUUIDLeast) {
+		if(skinPacketV4 != null) {
+			return rewriteUUID(skinPacketV4, rewriteUUIDMost, rewriteUUIDLeast);
+		}else {
+			if(skinPacketV3 == null) {
+				return null;
+			}
+			return skinPacketV4 = convertToV4RewriteUUID(skinPacketV3, rewriteUUIDMost, rewriteUUIDLeast);
+		}
+	}
+
+	public GameMessagePacket getV3(long rewriteUUIDMost, long rewriteUUIDLeast, int rewriteModel) {
+		if(skinPacketV3 != null) {
+			return rewriteUUIDModel(skinPacketV3, rewriteUUIDMost, rewriteUUIDLeast, rewriteModel);
+		}else {
+			if(skinPacketV4 == null) {
+				return null;
+			}
+			return skinPacketV3 = convertToV3RewriteUUIDModel(skinPacketV4, rewriteUUIDMost, rewriteUUIDLeast, rewriteModel);
+		}
+	}
+
+	public GameMessagePacket getV4(long rewriteUUIDMost, long rewriteUUIDLeast, int rewriteModel) {
+		if(skinPacketV4 != null) {
+			return rewriteUUIDModel(skinPacketV4, rewriteUUIDMost, rewriteUUIDLeast, rewriteModel);
+		}else {
+			if(skinPacketV3 == null) {
+				return null;
+			}
+			return skinPacketV4 = convertToV4RewriteUUIDModel(skinPacketV3, rewriteUUIDMost, rewriteUUIDLeast, rewriteModel);
+		}
+	}
+
+	public GameMessagePacket getForceClientV4() {
+		if(skinPacketV4 != null) {
+			return convertToForceV4(skinPacketV4);
+		}else {
+			if(skinPacketV3 == null) {
+				return null;
+			}
+			return convertToForceV4(skinPacketV4 = convertToV4(skinPacketV3));
+		}
+	}
+
+	public byte[] getV3HandshakeData() {
+		GameMessagePacket packetV3 = getV3();
+		if(packetV3 instanceof SPacketOtherSkinCustomV3EAG) {
+			SPacketOtherSkinCustomV3EAG pkt = (SPacketOtherSkinCustomV3EAG)packetV3;
+			byte[] tex = pkt.customSkin;
+			byte[] ret = new byte[2 + tex.length];
+			ret[0] = (byte)2;
+			ret[1] = (byte)pkt.modelID;
+			System.arraycopy(tex, 0, ret, 2, tex.length);
+			return ret;
+		}else {
+			SPacketOtherSkinPresetEAG pkt = (SPacketOtherSkinPresetEAG)packetV3;
+			int p = pkt.presetSkin;
+			byte[] ret = new byte[5];
+			ret[0] = (byte)1;
+			ret[1] = (byte)(p >>> 24);
+			ret[2] = (byte)(p >>> 16);
+			ret[3] = (byte)(p >>> 8);
+			ret[4] = (byte)(p & 0xFF);
+			return ret;
+		}
+	}
+
+	public int getModelId() {
+		if(skinPacketV4 != null) {
+			if(skinPacketV4 instanceof SPacketOtherSkinCustomV4EAG) {
+				return ((SPacketOtherSkinCustomV4EAG)skinPacketV4).modelID;
+			}
+		}else if(skinPacketV3 != null) {
+			if(skinPacketV3 instanceof SPacketOtherSkinCustomV3EAG) {
+				return ((SPacketOtherSkinCustomV3EAG)skinPacketV3).modelID;
+			}
+		}
+		return -1;
+	}
+
+	public static GameMessagePacket rewriteUUID(GameMessagePacket pkt, long uuidMost, long uuidLeast) {
+		if(pkt instanceof SPacketOtherSkinPresetEAG) {
+			return new SPacketOtherSkinPresetEAG(uuidMost, uuidLeast, ((SPacketOtherSkinPresetEAG)pkt).presetSkin);
+		}else if(pkt instanceof SPacketOtherSkinCustomV4EAG) {
+			SPacketOtherSkinCustomV4EAG pkt2 = (SPacketOtherSkinCustomV4EAG)pkt;
+			return new SPacketOtherSkinCustomV4EAG(uuidMost, uuidLeast, pkt2.modelID, pkt2.customSkin);
+		}else if(pkt instanceof SPacketOtherSkinCustomV3EAG) {
+			SPacketOtherSkinCustomV3EAG pkt2 = (SPacketOtherSkinCustomV3EAG)pkt;
+			return new SPacketOtherSkinCustomV3EAG(uuidMost, uuidLeast, pkt2.modelID, pkt2.customSkin);
+		}else {
+			return pkt;
+		}
+	}
+
+	public static GameMessagePacket rewriteUUIDModel(GameMessagePacket pkt, long uuidMost, long uuidLeast, int modelID) {
+		if(pkt instanceof SPacketOtherSkinPresetEAG) {
+			return new SPacketOtherSkinPresetEAG(uuidMost, uuidLeast, ((SPacketOtherSkinPresetEAG)pkt).presetSkin);
+		}else if(pkt instanceof SPacketOtherSkinCustomV4EAG) {
+			SPacketOtherSkinCustomV4EAG pkt2 = (SPacketOtherSkinCustomV4EAG)pkt;
+			return new SPacketOtherSkinCustomV4EAG(uuidMost, uuidLeast, modelID, pkt2.customSkin);
+		}else if(pkt instanceof SPacketOtherSkinCustomV3EAG) {
+			SPacketOtherSkinCustomV3EAG pkt2 = (SPacketOtherSkinCustomV3EAG)pkt;
+			return new SPacketOtherSkinCustomV3EAG(uuidMost, uuidLeast, modelID, pkt2.customSkin);
+		}else {
+			return pkt;
+		}
+	}
+
+	public static byte[] convertToV3Raw(byte[] v4data) {
+		byte[] v3data = new byte[16384];
+		for(int i = 0, j, k; i < 4096; ++i) {
+			j = i * 3;
+			k = i << 2;
+			v3data[k + 1] = v4data[j];
+			v3data[k + 2] = v4data[j + 1];
+			v3data[k + 3] = (byte)(v4data[j + 2] << 1);
+			v3data[k] = (v4data[j + 2] & 0x80) != 0 ? (byte)0xFF : (byte)0;
+		}
+		return v3data;
+	}
+
+	public static byte[] convertToV4Raw(byte[] v3data) {
+		byte[] v4data = new byte[12288];
+		for(int i = 0, j, k; i < 4096; ++i) {
+			j = i << 2;
+			k = i * 3;
+			v4data[k] = v3data[j + 1];
+			v4data[k + 1] = v3data[j + 2];
+			v4data[k + 2] = (byte)((v3data[j + 3] >>> 1) | (v3data[j] & 0x80));
+		}
+		return v4data;
+	}
+
+	public static GameMessagePacket convertToV3(GameMessagePacket v4pkt) {
+		if(v4pkt instanceof SPacketOtherSkinCustomV4EAG) {
+			SPacketOtherSkinCustomV4EAG pkt = (SPacketOtherSkinCustomV4EAG)v4pkt;
+			return new SPacketOtherSkinCustomV3EAG(pkt.uuidMost, pkt.uuidLeast, pkt.modelID, convertToV3Raw(pkt.customSkin));
+		}else {
+			return v4pkt;
+		}
+	}
+
+	public static GameMessagePacket convertToV4(GameMessagePacket v3pkt) {
+		if(v3pkt instanceof SPacketOtherSkinCustomV3EAG) {
+			SPacketOtherSkinCustomV3EAG pkt = (SPacketOtherSkinCustomV3EAG)v3pkt;
+			return new SPacketOtherSkinCustomV4EAG(pkt.uuidMost, pkt.uuidLeast, pkt.modelID, convertToV4Raw(pkt.customSkin));
+		}else {
+			return v3pkt;
+		}
+	}
+
+	public static GameMessagePacket convertToV3RewriteUUID(GameMessagePacket v4pkt, long uuidMost, long uuidLeast) {
+		if(v4pkt instanceof SPacketOtherSkinCustomV4EAG) {
+			SPacketOtherSkinCustomV4EAG pkt = (SPacketOtherSkinCustomV4EAG)v4pkt;
+			return new SPacketOtherSkinCustomV3EAG(uuidMost, uuidLeast, pkt.modelID, convertToV3Raw(pkt.customSkin));
+		}else {
+			return v4pkt;
+		}
+	}
+
+	public static GameMessagePacket convertToV4RewriteUUID(GameMessagePacket v3pkt, long uuidMost, long uuidLeast) {
+		if(v3pkt instanceof SPacketOtherSkinCustomV3EAG) {
+			SPacketOtherSkinCustomV3EAG pkt = (SPacketOtherSkinCustomV3EAG)v3pkt;
+			return new SPacketOtherSkinCustomV4EAG(uuidMost, uuidLeast, pkt.modelID, convertToV4Raw(pkt.customSkin));
+		}else {
+			return v3pkt;
+		}
+	}
+
+	public static GameMessagePacket convertToV3RewriteUUIDModel(GameMessagePacket v4pkt, long uuidMost, long uuidLeast, int modelID) {
+		if(v4pkt instanceof SPacketOtherSkinCustomV4EAG) {
+			SPacketOtherSkinCustomV4EAG pkt = (SPacketOtherSkinCustomV4EAG)v4pkt;
+			return new SPacketOtherSkinCustomV3EAG(uuidMost, uuidLeast, modelID, convertToV3Raw(pkt.customSkin));
+		}else {
+			return v4pkt;
+		}
+	}
+
+	public static GameMessagePacket convertToV4RewriteUUIDModel(GameMessagePacket v3pkt, long uuidMost, long uuidLeast, int modelID) {
+		if(v3pkt instanceof SPacketOtherSkinCustomV3EAG) {
+			SPacketOtherSkinCustomV3EAG pkt = (SPacketOtherSkinCustomV3EAG)v3pkt;
+			return new SPacketOtherSkinCustomV4EAG(uuidMost, uuidLeast, modelID, convertToV4Raw(pkt.customSkin));
+		}else {
+			return v3pkt;
+		}
+	}
+
+	public static SkinPacketVersionCache rewriteUUID(SkinPacketVersionCache pkt, long uuidMost, long uuidLeast) {
+		GameMessagePacket rv3 = null;
+		GameMessagePacket rv4 = null;
+		if(pkt.skinPacketV3 != null) {
+			if(pkt.skinPacketV3 instanceof SPacketOtherSkinCustomV3EAG) {
+				SPacketOtherSkinCustomV3EAG pkt2 = (SPacketOtherSkinCustomV3EAG)pkt.skinPacketV3;
+				rv3 = new SPacketOtherSkinCustomV3EAG(uuidMost, uuidLeast, pkt2.modelID, pkt2.customSkin);
+			}else {
+				rv3 = pkt.skinPacketV3;
+			}
+		}
+		if(pkt.skinPacketV4 != null) {
+			if(pkt.skinPacketV4 instanceof SPacketOtherSkinCustomV4EAG) {
+				SPacketOtherSkinCustomV4EAG pkt2 = (SPacketOtherSkinCustomV4EAG)pkt.skinPacketV4;
+				rv4 = new SPacketOtherSkinCustomV4EAG(uuidMost, uuidLeast, pkt2.modelID, pkt2.customSkin);
+			}else {
+				rv4 = pkt.skinPacketV4;
+			}
+		}
+		return new SkinPacketVersionCache(rv3, rv4);
+	}
+
+	public static SkinPacketVersionCache rewriteUUIDModel(SkinPacketVersionCache pkt, long uuidMost, long uuidLeast, int model) {
+		GameMessagePacket rv3 = null;
+		GameMessagePacket rv4 = null;
+		if(pkt.skinPacketV3 != null) {
+			if(pkt.skinPacketV3 instanceof SPacketOtherSkinCustomV3EAG) {
+				SPacketOtherSkinCustomV3EAG pkt2 = (SPacketOtherSkinCustomV3EAG)pkt.skinPacketV3;
+				rv3 = new SPacketOtherSkinCustomV3EAG(uuidMost, uuidLeast, model, pkt2.customSkin);
+			}else {
+				rv3 = pkt.skinPacketV3;
+			}
+		}
+		if(pkt.skinPacketV4 != null) {
+			if(pkt.skinPacketV4 instanceof SPacketOtherSkinCustomV4EAG) {
+				SPacketOtherSkinCustomV4EAG pkt2 = (SPacketOtherSkinCustomV4EAG)pkt.skinPacketV4;
+				rv4 = new SPacketOtherSkinCustomV4EAG(uuidMost, uuidLeast, model, pkt2.customSkin);
+			}else {
+				rv4 = pkt.skinPacketV4;
+			}
+		}
+		return new SkinPacketVersionCache(rv3, rv4);
+	}
+
+	public static GameMessagePacket convertToForceV4(GameMessagePacket v4pkt) {
+		if(v4pkt instanceof SPacketOtherSkinCustomV4EAG) {
+			SPacketOtherSkinCustomV4EAG pkt = (SPacketOtherSkinCustomV4EAG)v4pkt;
+			return new SPacketForceClientSkinCustomV4EAG(pkt.modelID, pkt.customSkin);
+		}else if(v4pkt instanceof SPacketOtherSkinPresetEAG) {
+			return new SPacketForceClientSkinPresetV4EAG(((SPacketOtherSkinPresetEAG)v4pkt).presetSkin);
+		}else {
+			return v4pkt;
+		}
+	}
+
+}
diff --git a/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IRelayLogger.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IRelayLogger.java
new file mode 100755
index 0000000..f9046e7
--- /dev/null
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IRelayLogger.java
@@ -0,0 +1,30 @@
+package net.lax1dude.eaglercraft.v1_8.sp.relay.pkt;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface IRelayLogger {
+
+	void debug(String msg, Object...args);
+
+	void info(String msg, Object...args);
+
+	void warn(String msg, Object...args);
+
+	void error(String msg, Object...args);
+
+	void error(Throwable th);
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket.java
similarity index 51%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket.java
index e7a281d..604b26f 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket.java
@@ -1,19 +1,17 @@
 package net.lax1dude.eaglercraft.v1_8.sp.relay.pkt;
 
+import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
-import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
-import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -27,61 +25,65 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacket {
+public class RelayPacket {
 
-	private static final Logger logger = LogManager.getLogger("RelayPacket");
+	private static final Map<Integer,Class<? extends RelayPacket>> definedPacketClasses = new HashMap<>();
+	private static final Map<Class<? extends RelayPacket>,Integer> definedPacketIds = new HashMap<>();
 
-	private static final Map<Integer,Class<? extends IPacket>> definedPacketClasses = new HashMap();
-	private static final Map<Class<? extends IPacket>,Integer> definedPacketIds = new HashMap();
-	
-	private static void register(int id, Class<? extends IPacket> clazz) {
+	private static void register(int id, Class<? extends RelayPacket> clazz) {
 		definedPacketClasses.put(id, clazz);
 		definedPacketIds.put(clazz, id);
 	}
-	
+
 	static {
-		register(0x00, IPacket00Handshake.class);
-		register(0x01, IPacket01ICEServers.class);
-		register(0x02, IPacket02NewClient.class);
-		register(0x03, IPacket03ICECandidate.class);
-		register(0x04, IPacket04Description.class);
-		register(0x05, IPacket05ClientSuccess.class);
-		register(0x06, IPacket06ClientFailure.class);
-		register(0x07, IPacket07LocalWorlds.class);
-		register(0x69, IPacket69Pong.class);
-		register(0x70, IPacket70SpecialUpdate.class);
-		register(0xFE, IPacketFEDisconnectClient.class);
-		register(0xFF, IPacketFFErrorCode.class);
+		register(0x00, RelayPacket00Handshake.class);
+		register(0x01, RelayPacket01ICEServers.class);
+		register(0x02, RelayPacket02NewClient.class);
+		register(0x03, RelayPacket03ICECandidate.class);
+		register(0x04, RelayPacket04Description.class);
+		register(0x05, RelayPacket05ClientSuccess.class);
+		register(0x06, RelayPacket06ClientFailure.class);
+		register(0x07, RelayPacket07LocalWorlds.class);
+		register(0x69, RelayPacket69Pong.class);
+		register(0x70, RelayPacket70SpecialUpdate.class);
+		register(0xFE, RelayPacketFEDisconnectClient.class);
+		register(0xFF, RelayPacketFFErrorCode.class);
 	}
-	
-	public static IPacket readPacket(DataInputStream input) throws IOException {
+
+	public static RelayPacket readPacket(DataInputStream input, IRelayLogger logger) throws IOException {
 		int i = input.read();
 		try {
-			Class<? extends IPacket> clazz = definedPacketClasses.get(i);
+			Class<? extends RelayPacket> clazz = definedPacketClasses.get(i);
 			if(clazz == null) {
 				throw new IOException("Unknown packet type: " + i);
 			}
-			IPacket pkt = clazz.newInstance();
+			RelayPacket pkt = clazz.newInstance();
 			pkt.read(input);
+			int j = input.available();
+			if(j > 0) {
+				throw new IOException("Packet type " + i + " had " + j + " remaining bytes");
+			}
 			return pkt;
 		} catch (InstantiationException | IllegalAccessException e) {
+			logger.error("Could not instanciate packet {}", i);
+			logger.error(e);
 			throw new IOException("Unknown packet type: " + i);
 		}
 	}
-	
-	public static byte[] writePacket(IPacket packet) throws IOException {
+
+	public static byte[] writePacket(RelayPacket packet, IRelayLogger logger) throws IOException {
 		Integer i = definedPacketIds.get(packet.getClass());
 		if(i != null) {
 			int len = packet.packetLength();
-			EaglerOutputStream bao = len == -1 ? new EaglerOutputStream() :
-				new EaglerOutputStream(len + 1);
+			ByteArrayOutputStream bao = len == -1 ? new ByteArrayOutputStream() :
+				new ByteArrayOutputStream(len + 1);
 			bao.write(i);
 			packet.write(new DataOutputStream(bao));
 			byte[] ret = bao.toByteArray();
 			if(len != -1 && ret.length != len + 1) {
-				logger.error("writePacket buffer for packet {} {} by {} bytes", packet.getClass().getSimpleName(),
-						(len + 1 < ret.length ? "overflowed" : "underflowed"),
-						(len + 1 < ret.length ? ret.length - len - 1 : len + 1 - ret.length));
+				logger.debug("writePacket buffer for packet {} {} by {} bytes", packet.getClass().getSimpleName(),
+						len + 1 < ret.length ? "overflowed" : "underflowed",
+						len + 1 < ret.length ? ret.length - len - 1 : len + 1 - ret.length);
 			}
 			return ret;
 		}else {
@@ -94,38 +96,38 @@ public class IPacket {
 
 	public void write(DataOutputStream output) throws IOException {
 	}
-	
+
 	public int packetLength() {
 		return -1;
 	}
-	
+
 	public static String readASCII(InputStream is, int len) throws IOException {
 		char[] ret = new char[len];
 		for(int i = 0; i < len; ++i) {
 			int j = is.read();
 			if(j < 0) {
-				return null;
+				throw new EOFException();
 			}
 			ret[i] = (char)j;
 		}
 		return new String(ret);
 	}
-	
+
 	public static void writeASCII(OutputStream is, String txt) throws IOException {
 		for(int i = 0, l = txt.length(); i < l; ++i) {
 			is.write((int)txt.charAt(i));
 		}
 	}
-	
+
 	public static String readASCII8(InputStream is) throws IOException {
 		int i = is.read();
 		if(i < 0) {
-			return null;
+			throw new EOFException();
 		}else {
 			return readASCII(is, i);
 		}
 	}
-	
+
 	public static void writeASCII8(OutputStream is, String txt) throws IOException {
 		if(txt == null) {
 			is.write(0);
@@ -142,12 +144,12 @@ public class IPacket {
 		int hi = is.read();
 		int lo = is.read();
 		if(hi < 0 || lo < 0) {
-			return null;
+			throw new EOFException();
 		}else {
 			return readASCII(is, (hi << 8) | lo);
 		}
 	}
-	
+
 	public static void writeASCII16(OutputStream is, String txt) throws IOException {
 		if(txt == null) {
 			is.write(0);
@@ -161,5 +163,49 @@ public class IPacket {
 			}
 		}
 	}
-	
+
+	public static byte[] readBytes16(InputStream is) throws IOException {
+		int hi = is.read();
+		int lo = is.read();
+		if(hi < 0 || lo < 0) {
+			throw new EOFException();
+		}else {
+			byte[] ret = new byte[(hi << 8) | lo];
+			is.read(ret);
+			return ret;
+		}
+	}
+
+	public static void writeBytes16(OutputStream is, byte[] arr) throws IOException {
+		if(arr == null) {
+			is.write(0);
+			is.write(0);
+		}else {
+			is.write((arr.length >>> 8) & 0xFF);
+			is.write(arr.length & 0xFF);
+			for(int i = 0; i < arr.length; ++i) {
+				is.write(arr[i]);
+			}
+		}
+	}
+
+	public static byte[] toASCIIBin(String txt) {
+		if(txt == null) {
+			return new byte[0];
+		}else {
+			byte[] ret = new byte[txt.length()];
+			for(int i = 0; i < ret.length; ++i) {
+				ret[i] = (byte)txt.charAt(i);
+			}
+			return ret;
+		}
+	}
+
+	public static String toASCIIStr(byte[] bin) {
+		char[] charRet = new char[bin.length];
+		for(int i = 0; i < charRet.length; ++i) {
+			charRet[i] = (char)((int)bin[i] & 0xFF);
+		}
+		return new String(charRet);
+	}
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket00Handshake.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket00Handshake.java
similarity index 81%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket00Handshake.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket00Handshake.java
index fcd8cc7..d9eac73 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket00Handshake.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket00Handshake.java
@@ -5,7 +5,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -19,16 +19,16 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacket00Handshake extends IPacket {
+public class RelayPacket00Handshake extends RelayPacket {
 
 	public int connectionType = 0;
 	public int connectionVersion = 1;
 	public String connectionCode = null;
 	
-	public IPacket00Handshake() {
+	public RelayPacket00Handshake() {
 	}
 	
-	public IPacket00Handshake(int connectionType, int connectionVersion,
+	public RelayPacket00Handshake(int connectionType, int connectionVersion,
 			String connectionCode) {
 		this.connectionType = connectionType;
 		this.connectionVersion = connectionVersion;
@@ -39,14 +39,14 @@ public class IPacket00Handshake extends IPacket {
 	public void read(DataInputStream input) throws IOException {
 		connectionType = input.read();
 		connectionVersion = input.read();
-		connectionCode = IPacket.readASCII8(input);
+		connectionCode = RelayPacket.readASCII8(input);
 	}
 	
 	@Override
 	public void write(DataOutputStream output) throws IOException {
 		output.write(connectionType);
 		output.write(connectionVersion);
-		IPacket.writeASCII8(output, connectionCode);
+		RelayPacket.writeASCII8(output, connectionCode);
 	}
 	
 	@Override
diff --git a/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket01ICEServers.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket01ICEServers.java
new file mode 100755
index 0000000..5c69882
--- /dev/null
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket01ICEServers.java
@@ -0,0 +1,105 @@
+package net.lax1dude.eaglercraft.v1_8.sp.relay.pkt;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RelayPacket01ICEServers extends RelayPacket {
+
+	public final Collection<RelayServer> servers;
+
+	public static class RelayServer {
+
+		public String address;
+		public RelayType type;
+		public String username;
+		public String password;
+
+		public RelayServer(String address, RelayType type, String username, String password) {
+			this.address = address;
+			this.type = type;
+			this.username = username;
+			this.password = password;
+		}
+
+		public String getICEString() {
+			if(username == null) {
+				return address;
+			}else {
+				return address + ";" + username + ";" + password;
+			}
+		}
+
+	}
+
+	public static enum RelayType {
+		NO_PASSWD, PASSWD;
+	}
+
+	public RelayPacket01ICEServers() {
+		this.servers = new ArrayList<>();
+	}
+
+	public RelayPacket01ICEServers(Collection<RelayServer> servers) {
+		this.servers = servers;
+	}
+
+	public void write(DataOutputStream output) throws IOException {
+		int l = servers.size();
+		output.writeShort(l);
+		Iterator<RelayServer> itr = servers.iterator();
+		while(itr.hasNext()) {
+			RelayServer srv = itr.next();
+			if(srv.type == RelayType.NO_PASSWD) {
+				output.write('S');
+			}else if(srv.type == RelayType.PASSWD) {
+				output.write('T');
+			}else {
+				throw new IOException("Unknown/Unsupported Relay Type: " + srv.type.name());
+			}
+			writeASCII16(output, srv.address);
+			writeASCII8(output, srv.username);
+			writeASCII8(output, srv.password);
+		}
+	}
+
+	public void read(DataInputStream input) throws IOException {
+		servers.clear();
+		int l = input.readUnsignedShort();
+		for(int i = 0; i < l; ++i) {
+			char type = (char)input.read();
+			RelayType typeEnum;
+			if(type == 'S') {
+				typeEnum = RelayType.NO_PASSWD;
+			}else if(type == 'T') {
+				typeEnum = RelayType.PASSWD;
+			}else {
+				throw new IOException("Unknown/Unsupported Relay Type: '" + type + "'");
+			}
+			servers.add(new RelayServer(
+					readASCII16(input),
+					typeEnum,
+					readASCII8(input),
+					readASCII8(input)
+			));
+		}
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket06ClientFailure.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket02NewClient.java
similarity index 83%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket06ClientFailure.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket02NewClient.java
index c1cea16..0e715cf 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket06ClientFailure.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket02NewClient.java
@@ -5,7 +5,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -19,24 +19,24 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacket06ClientFailure extends IPacket {
+public class RelayPacket02NewClient extends RelayPacket {
 	
 	public String clientId;
 	
-	public IPacket06ClientFailure() {
+	public RelayPacket02NewClient(String clientId) {
+		this.clientId = clientId;
 	}
 	
-	public IPacket06ClientFailure(String clientId) {
-		this.clientId = clientId;
+	public RelayPacket02NewClient() {
+	}
+	
+	public void write(DataOutputStream output) throws IOException {
+		writeASCII8(output, clientId);
 	}
 	
 	public void read(DataInputStream input) throws IOException {
 		clientId = readASCII8(input);
 	}
-
-	public void write(DataOutputStream output) throws IOException {
-		writeASCII8(output, clientId);
-	}
 	
 	public int packetLength() {
 		return 1 + clientId.length();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket03ICECandidate.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket03ICECandidate.java
similarity index 65%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket03ICECandidate.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket03ICECandidate.java
index de44c94..ccdd1f1 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket03ICECandidate.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket03ICECandidate.java
@@ -5,7 +5,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -19,31 +19,40 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacket03ICECandidate extends IPacket {
+public class RelayPacket03ICECandidate extends RelayPacket {
 
 	public String peerId;
-	public String candidate;
+	public byte[] candidate;
 	
-	public IPacket03ICECandidate(String peerId, String desc) {
+	public RelayPacket03ICECandidate() {
+	}
+	
+	public RelayPacket03ICECandidate(String peerId, String desc) {
+		this.peerId = peerId;
+		this.candidate = toASCIIBin(desc);
+	}
+	
+	public RelayPacket03ICECandidate(String peerId, byte[] desc) {
 		this.peerId = peerId;
 		this.candidate = desc;
 	}
 	
-	public IPacket03ICECandidate() {
-	}
-	
 	public void read(DataInputStream input) throws IOException {
 		peerId = readASCII8(input);
-		candidate = readASCII16(input);
+		candidate = readBytes16(input);
 	}
-
+	
 	public void write(DataOutputStream output) throws IOException {
 		writeASCII8(output, peerId);
-		writeASCII16(output, candidate);
+		writeBytes16(output, candidate);
+	}
+	
+	public String getCandidateString() {
+		return candidate == null ? null : toASCIIStr(candidate);
 	}
 	
 	public int packetLength() {
-		return 1 + peerId.length() + 2 + candidate.length();
+		return 1 + peerId.length() + 2 + candidate.length;
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket04Description.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket04Description.java
similarity index 65%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket04Description.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket04Description.java
index a69b00c..b46c970 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket04Description.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket04Description.java
@@ -5,7 +5,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -19,31 +19,40 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacket04Description extends IPacket {
+public class RelayPacket04Description extends RelayPacket {
 
 	public String peerId;
-	public String description;
+	public byte[] description;
 	
-	public IPacket04Description(String peerId, String desc) {
+	public RelayPacket04Description() {
+	}
+	
+	public RelayPacket04Description(String peerId, String desc) {
+		this.peerId = peerId;
+		this.description = toASCIIBin(desc);
+	}
+	
+	public RelayPacket04Description(String peerId, byte[] desc) {
 		this.peerId = peerId;
 		this.description = desc;
 	}
 	
-	public IPacket04Description() {
-	}
-	
 	public void read(DataInputStream input) throws IOException {
 		peerId = readASCII8(input);
-		description = readASCII16(input);
+		description = readBytes16(input);
 	}
-
+	
 	public void write(DataOutputStream output) throws IOException {
 		writeASCII8(output, peerId);
-		writeASCII16(output, description);
+		writeBytes16(output, description);
+	}
+	
+	public String getDescriptionString() {
+		return description == null ? null : toASCIIStr(description);
 	}
 	
 	public int packetLength() {
-		return 1 + peerId.length() + 2 + description.length();
+		return 1 + peerId.length() + 2 + description.length;
 	}
 
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket05ClientSuccess.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket05ClientSuccess.java
similarity index 83%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket05ClientSuccess.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket05ClientSuccess.java
index c9340c7..b2e5e9a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket05ClientSuccess.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket05ClientSuccess.java
@@ -5,7 +5,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -19,14 +19,14 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacket05ClientSuccess extends IPacket {
+public class RelayPacket05ClientSuccess extends RelayPacket {
 	
 	public String clientId;
 	
-	public IPacket05ClientSuccess() {
+	public RelayPacket05ClientSuccess() {
 	}
 	
-	public IPacket05ClientSuccess(String clientId) {
+	public RelayPacket05ClientSuccess(String clientId) {
 		this.clientId = clientId;
 	}
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket02NewClient.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket06ClientFailure.java
similarity index 70%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket02NewClient.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket06ClientFailure.java
index 36531a5..9b3d948 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket02NewClient.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket06ClientFailure.java
@@ -1,10 +1,11 @@
 package net.lax1dude.eaglercraft.v1_8.sp.relay.pkt;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -18,19 +19,27 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacket02NewClient extends IPacket {
+public class RelayPacket06ClientFailure extends RelayPacket {
 	
 	public String clientId;
 	
-	public IPacket02NewClient(String clientId) {
-		this.clientId = clientId;
+	public RelayPacket06ClientFailure() {
 	}
 	
-	public IPacket02NewClient() {
+	public RelayPacket06ClientFailure(String clientId) {
+		this.clientId = clientId;
 	}
 	
 	public void read(DataInputStream input) throws IOException {
 		clientId = readASCII8(input);
 	}
+
+	public void write(DataOutputStream output) throws IOException {
+		writeASCII8(output, clientId);
+	}
+	
+	public int packetLength() {
+		return 1 + clientId.length();
+	}
 	
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket07LocalWorlds.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket07LocalWorlds.java
similarity index 55%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket07LocalWorlds.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket07LocalWorlds.java
index 40e189e..3baeee2 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket07LocalWorlds.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket07LocalWorlds.java
@@ -1,12 +1,13 @@
 package net.lax1dude.eaglercraft.v1_8.sp.relay.pkt;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -20,7 +21,7 @@ import java.util.List;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacket07LocalWorlds extends IPacket {
+public class RelayPacket07LocalWorlds extends RelayPacket {
 	
 	public static class LocalWorld {
 		
@@ -34,17 +35,52 @@ public class IPacket07LocalWorlds extends IPacket {
 		
 	}
 	
-	public final List<LocalWorld> worldsList;
+	public List<LocalWorld> worldsList;
 	
-	public IPacket07LocalWorlds() {
-		this.worldsList = new ArrayList();
+	public RelayPacket07LocalWorlds() {
+	}
+	
+	public RelayPacket07LocalWorlds(List<LocalWorld> worldsList) {
+		this.worldsList = worldsList;
+	}
+
+	public void write(DataOutputStream output) throws IOException {
+		if(worldsList == null) {
+			output.write(0);
+		}else {
+			int i = worldsList.size();
+			if(i > 255) {
+				i = 255;
+			}
+			output.write(i);
+			for(int j = 0; j < i; ++j) {
+				LocalWorld w = worldsList.get(j);
+				writeASCII8(output, w.worldName);
+				writeASCII8(output, w.worldCode);
+			}
+		}
 	}
 
 	public void read(DataInputStream input) throws IOException {
 		int l = input.read();
+		if(worldsList == null) {
+			worldsList = new ArrayList<>(l);
+		}else {
+			worldsList.clear();
+		}
 		for(int i = 0; i < l; ++i) {
 			worldsList.add(new LocalWorld(readASCII8(input), readASCII8(input)));
 		}
 	}
-	
+
+	public int packetLength() {
+		int accum = 1;
+		if(worldsList != null) {
+			for(int i = 0, l = worldsList.size(); i < l; ++i) {
+				LocalWorld j = worldsList.get(i);
+				accum += 2 + j.worldName.length() + j.worldCode.length();
+			}
+		}
+		return accum;
+	}
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket69Pong.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket69Pong.java
similarity index 70%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket69Pong.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket69Pong.java
index e5a487e..ac43db8 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket69Pong.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket69Pong.java
@@ -1,10 +1,11 @@
 package net.lax1dude.eaglercraft.v1_8.sp.relay.pkt;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -18,13 +19,13 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacket69Pong extends IPacket {
+public class RelayPacket69Pong extends RelayPacket {
 
 	public int protcolVersion;
 	public String comment;
 	public String brand;
 	
-	public IPacket69Pong(int protcolVersion, String comment, String brand) {
+	public RelayPacket69Pong(int protcolVersion, String comment, String brand) {
 		if(comment.length() > 255) {
 			comment = comment.substring(0, 256);
 		}
@@ -33,7 +34,13 @@ public class IPacket69Pong extends IPacket {
 		this.brand = brand;
 	}
 
-	public IPacket69Pong() {
+	public RelayPacket69Pong() {
+	}
+	
+	public void write(DataOutputStream output) throws IOException {
+		output.write(protcolVersion);
+		writeASCII8(output, comment);
+		writeASCII8(output, brand);
 	}
 	
 	public void read(DataInputStream output) throws IOException {
@@ -42,4 +49,8 @@ public class IPacket69Pong extends IPacket {
 		brand = readASCII8(output);
 	}
 	
+	public int packetLength() {
+		return 3 + comment.length() + brand.length();
+	}
+	
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket70SpecialUpdate.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket70SpecialUpdate.java
similarity index 87%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket70SpecialUpdate.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket70SpecialUpdate.java
index 23fd72e..9f29948 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket70SpecialUpdate.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket70SpecialUpdate.java
@@ -19,17 +19,17 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacket70SpecialUpdate extends IPacket {
+public class RelayPacket70SpecialUpdate extends RelayPacket {
 
 	public static final int OPERATION_UPDATE_CERTIFICATE = 0x69;
 
 	public int operation;
 	public byte[] updatePacket;
 
-	public IPacket70SpecialUpdate() {
+	public RelayPacket70SpecialUpdate() {
 	}
 
-	public IPacket70SpecialUpdate(int operation, byte[] updatePacket) {
+	public RelayPacket70SpecialUpdate(int operation, byte[] updatePacket) {
 		this.operation = operation;
 		this.updatePacket = updatePacket;
 	}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacketFEDisconnectClient.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacketFEDisconnectClient.java
similarity index 85%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacketFEDisconnectClient.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacketFEDisconnectClient.java
index 2ed910a..51a804a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacketFEDisconnectClient.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacketFEDisconnectClient.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -20,7 +20,7 @@ import java.nio.ByteBuffer;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacketFEDisconnectClient extends IPacket {
+public class RelayPacketFEDisconnectClient extends RelayPacket {
 
 	public static final int TYPE_FINISHED_SUCCESS = 0x00;
 	public static final int TYPE_FINISHED_FAILED = 0x01;
@@ -34,10 +34,10 @@ public class IPacketFEDisconnectClient extends IPacket {
 	public int code;
 	public String reason;
 	
-	public IPacketFEDisconnectClient() {
+	public RelayPacketFEDisconnectClient() {
 	}
 	
-	public IPacketFEDisconnectClient(String clientId, int code, String reason) {
+	public RelayPacketFEDisconnectClient(String clientId, int code, String reason) {
 		this.clientId = clientId;
 		this.code = code;
 		this.reason = reason;
@@ -48,7 +48,7 @@ public class IPacketFEDisconnectClient extends IPacket {
 		code = input.read();
 		reason = readASCII16(input);
 	}
-
+	
 	public void write(DataOutputStream output) throws IOException {
 		writeASCII8(output, clientId);
 		output.write(code);
@@ -56,9 +56,9 @@ public class IPacketFEDisconnectClient extends IPacket {
 	}
 	
 	public int packetLength() {
-		return -1;
+		return 1 + 1 + 2 + clientId.length() + (reason != null ? reason.length() : 0);
 	}
-
+	
 	public static final ByteBuffer ratelimitPacketTooMany = ByteBuffer.wrap(new byte[] { (byte)0xFC, (byte)0x00 });
 	public static final ByteBuffer ratelimitPacketBlock = ByteBuffer.wrap(new byte[] { (byte)0xFC, (byte)0x01 });
 	public static final ByteBuffer ratelimitPacketBlockLock = ByteBuffer.wrap(new byte[] { (byte)0xFC, (byte)0x02 });
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacketFFErrorCode.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacketFFErrorCode.java
similarity index 89%
rename from src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacketFFErrorCode.java
rename to src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacketFFErrorCode.java
index 0acdc41..6027b8a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacketFFErrorCode.java
+++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacketFFErrorCode.java
@@ -5,7 +5,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -19,7 +19,7 @@ import java.io.IOException;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class IPacketFFErrorCode extends IPacket {
+public class RelayPacketFFErrorCode extends RelayPacket {
 
 	public static final int TYPE_INTERNAL_ERROR = 0x00;
 	public static final int TYPE_PROTOCOL_VERSION = 0x01;
@@ -29,9 +29,9 @@ public class IPacketFFErrorCode extends IPacket {
 	public static final int TYPE_INCORRECT_CODE = 0x05;
 	public static final int TYPE_SERVER_DISCONNECTED = 0x06;
 	public static final int TYPE_UNKNOWN_CLIENT = 0x07;
-	
+
 	public static final String[] packetTypes = new String[0x08];
-	
+
 	static {
 		packetTypes[TYPE_INTERNAL_ERROR] = "TYPE_INTERNAL_ERROR";
 		packetTypes[TYPE_PROTOCOL_VERSION] = "TYPE_PROTOCOL_VERSION";
@@ -42,7 +42,7 @@ public class IPacketFFErrorCode extends IPacket {
 		packetTypes[TYPE_SERVER_DISCONNECTED] = "TYPE_SERVER_DISCONNECTED";
 		packetTypes[TYPE_UNKNOWN_CLIENT] = "TYPE_UNKNOWN_CLIENT";
 	}
-	
+
 	public static String code2string(int i) {
 		if(i >= 0 || i < packetTypes.length) {
 			return packetTypes[i];
@@ -50,18 +50,18 @@ public class IPacketFFErrorCode extends IPacket {
 			return "UNKNOWN";
 		}
 	}
-	
+
 	public int code;
 	public String desc;
-	
-	public IPacketFFErrorCode() {
+
+	public RelayPacketFFErrorCode() {
 	}
-	
-	public IPacketFFErrorCode(int code, String desc) {
+
+	public RelayPacketFFErrorCode(int code, String desc) {
 		this.code = code;
 		this.desc = desc;
 	}
-	
+
 	@Override
 	public void read(DataInputStream input) throws IOException {
 		code = input.read();
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuAssets.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuAssets.java
new file mode 100755
index 0000000..4061a3a
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuAssets.java
@@ -0,0 +1,35 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformAssets;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class BootMenuAssets {
+
+	public static String loadResourceString(String res) {
+		return EagRuntime.getResourceString(res);
+	}
+
+	public static byte[] loadResourceBytes(String res) {
+		return EagRuntime.getResourceBytes(res);
+	}
+
+	public static void freeBootMenuResourceRepo() {
+		PlatformAssets.freeAssetRepoTeaVM();
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuConstants.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuConstants.java
new file mode 100755
index 0000000..ce16955
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuConstants.java
@@ -0,0 +1,53 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class BootMenuConstants {
+
+	public static final EaglercraftUUID UUID_ORIGIN_UNSIGNED_CLASSES_JS = new EaglercraftUUID(0x738248F88FF1446EL, 0xA834D40120DD8EB5L);
+	public static final EaglercraftUUID UUID_ORIGIN_SIGNED_SIGNATURE = new EaglercraftUUID(0xB55252A38A6F4291L, 0x8DB68BF94B3E6FEDL);
+	public static final EaglercraftUUID UUID_ORIGIN_SIGNED_BUNDLE = new EaglercraftUUID(0xCE298D98E9084597L, 0x9EB2501EAC6D720BL);
+
+	public static final EaglercraftUUID UUID_CLIENT_DATA_ORIGIN = new EaglercraftUUID(0xB673DAD0EF4407BL, 0xBE12C8E5BD5A2CBDL);
+	public static final EaglercraftUUID UUID_CLIENT_LAUNCH_ORIGIN = new EaglercraftUUID(0x74FB063984A24D1AL, 0x8E1D2FC39C21EA1EL);
+
+	public static final String client_projectForkName = EaglercraftVersion.projectForkName;
+	public static final String client_projectForkVendor = EaglercraftVersion.projectForkVendor;
+	public static final String client_projectForkVersion = EaglercraftVersion.projectForkVersion;
+
+	public static final String client_projectOriginName = EaglercraftVersion.projectOriginName;
+	public static final String client_projectOriginAuthor = EaglercraftVersion.projectOriginAuthor;
+	public static final String client_projectOriginVersion = EaglercraftVersion.projectOriginVersion;
+	public static final String client_projectOriginRevision = EaglercraftVersion.projectOriginRevision;
+
+	public static final String cssClassPrefix = "_eaglercraftX_";
+	public static final String cssClassPrefixBootMenu = cssClassPrefix + "boot_menu_";
+
+	public static final String bootMenuDatabaseName = "_net_lax1dude_eaglercraft_v1_8_boot_menu_BootMenuDatastore_1_8_8_main";
+
+	public static String getBootMenuFlagsKeyName() {
+		String pfx = EagRuntime.getConfiguration().getLocalStorageNamespace();
+		if(pfx == null) {
+			pfx = EaglercraftVersion.localStorageNamespace;
+		}
+		return pfx + ".showBootMenu";
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuDOM.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuDOM.java
new file mode 100755
index 0000000..25282e8
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuDOM.java
@@ -0,0 +1,203 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.teavm.jso.dom.html.HTMLElement;
+import org.teavm.jso.dom.html.HTMLInputElement;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class BootMenuDOM {
+
+	public final HTMLElement content_view_selection;
+	public final HTMLElement content_selection;
+	public final HTMLElement content_view_editor;
+	public final HTMLElement header_title;
+	public final HTMLElement launch_conf_val_profile_name;
+	public final HTMLElement launch_conf_val_data_format;
+	public final HTMLElement launch_conf_val_launch_type;
+	public final Map<EnumClientLaunchType,HTMLElement> launch_conf_val_launch_type_opts;
+	public final HTMLElement launch_conf_join_server;
+	public final HTMLElement launch_conf_val_join_server;
+	public final HTMLElement launch_conf_opts_name;
+	public final HTMLElement launch_conf_val_opts_name;
+	public final HTMLElement launch_conf_assetsURI;
+	public final HTMLElement launch_conf_val_assetsURI;
+	public final HTMLElement launch_conf_container;
+	public final HTMLElement launch_conf_val_container;
+	public final HTMLElement launch_conf_main_func;
+	public final HTMLElement launch_conf_val_main_func;
+	public final HTMLElement launch_conf_clear_cookies;
+	public final HTMLElement launch_conf_val_clear_cookies;
+	public final HTMLElement launch_opt_editor;
+	public final HTMLElement popup;
+	public final HTMLElement popup_view_confirm;
+	public final HTMLElement popup_confirm_title;
+	public final HTMLElement popup_confirm_opts;
+	public final HTMLElement popup_view_selection;
+	public final HTMLElement popup_selection_title;
+	public final HTMLElement popup_selection;
+	public final HTMLElement popup_view_input;
+	public final HTMLElement popup_input_title;
+	public final HTMLElement popup_input_val;
+	public final HTMLElement popup_input_opt_cancel;
+	public final HTMLElement popup_input_opt_done;
+	public final HTMLElement footer_text_boot_select;
+	public final HTMLElement footer_text_boot_select_count;
+	public final HTMLElement footer_text_boot_countdown;
+	public final HTMLElement footer_text_menu_select;
+	public final HTMLElement footer_text_opts_editor;
+	public final HTMLElement footer_text_opts_editor_alt;
+	public final HTMLElement footer_text_boot_order;
+
+	public BootMenuDOM(HTMLElement parentElement) {
+		content_view_selection = selectHelper(parentElement, "content_view_selection");
+		content_selection = selectHelper(parentElement, "content_selection");
+		content_view_editor = selectHelper(parentElement, "content_view_editor");
+		header_title = selectHelper(parentElement, "header_title");
+		launch_conf_val_profile_name = selectHelper(parentElement, "launch_conf_val_profile_name");
+		launch_conf_val_data_format = selectHelper(parentElement, "launch_conf_val_data_format");
+		launch_conf_val_launch_type = selectHelper(parentElement, "launch_conf_val_launch_type");
+		launch_conf_val_launch_type_opts = new HashMap<>();
+		launch_conf_val_launch_type_opts.put(EnumClientLaunchType.EAGLERX_V1, selectHelper(parentElement, "launch_conf_val_launch_type_opt[value=EAGLERX_V1]"));
+		launch_conf_val_launch_type_opts.put(EnumClientLaunchType.EAGLERX_SIGNED_V1, selectHelper(parentElement, "launch_conf_val_launch_type_opt[value=EAGLERX_SIGNED_V1]"));
+		launch_conf_val_launch_type_opts.put(EnumClientLaunchType.EAGLER_1_5_V2, selectHelper(parentElement, "launch_conf_val_launch_type_opt[value=EAGLER_1_5_V2]"));
+		launch_conf_val_launch_type_opts.put(EnumClientLaunchType.EAGLER_1_5_V1, selectHelper(parentElement, "launch_conf_val_launch_type_opt[value=EAGLER_1_5_V1]"));
+		launch_conf_val_launch_type_opts.put(EnumClientLaunchType.EAGLER_BETA_V1, selectHelper(parentElement, "launch_conf_val_launch_type_opt[value=EAGLER_BETA_V1]"));
+		launch_conf_val_launch_type_opts.put(EnumClientLaunchType.PEYTON_V1, selectHelper(parentElement, "launch_conf_val_launch_type_opt[value=PEYTON_V1]"));
+		launch_conf_val_launch_type_opts.put(EnumClientLaunchType.PEYTON_V2, selectHelper(parentElement, "launch_conf_val_launch_type_opt[value=PEYTON_V2]"));
+		launch_conf_val_launch_type_opts.put(EnumClientLaunchType.STANDARD_OFFLINE_V1, selectHelper(parentElement, "launch_conf_val_launch_type_opt[value=STANDARD_OFFLINE_V1]"));
+		launch_conf_join_server = selectHelper(parentElement, "launch_conf_join_server");
+		launch_conf_val_join_server = selectHelper(parentElement, "launch_conf_val_join_server");
+		launch_conf_opts_name = selectHelper(parentElement, "launch_conf_opts_name");
+		launch_conf_val_opts_name = selectHelper(parentElement, "launch_conf_val_opts_name");
+		launch_conf_assetsURI = selectHelper(parentElement, "launch_conf_assetsURI");
+		launch_conf_val_assetsURI = selectHelper(parentElement, "launch_conf_val_assetsURI");
+		launch_conf_container = selectHelper(parentElement, "launch_conf_container");
+		launch_conf_val_container = selectHelper(parentElement, "launch_conf_val_container");
+		launch_conf_main_func = selectHelper(parentElement, "launch_conf_main_func");
+		launch_conf_val_main_func = selectHelper(parentElement, "launch_conf_val_main_func");
+		launch_conf_clear_cookies = selectHelper(parentElement, "launch_conf_clear_cookies");
+		launch_conf_val_clear_cookies = selectHelper(parentElement, "launch_conf_val_clear_cookies");
+		launch_opt_editor = selectHelper(parentElement, "launch_opt_editor");
+		popup = selectHelper(parentElement, "popup");
+		popup_view_confirm = selectHelper(parentElement, "popup_view_confirm");
+		popup_confirm_title = selectHelper(parentElement, "popup_confirm_title");
+		popup_confirm_opts = selectHelper(parentElement, "popup_confirm_opts");
+		popup_view_selection = selectHelper(parentElement, "popup_view_selection");
+		popup_selection_title = selectHelper(parentElement, "popup_selection_title");
+		popup_selection = selectHelper(parentElement, "popup_selection");
+		popup_view_input = selectHelper(parentElement, "popup_view_input");
+		popup_input_title = selectHelper(parentElement, "popup_input_title");
+		popup_input_val = selectHelper(parentElement, "popup_input_val");
+		popup_input_opt_cancel = selectHelper(parentElement, "popup_input_opt_cancel");
+		popup_input_opt_done = selectHelper(parentElement, "popup_input_opt_done");
+		footer_text_boot_select = selectHelper(parentElement, "footer_text_boot_select");
+		footer_text_boot_select_count = selectHelper(parentElement, "footer_text_boot_select_count");
+		footer_text_boot_countdown = selectHelper(parentElement, "footer_text_boot_countdown");
+		footer_text_menu_select = selectHelper(parentElement, "footer_text_menu_select");
+		footer_text_opts_editor = selectHelper(parentElement, "footer_text_opts_editor");
+		footer_text_opts_editor_alt = selectHelper(parentElement, "footer_text_opts_editor_alt");
+		footer_text_boot_order = selectHelper(parentElement, "footer_text_boot_order");
+	}
+
+	public void registerEventHandlers() {
+		launch_conf_val_profile_name.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(launch_conf_val_profile_name);
+		});
+		launch_conf_val_data_format.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(launch_conf_val_data_format);
+		});
+		launch_conf_val_launch_type.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(launch_conf_val_launch_type);
+		});
+		launch_conf_val_join_server.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(launch_conf_val_join_server);
+		});
+		launch_conf_val_opts_name.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(launch_conf_val_opts_name);
+		});
+		launch_conf_val_assetsURI.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(launch_conf_val_assetsURI);
+		});
+		launch_conf_val_container.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(launch_conf_val_container);
+		});
+		launch_conf_val_main_func.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(launch_conf_val_main_func);
+		});
+		launch_conf_val_clear_cookies.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(launch_conf_val_clear_cookies);
+		});
+		launch_opt_editor.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(launch_opt_editor);
+		});
+		popup_input_val.addEventListener("change", (evt) -> {
+			BootMenuMain.fireChangeEvent(popup_input_val);
+		});
+		popup_input_opt_cancel.addEventListener("click", (evt) -> {
+			BootMenuMain.fireClickEvent(popup_input_opt_cancel);
+		});
+		popup_input_opt_done.addEventListener("click", (evt) -> {
+			BootMenuMain.fireClickEvent(popup_input_opt_done);
+		});
+		popup_input_opt_cancel.addEventListener("mouseover", (evt) -> {
+			BootMenuMain.fireMouseOverEvent(popup_input_opt_cancel);
+		});
+		popup_input_opt_done.addEventListener("mouseover", (evt) -> {
+			BootMenuMain.fireMouseOverEvent(popup_input_opt_done);
+		});
+	}
+
+	public static void show(HTMLElement el) {
+		el.getStyle().setProperty("display", "block");
+	}
+
+	public static void hide(HTMLElement el) {
+		el.getStyle().setProperty("display", "none");
+	}
+
+	public static void setValue(HTMLElement el, String value) {
+		((HTMLInputElement)el).setValue(value);
+	}
+
+	public static String getValue(HTMLElement el) {
+		return ((HTMLInputElement)el).getValue();
+	}
+
+	public static void setChecked(HTMLElement el, boolean checked) {
+		((HTMLInputElement)el).setChecked(checked);
+	}
+
+	public static boolean getChecked(HTMLElement el) {
+		return ((HTMLInputElement)el).isChecked();
+	}
+
+	public static void setDisabled(HTMLElement el, boolean disabled) {
+		((HTMLInputElement)el).setDisabled(disabled);
+	}
+
+	private static HTMLElement selectHelper(HTMLElement parent, String name) {
+		name = "." + BootMenuConstants.cssClassPrefixBootMenu + name;
+		HTMLElement ret = parent.querySelector(name);
+		if(ret == null) {
+			throw new RuntimeException("Failed to select \"" + name + "\" from boot menu!");
+		}
+		return ret;
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuDataManager.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuDataManager.java
new file mode 100755
index 0000000..3d12626
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuDataManager.java
@@ -0,0 +1,464 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.teavm.jso.browser.Storage;
+import org.teavm.jso.browser.Window;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class BootMenuDataManager {
+
+	protected static final Logger logger = LogManager.getLogger("BootMenuDataManager");
+
+	protected BootMenuDatastore datastore;
+
+	public final Set<EaglercraftUUID> existingBlobs = new HashSet<>();
+	public final Map<EaglercraftUUID,ClientDataEntry> clientDatas = new HashMap<>();
+	public final Map<EaglercraftUUID,LaunchConfigEntry> launchDatas = new HashMap<>();
+	public final List<EaglercraftUUID> launchDatasList = new ArrayList<>();
+	public final List<EaglercraftUUID> launchOrderList = new ArrayList<>();
+
+	public int confBootTimeout = 0;
+	public String confMenuTitle = "EaglercraftX 1.8 Boot Manager";
+
+	public BootMenuDataManager(BootMenuDatastore datastore) {
+		this.datastore = datastore;
+		this.loadAllData();
+		this.loadAdditionalConf();
+	}
+
+	public void installNewClientData(LaunchConfigEntry launchConfig, ClientDataEntry clientData, Map<EaglercraftUUID,byte[]> clientBlobs, boolean rotateUUIDs) {
+		if(rotateUUIDs) {
+			EaglercraftUUID rotatedLaunchUUID = EaglercraftUUID.randomUUID();
+			EaglercraftUUID rotatedClientUUID = EaglercraftUUID.randomUUID();
+			launchConfig = launchConfig.rotateUUIDs(rotatedLaunchUUID, rotatedClientUUID);
+			clientData = clientData.rotateUUID(rotatedClientUUID);
+		}
+		if(launchDatas.containsKey(launchConfig.uuid) || BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN.equals(launchConfig.uuid)) {
+			throw new IllegalArgumentException("Launch data UUID \"" + launchConfig.uuid + "\" already exists!");
+		}
+		if(clientDatas.containsKey(clientData.uuid) || BootMenuConstants.UUID_CLIENT_DATA_ORIGIN.equals(launchConfig.uuid)) {
+			throw new IllegalArgumentException("Client data UUID \"" + clientData.uuid + "\" already exists!");
+		}
+		if(!launchConfig.clientDataUUID.equals(clientData.uuid)) {
+			throw new IllegalArgumentException("Mismatched client data UUID and launch configuration!");
+		}
+		logger.info("Installing new client data \"{}\"...", clientData.uuid);
+		if(clientBlobs != null && !clientBlobs.isEmpty()) {
+			for(Entry<EaglercraftUUID,byte[]> etr : clientBlobs.entrySet()) {
+				EaglercraftUUID k = etr.getKey();
+				byte[] v = etr.getValue();
+				String name = "blobs/" + k;
+				if(!datastore.containsKey(name)) {
+					logger.info(" - Adding blob to datastore \"{}\" ({} bytes long)", name, v.length);
+					datastore.setItem(name, v);
+					existingBlobs.add(k);
+				}else {
+					logger.info(" - Skipping blob \"{}\" because it already exists", name);
+				}
+			}
+		}
+		String name = "clientDatas/" + clientData.uuid;
+		logger.info(" - Writing client data: \"{}\"", name);
+		JSONObject obj = new JSONObject();
+		clientData.writeJSON(obj);
+		datastore.setItem(name, obj.toString().getBytes(StandardCharsets.UTF_8));
+		clientDatas.put(clientData.uuid, clientData);
+		installNewLaunchConfig(launchConfig, false);
+	}
+
+	public void installNewLaunchConfig(LaunchConfigEntry launchConfig, ClientDataEntry clientData, Map<EaglercraftUUID,byte[]> clientBlobs, boolean rotateUUIDs) {
+		if(rotateUUIDs) {
+			EaglercraftUUID rotatedLaunchUUID = EaglercraftUUID.randomUUID();
+			launchConfig = launchConfig.rotateUUIDs(rotatedLaunchUUID, launchConfig.clientDataUUID);
+		}
+		if(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN.equals(launchConfig.uuid)) {
+			throw new IllegalArgumentException("The origin launch configuration cannot be overwritten!");
+		}
+		if(!clientDatas.containsKey(launchConfig.clientDataUUID) && !BootMenuConstants.UUID_CLIENT_DATA_ORIGIN.equals(launchConfig.clientDataUUID)) {
+			logger.info("Installing new client data \"{}\"...", clientData.uuid);
+			if(clientBlobs != null && !clientBlobs.isEmpty()) {
+				for(Entry<EaglercraftUUID,byte[]> etr : clientBlobs.entrySet()) {
+					EaglercraftUUID k = etr.getKey();
+					byte[] v = etr.getValue();
+					String name = "blobs/" + k;
+					if(!datastore.containsKey(name)) {
+						logger.info(" - Adding blob to datastore \"{}\" ({} bytes long)", name, v.length);
+						datastore.setItem(name, v);
+						existingBlobs.add(k);
+					}else {
+						logger.info(" - Skipping blob \"{}\" because it already exists", name);
+					}
+				}
+			}
+			String name = "clientDatas/" + clientData.uuid;
+			logger.info(" - Writing client data: \"{}\"", name);
+			JSONObject obj = new JSONObject();
+			clientData.writeJSON(obj);
+			datastore.setItem(name, obj.toString().getBytes(StandardCharsets.UTF_8));
+			clientDatas.put(clientData.uuid, clientData);
+		}
+		logger.info("Installing new launch config \"{}\"...", launchConfig.uuid);
+		String name = "launchDatas/" + launchConfig.uuid;
+		JSONObject obj = new JSONObject();
+		launchConfig.writeJSON(obj);
+		datastore.setItem(name, obj.toString().getBytes(StandardCharsets.UTF_8));
+		boolean writeManifest = false;
+		if(launchDatas.put(launchConfig.uuid, launchConfig) == null) {
+			launchDatasList.add(launchConfig.uuid);
+			writeManifest = true;
+		}
+		if(!launchOrderList.contains(launchConfig.uuid)) {
+			launchOrderList.add(launchConfig.uuid);
+			writeManifest = true;
+		}
+		if(writeManifest) {
+			writeManifest();
+		}
+	}
+
+	public void installNewLaunchConfig(LaunchConfigEntry launchConfig, boolean rotateUUIDs) {
+		if(rotateUUIDs) {
+			EaglercraftUUID rotatedLaunchUUID = EaglercraftUUID.randomUUID();
+			launchConfig = launchConfig.rotateUUIDs(rotatedLaunchUUID, launchConfig.clientDataUUID);
+		}
+		if(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN.equals(launchConfig.uuid)) {
+			throw new IllegalArgumentException("The origin launch configuration cannot be overwritten!");
+		}
+		if(!clientDatas.containsKey(launchConfig.clientDataUUID) && !BootMenuConstants.UUID_CLIENT_DATA_ORIGIN.equals(launchConfig.uuid)) {
+			throw new IllegalArgumentException("Client data UUID \"" + launchConfig.clientDataUUID + "\" does not exist!");
+		}
+		logger.info("Installing new launch config \"{}\"...", launchConfig.uuid);
+		String name = "launchDatas/" + launchConfig.uuid;
+		JSONObject obj = new JSONObject();
+		launchConfig.writeJSON(obj);
+		datastore.setItem(name, obj.toString().getBytes(StandardCharsets.UTF_8));
+		boolean writeManifest = false;
+		if(launchDatas.put(launchConfig.uuid, launchConfig) == null) {
+			launchDatasList.add(launchConfig.uuid);
+			writeManifest = true;
+		}
+		if(!launchOrderList.contains(launchConfig.uuid)) {
+			launchOrderList.add(launchConfig.uuid);
+			writeManifest = true;
+		}
+		if(writeManifest) {
+			writeManifest();
+		}
+	}
+
+	public void deleteLaunchConfig(EaglercraftUUID launchConfig) {
+		if(launchDatas.remove(launchConfig) != null) {
+			boolean removed = false;
+			while(launchDatasList.remove(launchConfig)) {
+				removed = true;
+			}
+			while(launchOrderList.remove(launchConfig)) {
+				removed = true;
+			}
+			String name = "launchDatas/" + launchConfig;
+			logger.info("Deleting launch config \"{}\" from datastore", name);
+			if(!datastore.deleteItem(name)) {
+				logger.warn("Failed to delete file! Removing it from the list anyway...");
+			}
+			if(removed) {
+				writeManifest();
+			}
+			garbageCollectClientDatas();
+		}
+	}
+
+	protected void loadAllData() {
+		logger.info("Loading custom boot configurations from datastore...");
+		existingBlobs.clear();
+		clientDatas.clear();
+		launchDatas.clear();
+		launchDatasList.clear();
+		launchOrderList.clear();
+		byte[] manifestBytes = datastore.getItem("manifest.json");
+		if(manifestBytes == null) {
+			return;
+		}
+		List<EaglercraftUUID> profilesToLoad;
+		try {
+			JSONArray arr = (new JSONObject(new String(manifestBytes, StandardCharsets.UTF_8))).getJSONArray("launchProfiles");
+			profilesToLoad = new ArrayList<>(arr.length());
+			for(int i = 0, l = arr.length(); i < l; ++i) {
+				profilesToLoad.add(EaglercraftUUID.fromString(arr.getString(i)));
+			}
+			arr = (new JSONObject(new String(manifestBytes, StandardCharsets.UTF_8))).getJSONArray("launchOrderList");
+			for(int i = 0, l = arr.length(); i < l; ++i) {
+				launchOrderList.add(EaglercraftUUID.fromString(arr.getString(i)));
+			}
+		}catch(JSONException | IllegalArgumentException exp) {
+			logger.error("Manifest is corrupt!");
+			logger.error(exp);
+			return;
+		}
+		for(EaglercraftUUID uuid : profilesToLoad) {
+			if(loadLaunchDataFromStore(uuid) != null) {
+				launchDatasList.add(uuid);
+			}
+		}
+		logger.info("Loading {} client(s) successfully", clientDatas.size());
+		logger.info("Loading {} profile(s) successfully", launchDatas.size());
+	}
+
+	protected LaunchConfigEntry loadLaunchDataFromStore(EaglercraftUUID uuid) {
+		LaunchConfigEntry ret = launchDatas.get(uuid);
+		if(ret != null) {
+			return ret;
+		}
+		String name = "launchDatas/" + uuid;
+		byte[] fileData = datastore.getItem(name);
+		if(fileData == null) {
+			logger.error("Could not locate launch data \"{}\"!", name);
+			return null;
+		}
+		try {
+			ret = new LaunchConfigEntry(uuid, new JSONObject(new String(fileData, StandardCharsets.UTF_8)));
+		}catch(JSONException | IllegalArgumentException exp) {
+			logger.error("Launch data \"{}\" is corrupt!", name);
+			logger.error(exp);
+			return null;
+		}
+		if(!BootMenuConstants.UUID_CLIENT_DATA_ORIGIN.equals(ret.clientDataUUID)) {
+			if(loadClientDataFromStore(ret.clientDataUUID) == null) {
+				logger.error("Client data \"{}\" for launch data \"{}\" is missing/corrupt!", ret.clientDataUUID, name);
+				return null;
+			}
+		}
+		launchDatas.put(uuid, ret);
+		return ret;
+	}
+
+	protected ClientDataEntry loadClientDataFromStore(EaglercraftUUID uuid) {
+		ClientDataEntry ret = clientDatas.get(uuid);
+		if(ret != null) {
+			return ret;
+		}
+		String name = "clientDatas/" + uuid;
+		byte[] fileData = datastore.getItem(name);
+		if(fileData == null) {
+			logger.error("Could not locate client data \"{}\"!", name);
+			return null;
+		}
+		try {
+			ret = new ClientDataEntry(uuid, new JSONObject(new String(fileData, StandardCharsets.UTF_8)));
+		}catch(JSONException | IllegalArgumentException exp) {
+			logger.error("Client data \"{}\" is corrupt!", name);
+			logger.error(exp);
+			return null;
+		}
+		existingBlobs.addAll(ret.getReferencedBlobs());
+		clientDatas.put(uuid, ret);
+		return ret;
+	}
+
+	public void writeManifest() {
+		JSONObject manifest = new JSONObject();
+		JSONArray launchProfileArray = new JSONArray();
+		for(EaglercraftUUID uuid : launchDatasList) {
+			launchProfileArray.put(uuid.toString());
+		}
+		manifest.put("launchProfiles", launchProfileArray);
+		JSONArray launchOrderListArray = new JSONArray();
+		for(EaglercraftUUID uuid : launchOrderList) {
+			launchOrderListArray.put(uuid.toString());
+		}
+		manifest.put("launchOrderList", launchOrderListArray);
+		datastore.setItem("manifest.json", manifest.toString().getBytes(StandardCharsets.UTF_8));
+	}
+
+	protected void garbageCollectClientDatas() {
+		Set<EaglercraftUUID> referencedClientData = new HashSet<>();
+		for(LaunchConfigEntry etr : launchDatas.values()) {
+			referencedClientData.add(etr.clientDataUUID);
+		}
+		Set<EaglercraftUUID> toDelete = new HashSet<>(clientDatas.keySet());
+		toDelete.removeAll(referencedClientData);
+		boolean garbageCollectBlobs = !toDelete.isEmpty();
+		if(garbageCollectBlobs) {
+			for(EaglercraftUUID del : toDelete) {
+				clientDatas.remove(del);
+				String name = "clientDatas/" + del;
+				logger.info("Deleting orphaned client \"{}\" from datastore", name);
+				datastore.deleteItem(name);
+			}
+			garbageCollectClientBlobs();
+		}
+	}
+
+	protected void garbageCollectClientBlobs() {
+		Set<EaglercraftUUID> referencedClientBlob = new HashSet<>();
+		for(ClientDataEntry etr : clientDatas.values()) {
+			referencedClientBlob.addAll(etr.getReferencedBlobs());
+		}
+		Set<EaglercraftUUID> toDelete = new HashSet<>(existingBlobs);
+		toDelete.removeAll(referencedClientBlob);
+		if(!toDelete.isEmpty()) {
+			for(EaglercraftUUID del : toDelete) {
+				existingBlobs.remove(del);
+				String name = "blobs/" + del;
+				logger.info("Deleting orphaned blob \"{}\" from datastore", name);
+				if(!datastore.deleteItem(name)) {
+					logger.warn("Failed to delete file! Skipping...");
+				}
+			}
+		}
+	}
+
+	public void garbageCollectAll() {
+		logger.info("Garbage-collecting boot menu data store");
+		Set<EaglercraftUUID> existingClients = new HashSet<>();
+		Set<EaglercraftUUID> existingLaunches = new HashSet<>();
+		Set<EaglercraftUUID> existingBlobs = new HashSet<>();
+		Set<String> orphanedFiles = new HashSet<>();
+		datastore.iterateAllKeys((str) -> {
+			if(str.startsWith("clientDatas/")) {
+				try {
+					existingClients.add(EaglercraftUUID.fromString(str.substring(12)));
+				}catch(IllegalArgumentException ex) {
+					orphanedFiles.add(str);
+				}
+			}else if(str.startsWith("launchDatas/")) {
+				try {
+					existingLaunches.add(EaglercraftUUID.fromString(str.substring(12)));
+				}catch(IllegalArgumentException ex) {
+					orphanedFiles.add(str);
+				}
+			}else if(str.startsWith("blobs/")) {
+				try {
+					existingBlobs.add(EaglercraftUUID.fromString(str.substring(6)));
+				}catch(IllegalArgumentException ex) {
+					orphanedFiles.add(str);
+				}
+			}
+		});
+		Set<EaglercraftUUID> toDelete = new HashSet<>(existingLaunches);
+		toDelete.removeAll(launchDatas.keySet());
+		if(!toDelete.isEmpty()) {
+			for(EaglercraftUUID del : toDelete) {
+				String name = "launchDatas/" + del;
+				logger.info("Deleting orphaned launch \"{}\" from datastore", name);
+				if(!datastore.deleteItem(name)) {
+					logger.warn("Failed to delete file! Skipping...");
+				}
+			}
+		}
+		Set<EaglercraftUUID> referencedData = new HashSet<>();
+		for(LaunchConfigEntry etr : launchDatas.values()) {
+			referencedData.add(etr.clientDataUUID);
+		}
+		toDelete = new HashSet<>(existingClients);
+		toDelete.removeAll(referencedData);
+		if(!toDelete.isEmpty()) {
+			for(EaglercraftUUID del : toDelete) {
+				clientDatas.remove(del);
+				String name = "clientDatas/" + del;
+				logger.info("Deleting orphaned client \"{}\" from datastore", name);
+				if(!datastore.deleteItem(name)) {
+					logger.warn("Failed to delete file! Skipping...");
+				}
+			}
+		}
+		referencedData.clear();
+		for(ClientDataEntry etr : clientDatas.values()) {
+			referencedData.addAll(etr.getReferencedBlobs());
+		}
+		toDelete.clear();
+		toDelete.addAll(existingBlobs);
+		toDelete.removeAll(referencedData);
+		if(!toDelete.isEmpty()) {
+			for(EaglercraftUUID del : toDelete) {
+				existingBlobs.remove(del);
+				String name = "blobs/" + del;
+				logger.info("Deleting orphaned blob \"{}\" from datastore", name);
+				if(!datastore.deleteItem(name)) {
+					logger.warn("Failed to delete file! Skipping...");
+				}
+			}
+		}
+	}
+
+	public void loadAdditionalConf() {
+		logger.info("Loading config.json");
+		byte[] dat = datastore.getItem("config.json");
+		if(dat != null) {
+			try {
+				JSONObject obj = new JSONObject(new String(dat, StandardCharsets.UTF_8));
+				confBootTimeout = obj.getInt("confBootTimeout");
+				confMenuTitle = obj.getString("confMenuTitle");
+			}catch(JSONException ex) {
+				logger.error("Invalid config.json!");
+				logger.error(ex);
+			}
+		}
+	}
+
+	public void saveAdditionalConf() {
+		JSONObject confJSON = new JSONObject();
+		confJSON.put("confBootTimeout", confBootTimeout);
+		confJSON.put("confMenuTitle", confMenuTitle);
+		byte[] confBytes = confJSON.toString().getBytes(StandardCharsets.UTF_8);
+		datastore.setItem("config.json", confBytes);
+	}
+
+	public static int getBootMenuFlags(Window win) {
+		try {
+			Storage stor = win.getLocalStorage();
+			if(stor != null) {
+				String itm = stor.getItem(BootMenuConstants.getBootMenuFlagsKeyName());
+				if(itm != null) {
+					return Integer.parseInt(itm);
+				}
+			}
+		}catch(Throwable t) {
+		}
+		return -1;
+	}
+
+	public static void setBootMenuFlags(Window win, int flags) {
+		try {
+			Storage stor = win.getLocalStorage();
+			if(stor != null) {
+				String key = BootMenuConstants.getBootMenuFlagsKeyName();
+				if(flags != -1) {
+					stor.setItem(key, Integer.toString(flags));
+				}else {
+					stor.removeItem(key);
+				}
+			}
+		}catch(Throwable t) {
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuDatastore.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuDatastore.java
new file mode 100755
index 0000000..1a82c64
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuDatastore.java
@@ -0,0 +1,362 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.function.Consumer;
+
+import org.teavm.interop.Async;
+import org.teavm.interop.AsyncCallback;
+import org.teavm.jso.JSBody;
+import org.teavm.jso.JSFunctor;
+import org.teavm.jso.JSObject;
+import org.teavm.jso.dom.events.EventListener;
+import org.teavm.jso.indexeddb.EventHandler;
+import org.teavm.jso.indexeddb.IDBCountRequest;
+import org.teavm.jso.indexeddb.IDBCursor;
+import org.teavm.jso.indexeddb.IDBCursorRequest;
+import org.teavm.jso.indexeddb.IDBDatabase;
+import org.teavm.jso.indexeddb.IDBFactory;
+import org.teavm.jso.indexeddb.IDBGetRequest;
+import org.teavm.jso.indexeddb.IDBObjectStoreParameters;
+import org.teavm.jso.indexeddb.IDBOpenDBRequest;
+import org.teavm.jso.indexeddb.IDBRequest;
+import org.teavm.jso.indexeddb.IDBTransaction;
+import org.teavm.jso.indexeddb.IDBVersionChangeEvent;
+import org.teavm.jso.typedarrays.ArrayBuffer;
+
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.BooleanResult;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class BootMenuDatastore {
+
+	private static final Logger logger = LogManager.getLogger("BootMenuDatastore");
+
+	public static final String bootMenuDatabaseName = BootMenuConstants.bootMenuDatabaseName;
+
+	private static final Object instanceLock = new Object();
+	private static BootMenuDatastore instance = null;
+
+	public static class DatastoreLockedException extends RuntimeException {
+		public DatastoreLockedException(String message) {
+			super(message);
+		}
+	}
+
+	public static class DatastoreInitializationException extends RuntimeException {
+		public DatastoreInitializationException(String message) {
+			super(message);
+		}
+	}
+
+	public static class DatastoreOperationException extends RuntimeException {
+		public DatastoreOperationException(String message) {
+			super(message);
+		}
+	}
+
+	public static BootMenuDatastore openDatastore() {
+		synchronized(instanceLock) {
+			if(instance != null) {
+				++instance.openCount;
+				return instance;
+			}
+			return instance = openDatastore0();
+		}
+	}
+
+	private static BootMenuDatastore openDatastore0() {
+		DatabaseOpen openResult = AsyncHandlers
+				.openDB(bootMenuDatabaseName + (BootMenuEntryPoint.isSignedClient() ? "_sig" : "_unsig")
+						+ (IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients() ? "_1" : "_0"));
+		if(openResult.failedLocked) {
+			throw new DatastoreLockedException(openResult.failedError);
+		}
+		if(openResult.failedInit) {
+			throw new DatastoreInitializationException(openResult.failedError);
+		}
+		if(openResult.database == null) {
+			throw new NullPointerException("IDBDatabase is null!");
+		}
+		return new BootMenuDatastore(openResult.database);
+	}
+
+	private IDBDatabase database;
+	private int openCount;
+
+	private BootMenuDatastore(IDBDatabase database) {
+		this.database = database;
+		this.openCount = 1;
+	}
+
+	public byte[] getItem(String key) {
+		if(database != null) {
+			return TeaVMUtils.wrapByteArrayBuffer(AsyncHandlers.readWholeFile(database, key));
+		}else {
+			return null;
+		}
+	}
+
+	public void setItem(String key, byte[] data) {
+		if(database != null) {
+			if(data != null) {
+				if(!AsyncHandlers.writeWholeFile(database, key, TeaVMUtils.unwrapArrayBuffer(data)).bool) {
+					throw new DatastoreOperationException("Failed to write to datastore: \"" + key + "\" (" + data.length + " bytes)");
+				}
+			}else {
+				AsyncHandlers.deleteFile(database, key);
+			}
+		}
+	}
+
+	public boolean containsKey(String key) {
+		if(database != null) {
+			return AsyncHandlers.fileExists(database, key).bool;
+		}else {
+			return false;
+		}
+	}
+
+	public boolean deleteItem(String key) {
+		if(database != null) {
+			return AsyncHandlers.deleteFile(database, key).bool;
+		}else {
+			return false;
+		}
+	}
+
+	public void closeDatastore() {
+		if(--openCount == 0) {
+			synchronized(instanceLock) {
+				if(instance == this) {
+					instance = null;
+				}
+			}
+			closeDatastore0();
+		}
+	}
+
+	private void closeDatastore0() {
+		if(database != null) {
+			database.close();
+		}
+	}
+
+	public void iterateAllKeys(Consumer<String> itr) {
+		if(database != null) {
+			AsyncHandlers.iterateFiles(database, itr);
+		}
+	}
+
+	protected static class DatabaseOpen {
+		
+		protected final boolean failedInit;
+		protected final boolean failedLocked;
+		protected final String failedError;
+		
+		protected final IDBDatabase database;
+		
+		protected DatabaseOpen(boolean init, boolean locked, String error, IDBDatabase db) {
+			failedInit = init;
+			failedLocked = locked;
+			failedError = error;
+			database = db;
+		}
+		
+	}
+
+	@JSBody(script = "return ((typeof indexedDB) !== 'undefined') ? indexedDB : null;")
+	protected static native IDBFactory createIDBFactory();
+
+	@JSFunctor
+	protected static interface OpenErrorCallback extends JSObject {
+		void call(String str);
+	}
+
+	@JSBody(params = { "factory", "name", "ii", "errCB" }, script = "try { return factory.open(name, ii); } catch(err) { errCB(\"\" + err); return null; }")
+	protected static native IDBOpenDBRequest safeOpen(IDBFactory factory, String name, int i, OpenErrorCallback errCB);
+	
+	protected static class AsyncHandlers {
+		
+		@Async
+		protected static native DatabaseOpen openDB(String name);
+		
+		private static void openDB(String name, final AsyncCallback<DatabaseOpen> cb) {
+			IDBFactory i = createIDBFactory();
+			if(i == null) {
+				cb.complete(new DatabaseOpen(true, false, "window.indexedDB was null or undefined", null));
+				return;
+			}
+			final String[] errorHolder = new String[] { null };
+			final IDBOpenDBRequest f = safeOpen(i, name, 1, (e) -> errorHolder[0] = e);
+			if(f == null || TeaVMUtils.isNotTruthy(f)) {
+				cb.complete(new DatabaseOpen(true, false, errorHolder[0] != null ? errorHolder[0] : "database open request was null or undefined", null));
+				return;
+			}
+			TeaVMUtils.addEventListener(f, "blocked", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(new DatabaseOpen(false, true, null, null));
+				}
+			});
+			TeaVMUtils.addEventListener(f, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(new DatabaseOpen(false, false, null, f.getResult()));
+				}
+			});
+			TeaVMUtils.addEventListener(f, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(new DatabaseOpen(true, false, "open error", null));
+				}
+			});
+			TeaVMUtils.addEventListener(f, "upgradeneeded", new EventListener<IDBVersionChangeEvent>() {
+				@Override
+				public void handleEvent(IDBVersionChangeEvent evt) {
+					f.getResult().createObjectStore("filesystem", IDBObjectStoreParameters.create().keyPath("path"));
+				}
+			});
+		}
+		
+		@Async
+		protected static native BooleanResult deleteFile(IDBDatabase db, String name);
+		
+		private static void deleteFile(IDBDatabase db, String name, final AsyncCallback<BooleanResult> cb) {
+			IDBTransaction tx = db.transaction("filesystem", "readwrite");
+			final IDBRequest r = tx.objectStore("filesystem").delete(makeTheFuckingKeyWork(name));
+			TeaVMUtils.addEventListener(r, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult.TRUE);
+				}
+			});
+			TeaVMUtils.addEventListener(r, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult.FALSE);
+				}
+			});
+		}
+		
+		@JSBody(params = { "obj" }, script = "return (typeof obj === \"undefined\") ? null : ((typeof obj.data === \"undefined\") ? null : obj.data);")
+		protected static native ArrayBuffer readRow(JSObject obj);
+		
+		@JSBody(params = { "obj" }, script = "return [obj];")
+		private static native JSObject makeTheFuckingKeyWork(String k);
+		
+		@Async
+		protected static native ArrayBuffer readWholeFile(IDBDatabase db, String name);
+		
+		private static void readWholeFile(IDBDatabase db, String name, final AsyncCallback<ArrayBuffer> cb) {
+			IDBTransaction tx = db.transaction("filesystem", "readonly");
+			final IDBGetRequest r = tx.objectStore("filesystem").get(makeTheFuckingKeyWork(name));
+			TeaVMUtils.addEventListener(r, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(readRow(r.getResult()));
+				}
+			});
+			TeaVMUtils.addEventListener(r, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(null);
+				}
+			});
+			
+		}
+		
+		@Async
+		protected static native BooleanResult fileExists(IDBDatabase db, String name);
+		
+		private static void fileExists(IDBDatabase db, String name, final AsyncCallback<BooleanResult> cb) {
+			IDBTransaction tx = db.transaction("filesystem", "readonly");
+			final IDBCountRequest r = tx.objectStore("filesystem").count(makeTheFuckingKeyWork(name));
+			TeaVMUtils.addEventListener(r, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult._new(r.getResult() > 0));
+				}
+			});
+			TeaVMUtils.addEventListener(r, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult.FALSE);
+				}
+			});
+		}
+		
+		@JSBody(params = { "k" }, script = "return ((typeof k) === \"string\") ? k : (((typeof k) === \"undefined\") ? null : (((typeof k[0]) === \"string\") ? k[0] : null));")
+		private static native String readKey(JSObject k);
+		
+		@Async
+		protected static native Integer iterateFiles(IDBDatabase db, final Consumer<String> itr);
+		
+		private static void iterateFiles(IDBDatabase db, final Consumer<String> itr, final AsyncCallback<Integer> cb) {
+			IDBTransaction tx = db.transaction("filesystem", "readonly");
+			final IDBCursorRequest r = tx.objectStore("filesystem").openCursor();
+			final int[] res = new int[1];
+			TeaVMUtils.addEventListener(r, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					IDBCursor c = r.getResult();
+					if(c == null || c.getKey() == null || c.getValue() == null) {
+						cb.complete(res[0]);
+						return;
+					}
+					String k = readKey(c.getKey());
+					if(k != null) {
+						++res[0];
+						itr.accept(k);
+					}
+					c.doContinue();
+				}
+			});
+			TeaVMUtils.addEventListener(r, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(res[0] > 0 ? res[0] : -1);
+				}
+			});
+		}
+		
+		@JSBody(params = { "pat", "dat" }, script = "return { path: pat, data: dat };")
+		protected static native JSObject writeRow(String name, ArrayBuffer data);
+		
+		@Async
+		protected static native BooleanResult writeWholeFile(IDBDatabase db, String name, ArrayBuffer data);
+		
+		private static void writeWholeFile(IDBDatabase db, String name, ArrayBuffer data, final AsyncCallback<BooleanResult> cb) {
+			IDBTransaction tx = db.transaction("filesystem", "readwrite");
+			final IDBRequest r = tx.objectStore("filesystem").put(writeRow(name, data));
+			
+			TeaVMUtils.addEventListener(r, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult.TRUE);
+				}
+			});
+			TeaVMUtils.addEventListener(r, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult.FALSE);
+				}
+			});
+		}
+		
+	}
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuEntryPoint.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuEntryPoint.java
new file mode 100755
index 0000000..d03bea4
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuEntryPoint.java
@@ -0,0 +1,178 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.teavm.jso.JSBody;
+import org.teavm.jso.browser.Window;
+import org.teavm.jso.dom.html.HTMLElement;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.cookie.ServerCookieDataStore;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformUpdateSvc;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain.EPKFileEntry;
+import net.lax1dude.eaglercraft.v1_8.sp.internal.ClientPlatformSingleplayer;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMClientConfigAdapter;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class BootMenuEntryPoint {
+
+	@JSBody(params = {}, script = "if((typeof window.__isEaglerX188BootMenuAlreadyShow === \"string\") && window.__isEaglerX188BootMenuAlreadyShow === \"yes\") return true; window.__isEaglerX188BootMenuAlreadyShow = \"yes\"; return false;")
+	private static native boolean getHasAlreadyBooted();
+
+	@JSBody(params = {}, script = "window.__isEaglerX188BootMenuAlreadyShow = \"yes\";")
+	private static native void setHasAlreadyBooted();
+
+	public static boolean checkShouldLaunchFlag(Window win) {
+		int flag = BootMenuDataManager.getBootMenuFlags(win);
+		if(flag == -1) {
+			return IBootMenuConfigAdapter.instance.isShowBootMenuOnLaunch() && !getHasAlreadyBooted();
+		}
+		if((flag & 2) != 0) {
+			BootMenuDataManager.setBootMenuFlags(win, flag & ~2);
+			setHasAlreadyBooted();
+			return true;
+		}
+		return ((flag & 1) != 0 || IBootMenuConfigAdapter.instance.isShowBootMenuOnLaunch()) && !getHasAlreadyBooted();
+	}
+
+	private static byte[] signatureData = null;
+	private static byte[] bundleData = null;
+
+	public static void launchMenu(Window parentWindow, HTMLElement parentElement) {
+		signatureData = PlatformUpdateSvc.getClientSignatureData();
+		bundleData = PlatformUpdateSvc.getClientBundleData();
+		BootMenuMain.launchMenu(parentWindow, parentElement);
+	}
+
+	public static void bootOriginClient() {
+		bootOriginClient(null);
+	}
+
+	public static void bootOriginClient(Runnable doBeforeBoot) {
+		(new Thread(() -> {
+			if(doBeforeBoot != null) {
+				doBeforeBoot.run();
+			}
+			ClientMain._main();
+		}, "main")).start();
+	}
+
+	public static boolean isSignedClient() {
+		return signatureData != null && bundleData != null;
+	}
+
+	public static byte[] getSignedClientSignature() {
+		return signatureData;
+	}
+
+	public static byte[] getSignedClientBundle() {
+		return bundleData;
+	}
+
+	public static byte[] getUnsignedClientClassesJS() {
+		return OfflineDownloadFactory.removeClientScriptElement(ClientPlatformSingleplayer.getIntegratedServerSourceTeaVM(), true);
+	}
+
+	public static class UnsignedClientEPKLoader {
+
+		public final List<EPKDataEntry> list;
+		public final Map<EaglercraftUUID,Supplier<byte[]>> loaders;
+		
+		public UnsignedClientEPKLoader(List<EPKDataEntry> list, Map<EaglercraftUUID,Supplier<byte[]>> loaders) {
+			this.list = list;
+			this.loaders = loaders;
+		}
+		
+		public byte[] loadEntry(EaglercraftUUID epkUUID) {
+			Supplier<byte[]> sup = loaders.get(epkUUID);
+			return sup != null ? sup.get() : null;
+		}
+		
+	}
+
+	public static JSONArray getUnsignedClientAssetsEPKRaw() {
+		JSONArray ret = new JSONArray(ClientMain.configEPKFiles.length);
+		for (int i = 0; i < ClientMain.configEPKFiles.length; ++i) {
+			EPKFileEntry etr = ClientMain.configEPKFiles[i];
+			JSONObject obj = new JSONObject();
+			obj.put("url", etr.url);
+			obj.put("path", etr.path);
+			ret.put(obj);
+		}
+		return ret;
+	}
+
+	public static UnsignedClientEPKLoader getUnsignedClientAssetsEPK() {
+		List<EPKDataEntry> list = new ArrayList<>(2);
+		Map<EaglercraftUUID, Supplier<byte[]>> loaders = new HashMap<>(2);
+		for (int i = 0; i < ClientMain.configEPKFiles.length; ++i) {
+			EPKFileEntry etr = ClientMain.configEPKFiles[i];
+			EaglercraftUUID uuidGen = EaglercraftUUID
+					.nameUUIDFromBytes(("EPKURL:" + etr.url).getBytes(StandardCharsets.UTF_8));
+			list.add(new EPKDataEntry(etr.path, uuidGen));
+			loaders.put(uuidGen,
+					() -> TeaVMUtils.wrapByteArrayBuffer(PlatformRuntime.downloadRemoteURI(etr.url, true)));
+		}
+		return new UnsignedClientEPKLoader(list, loaders);
+	}
+
+	public static String getOriginLaunchOpts() {
+		return ((TeaVMClientConfigAdapter)PlatformRuntime.getClientConfigAdapter()).toJSONObject().put("bootMenuBlocksUnsignedClients", false).toString(4);
+	}
+
+	public static JSONObject getOriginLaunchOptsJSON() {
+		return ((TeaVMClientConfigAdapter)PlatformRuntime.getClientConfigAdapter()).toJSONObject();
+	}
+
+	public static String getOriginContainer() {
+		return ClientMain.configRootElementId;
+	}
+
+	public static void installSignedClientAtRuntime(String displayName, Window win, byte[] clientCert,
+			byte[] clientPayload, boolean setDefault, boolean setTimeout) {
+		SignedClientInstaller.installSignedClientAtRuntime(displayName, win, clientCert, clientPayload, setDefault,
+				setTimeout);
+	}
+
+	public static void setDisplayBootMenuNextRefresh(Window win, boolean en) {
+		int i = BootMenuDataManager.getBootMenuFlags(win);
+		if(i == -1) i = 0;
+		if(en) {
+			i |= 2;
+		}else {
+			i &= ~2;
+		}
+		BootMenuDataManager.setBootMenuFlags(win, i);
+	}
+
+	public static void clearCookies() {
+		PlatformApplication.setLocalStorage(ServerCookieDataStore.localStorageKey, null, false);
+		ServerCookieDataStore.clearCookiesLow();
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuFatOfflineLoader.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuFatOfflineLoader.java
new file mode 100755
index 0000000..49e8479
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuFatOfflineLoader.java
@@ -0,0 +1,93 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.teavm.jso.dom.html.HTMLElement;
+
+import net.lax1dude.eaglercraft.v1_8.Base64;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class BootMenuFatOfflineLoader {
+
+	protected static final Logger logger = LogManager.getLogger("BootMenuFatOfflineLoader");
+
+	public final HTMLElement parentElement;
+
+	public final Map<EaglercraftUUID,ClientDataEntry> clientDatas = new HashMap<>();
+	public final List<LaunchConfigEntry> launchDatas = new ArrayList<>();
+
+	public BootMenuFatOfflineLoader(HTMLElement parentElement) {
+		this.parentElement = parentElement;
+		this.loadAllData();
+	}
+
+	protected void loadAllData() {
+		String manifest = loadDataString("manifest_v1");
+		if(manifest != null) {
+			JSONObject json = new JSONObject(manifest);
+			JSONArray launches = json.getJSONArray("launchData");
+			JSONArray clients = json.getJSONArray("clientData");
+			for(int i = 0, l = clients.length(); i < l; ++i) {
+				JSONObject obj = clients.getJSONObject(i);
+				EaglercraftUUID theUUID = EaglercraftUUID.fromString(obj.getString("uuid"));
+				if(!theUUID.equals(BootMenuConstants.UUID_CLIENT_DATA_ORIGIN)) {
+					clientDatas.put(theUUID, new ClientDataEntry(theUUID, obj));
+				}
+			}
+			for(int i = 0, l = launches.length(); i < l; ++i) {
+				JSONObject obj = launches.getJSONObject(i);
+				EaglercraftUUID theUUID = EaglercraftUUID.fromString(obj.getString("uuid"));
+				if(!theUUID.equals(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN)) {
+					LaunchConfigEntry theEtr = new LaunchConfigEntry(theUUID, obj);
+					if(clientDatas.containsKey(theEtr.clientDataUUID) || BootMenuConstants.UUID_CLIENT_DATA_ORIGIN.equals(theEtr.clientDataUUID)) {
+						launchDatas.add(theEtr);
+					}else {
+						logger.warn("Skipping launch config {} because the client data {} is missing!", theUUID, theEtr.clientDataUUID);
+					}
+				}
+			}
+			logger.info("Loading {} client(s) successfully", clientDatas.size());
+			logger.info("Loading {} profile(s) successfully", launchDatas.size());
+		}
+	}
+
+	public String loadDataString(String key) {
+		HTMLElement ret = parentElement.querySelector("#_eaglerFatOffline_" + key);
+		return ret != null ? ret.getInnerText() : null;
+	}
+
+	public byte[] loadDataBinary(String key) {
+		HTMLElement ret = parentElement.querySelector("#_eaglerFatOffline_" + key);
+		if(ret == null) {
+			return null;
+		}
+		try {
+			return Base64.decodeBase64(ret.getInnerText());
+		}catch(Throwable t) {
+			return null;
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuMain.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuMain.java
new file mode 100755
index 0000000..29b8003
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuMain.java
@@ -0,0 +1,304 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.teavm.jso.JSBody;
+import org.teavm.jso.browser.Window;
+import org.teavm.jso.dom.events.EventListener;
+import org.teavm.jso.dom.events.KeyboardEvent;
+import org.teavm.jso.dom.html.HTMLDocument;
+import org.teavm.jso.dom.html.HTMLElement;
+
+import com.google.common.collect.Lists;
+import com.google.common.html.HtmlEscapers;
+
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.LegacyKeycodeTranslator;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class BootMenuMain {
+
+	private static final Logger logger = LogManager.getLogger("BootMenuMain");
+
+	public static Window win = null;
+	public static HTMLDocument doc = null;
+	public static HTMLElement parent = null;
+	public static BootMenuDOM bootMenuDOM = null;
+	public static MenuState currentState = null;
+	public static BootMenuMetadata bootMenuMetadata = null;
+	public static BootMenuDatastore bootMenuDatastore = null;
+	public static BootMenuDataManager bootMenuDataManager = null;
+	public static BootMenuFatOfflineLoader bootMenuFatOfflineLoader = null;
+
+	private static EventListener<KeyboardEvent> windowKeyDownListener = null;
+	private static EventListener<KeyboardEvent> windowKeyUpListener = null;
+
+	private static final List<Runnable> eventQueue = new LinkedList<>();
+
+	private static boolean runUpdateLoop = true;
+
+	@JSBody(params = { "e" }, script = "return (typeof e.which === \"number\") ? e.which : ((typeof e.keyCode === \"number\") ? e.keyCode : 0);")
+	private static native int getWhich(KeyboardEvent e);
+
+	@JSBody(params = { "evt" }, script = "return (typeof evt.key === \"string\");")
+	private static native boolean hasKeyVar(KeyboardEvent evt);
+
+	@JSBody(params = { "evt" }, script = "return (typeof evt.code === \"string\");")
+	private static native boolean hasCodeVar(KeyboardEvent evt);
+
+	public static void launchMenu(Window parentWindow, HTMLElement parentElement) {
+		win = parentWindow;
+		doc = parentWindow.getDocument();
+		parent = parentElement;
+		logger.info("Integrated boot menu is loading");
+		String renderedMarkup;
+		try {
+			renderedMarkup = TemplateLoader.loadTemplate("/assets/eagler/boot_menu/boot_menu_markup.html");
+		}catch(IOException ex) {
+			logger.error("Failed to render template!");
+			logger.error(ex);
+			parentElement.setInnerHTML("<div style=\"padding:10px;\"><h1>Failed to render template!</h1><h3>"
+					+ HtmlEscapers.htmlEscaper().escape(ex.toString())
+					+ "</h3><p>Check the console for more details</p></div>");
+			return;
+		}
+		parentElement.setInnerHTML(renderedMarkup);
+		bootMenuDOM = new BootMenuDOM(parentElement);
+		logger.info("Registering event handlers");
+		win.addEventListener("keydown", windowKeyDownListener = (evt) -> {
+			if(currentState != null) {
+				LegacyKeycodeTranslator.LegacyKeycode keyCode = null;
+				Map<String,LegacyKeycodeTranslator.LegacyKeycode> keyCodeTranslatorMap = PlatformInput.getKeyCodeTranslatorMapTeaVM();
+				if(keyCodeTranslatorMap != null && hasCodeVar(evt)) {
+					keyCode = keyCodeTranslatorMap.get(evt.getCode());
+				}
+				final int which;
+				if(keyCode != null) {
+					which = keyCode.keyCode;
+				}else {
+					which = getWhich(evt);
+				}
+				if(!evt.isRepeat()) {
+					runLater(() -> {
+						if(currentState != null) {
+							currentState.doHandleKeyDown(which);
+						}
+					});
+				}else {
+					runLater(() -> {
+						if(currentState != null) {
+							currentState.doHandleKeyRepeat(which);
+						}
+					});
+				}
+			}
+		});
+		win.addEventListener("keyup", windowKeyUpListener = (evt) -> {
+			if(currentState != null) {
+				if(!evt.isRepeat()) {
+					LegacyKeycodeTranslator.LegacyKeycode keyCode = null;
+					Map<String,LegacyKeycodeTranslator.LegacyKeycode> keyCodeTranslatorMap = PlatformInput.getKeyCodeTranslatorMapTeaVM();
+					if(keyCodeTranslatorMap != null && hasCodeVar(evt)) {
+						keyCode = keyCodeTranslatorMap.get(evt.getCode());
+					}
+					final int which;
+					if(keyCode != null) {
+						which = keyCode.keyCode;
+					}else {
+						which = getWhich(evt);
+					}
+					runLater(() -> {
+						if(currentState != null) {
+							currentState.doHandleKeyUp(which);
+						}
+					});
+				}
+			}
+		});
+		bootMenuDOM.registerEventHandlers();
+		bootMenuMetadata = new BootMenuMetadata("/assets/eagler/boot_menu/");
+		bootMenuDatastore = BootMenuDatastore.openDatastore(); //TODO: error handling
+		bootMenuDataManager = new BootMenuDataManager(bootMenuDatastore);
+		bootMenuDOM.header_title.setInnerText(bootMenuDataManager.confMenuTitle);
+		bootMenuFatOfflineLoader = new BootMenuFatOfflineLoader(parentWindow.getDocument().getHead());
+		logger.info("Entering boot menu display state");
+		eventQueue.clear();
+		changeState(new MenuStateBoot(true));
+		enterUpdateLoop();
+	}
+
+	private static void enterUpdateLoop() {
+		runUpdateLoop = true;
+		while(runUpdateLoop) {
+			if(currentState != null) {
+				currentState.doUpdate();
+			}
+			List<Runnable> eq = null;
+			synchronized(eventQueue) {
+				if(!eventQueue.isEmpty()) {
+					eq = Lists.newArrayList(eventQueue);
+					eventQueue.clear();
+				}
+			}
+			if(eq != null) {
+				for(Runnable run : eq) {
+					try {
+						run.run();
+					}catch(Throwable t) {
+						logger.error("Caught error in event queue!");
+						logger.error(t);
+					}
+				}
+			}
+			EagUtils.sleep(50l);
+		}
+	}
+
+	public static void runLater(Runnable run) {
+		if(runUpdateLoop) {
+			synchronized(eventQueue) {
+				eventQueue.add(run);
+			}
+		}
+	}
+
+	public static void runLaterMS(Runnable run, int millis) {
+		Window.setTimeout(() -> runLater(run), millis);
+	}
+
+	public static void unregisterEventHandlers() {
+		if(windowKeyDownListener != null) {
+			win.removeEventListener("keydown", windowKeyDownListener);
+			windowKeyDownListener = null;
+		}
+		if(windowKeyUpListener != null) {
+			win.removeEventListener("keyup", windowKeyUpListener);
+			windowKeyUpListener = null;
+		}
+	}
+
+	public static void changeState(MenuState newState) {
+		if(currentState != null) {
+			currentState.doExitState();
+			currentState = null;
+		}
+		currentState = newState;
+		if(newState != null) {
+			newState.doEnterState();
+		}
+	}
+
+	public static void continueBootToOriginClient() {
+		continueBootToOriginClient(BootMenuMain::sanitizeEaglercraftXOpts);
+	}
+
+	public static void continueBootToOriginClient(Runnable doBeforeBoot) {
+		destroyBootMenuRuntime();
+		stopEventLoop();
+		BootMenuEntryPoint.bootOriginClient(doBeforeBoot);
+	}
+
+	@JSBody(params = { }, script = "try { window.eaglercraftXOptsHints.bootMenuBlocksUnsignedClients = true; }catch(_ex){} try { window.eaglercraftXOpts.bootMenuBlocksUnsignedClients = true; }catch(_ex){}")
+	private static native void doSanitizeSignatureRequired();
+
+	public static void sanitizeEaglercraftXOpts() {
+		if(IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients()) {
+			doSanitizeSignatureRequired();
+		}
+	}
+
+	public static String createRootElementForClient() {
+		EaglercraftRandom randomCharGenerator = new EaglercraftRandom();
+		char[] randomChars = new char[16];
+		String charSel = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+		for(int i = 0; i < randomChars.length; ++i) {
+			randomChars[i] = charSel.charAt(randomCharGenerator.nextInt(charSel.length()));
+		}
+		String randomId = "game_frame_" + new String(randomChars);
+		HTMLElement parentTemp = parent;
+		HTMLElement newRoot = doc.createElement("div");
+		newRoot.getStyle().setProperty("width", "100%");
+		newRoot.getStyle().setProperty("height", "100%");
+		newRoot.setAttribute("id", randomId);
+		destroyBootMenuRuntime();
+		parentTemp.appendChild(newRoot);
+		return randomId;
+		
+	}
+
+	public static void destroyBootMenuRuntime() {
+		unregisterEventHandlers();
+		bootMenuDOM = null;
+		currentState = null;
+		bootMenuMetadata = null;
+		if(bootMenuDatastore != null) {
+			bootMenuDatastore.closeDatastore();
+			bootMenuDatastore = null;
+		}
+		bootMenuDataManager = null;
+		bootMenuFatOfflineLoader = null;
+		BootMenuAssets.freeBootMenuResourceRepo();
+		win = null;
+		doc = null;
+		while(parent.getLastChild() != null) {
+			parent.removeChild(parent.getLastChild());
+		}
+		parent = null;
+	}
+
+	public static void stopEventLoop() {
+		runUpdateLoop = false;
+	}
+
+	public static void fireChangeEvent(HTMLElement element) {
+		if(currentState != null) {
+			runLater(() -> {
+				if(currentState != null) {
+					currentState.doHandleOnChange(element);
+				}
+			});
+		}
+	}
+
+	public static void fireClickEvent(HTMLElement element) {
+		if(currentState != null) {
+			runLater(() -> {
+				if(currentState != null) {
+					currentState.doHandleOnClick(element);
+				}
+			});
+		}
+	}
+
+	public static void fireMouseOverEvent(HTMLElement element) {
+		if(currentState != null) {
+			runLater(() -> {
+				if(currentState != null) {
+					currentState.doHandleOnMouseOver(element);
+				}
+			});
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuMetadata.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuMetadata.java
new file mode 100755
index 0000000..a05dc83
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuMetadata.java
@@ -0,0 +1,224 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class BootMenuMetadata {
+
+	protected static final Logger logger = LogManager.getLogger("BootMenuMetadata");
+
+	public static class LaunchTemplate {
+
+		public final EnumClientLaunchType type;
+		public final String joinServer;
+		public final String launchOptsVar;
+		public final String launchOptsAssetsURIVar;
+		public final String launchOptsContainerVar;
+		public final String mainFunction;
+		public final String launchOpts;
+		public final boolean clearCookiedBeforeLaunch;
+
+		protected LaunchTemplate(EnumClientLaunchType type, String joinServer, String launchOptsVar,
+				String launchOptsAssetsURIVar, String launchOptsContainerVar, String mainFunction, String launchOpts,
+				boolean clearCookiedBeforeLaunch) {
+			this.type = type;
+			this.joinServer = joinServer;
+			this.launchOptsVar = launchOptsVar;
+			this.launchOptsAssetsURIVar = launchOptsAssetsURIVar;
+			this.launchOptsContainerVar = launchOptsContainerVar;
+			this.mainFunction = mainFunction;
+			this.launchOpts = launchOpts;
+			this.clearCookiedBeforeLaunch = clearCookiedBeforeLaunch;
+		}
+
+		protected LaunchTemplate(JSONObject jsonObject) {
+			type = EnumClientLaunchType.valueOf(jsonObject.getString("client_launch_type"));
+			joinServer = jsonObject.optString("join_server");
+			launchOptsVar = jsonObject.optString("client_launch_opts_var");
+			launchOptsAssetsURIVar = jsonObject.optString("client_launch_opts_assetsURI_var");
+			launchOptsContainerVar = jsonObject.optString("client_launch_opts_container_var");
+			mainFunction = jsonObject.optString("client_launch_main_func");
+			clearCookiedBeforeLaunch = jsonObject.optBoolean("clear_cookies_before_launch");
+			launchOpts = null;
+		}
+
+		protected LaunchTemplate mutateOpts(String newOpts) {
+			if(newOpts == launchOpts) {
+				return this;
+			}
+			return new LaunchTemplate(type, joinServer, launchOptsVar, launchOptsAssetsURIVar, launchOptsContainerVar,
+					mainFunction, newOpts, clearCookiedBeforeLaunch);
+		}
+
+		public LaunchConfigEntry createLaunchConfig(EaglercraftUUID uuid, EaglercraftUUID clientDataUUID, String displayName) {
+			return new LaunchConfigEntry(uuid, clientDataUUID, displayName, type, joinServer, launchOptsVar,
+					launchOptsAssetsURIVar, launchOptsContainerVar, mainFunction, launchOpts, clearCookiedBeforeLaunch);
+		}
+
+		public void configureLaunchConfig(LaunchConfigEntry etr) {
+			switch(type) {
+			case STANDARD_OFFLINE_V1:
+				etr.launchOpts = launchOpts;
+				etr.launchOptsVar = launchOptsVar;
+				etr.launchOptsAssetsURIVar = launchOptsAssetsURIVar;
+				etr.launchOptsContainerVar = launchOptsContainerVar;
+				etr.mainFunction = mainFunction;
+				break;
+			case EAGLERX_V1:
+			case EAGLERX_SIGNED_V1:
+			case EAGLER_1_5_V2:
+			case PEYTON_V2:
+				etr.launchOpts = launchOpts;
+				break;
+			case EAGLER_1_5_V1:
+				etr.launchOpts = launchOpts;
+				etr.joinServer = joinServer;
+				break;
+			case EAGLER_BETA_V1:
+				etr.joinServer = joinServer;
+				break;
+			case PEYTON_V1:
+				break;
+			default: //?
+				break;
+			}
+		}
+
+	}
+
+	public static class DefaultLaunchTemplate {
+
+		public final String templateName;
+		public final Set<EnumClientFormatType> supportedFormats;
+		public final Set<EnumOfflineParseType> parseTypes;
+		public final LaunchTemplate templateState;
+
+		protected DefaultLaunchTemplate(String templateName, Set<EnumClientFormatType> supportedFormats,
+				Set<EnumOfflineParseType> parseTypes, LaunchTemplate templateState) {
+			this.templateName = templateName;
+			this.supportedFormats = supportedFormats;
+			this.parseTypes = parseTypes;
+			this.templateState = templateState;
+		}
+
+		public LaunchConfigEntry createLaunchConfig(EaglercraftUUID uuid, EaglercraftUUID clientDataUUID) {
+			return templateState.createLaunchConfig(uuid, clientDataUUID, templateName);
+		}
+
+		@Override
+		public String toString() {
+			return templateName;
+		}
+	}
+
+	public final String basePath;
+
+	public final Map<EnumClientLaunchType,LaunchTemplate> formatDefaultOptsMap = new HashMap<>();
+	public final List<DefaultLaunchTemplate> defaultLaunchTemplates = new ArrayList<>();
+
+	public BootMenuMetadata(String basePath) {
+		this.basePath = basePath;
+		this.loadAllData();
+	}
+
+	protected void loadAllData() {
+		logger.info("Loading client templates and default settings...");
+		formatDefaultOptsMap.clear();
+		defaultLaunchTemplates.clear();
+		EaglerLoadingCache<String, String> optsFileLoader = new EaglerLoadingCache<>(this::loadDataFileString);
+		EaglerLoadingCache<String, LaunchTemplate> templateFileLoader = new EaglerLoadingCache<>(this::loadDataFileLaunchTemplate);
+		byte[] data = BootMenuAssets.loadResourceBytes(basePath + "meta_opts_templates.json");
+		if(data == null) {
+			throw new RuntimeException("Missing metadata file: meta_opts_templates.json");
+		}
+		JSONObject jsonObject = new JSONObject(new String(data, StandardCharsets.UTF_8));
+		JSONObject defaults = jsonObject.getJSONObject("defaults");
+		for(String str : defaults.keySet()) {
+			EnumClientLaunchType fmt = EnumClientLaunchType.valueOf(str);
+			JSONObject etr = defaults.getJSONObject(str);
+			LaunchTemplate launchTemplateBase = templateFileLoader.get(etr.getString("conf"));
+			String optsFileName = etr.optString("opts", null);
+			String eagOpts = optsFileName != null ? optsFileLoader.get(optsFileName) : null;
+			formatDefaultOptsMap.put(fmt, launchTemplateBase.mutateOpts(eagOpts));
+		}
+		JSONArray templates = jsonObject.getJSONArray("templates");
+		for(int i = 0, l = templates.length(); i < l; ++i) {
+			JSONObject obj = templates.getJSONObject(i);
+			LaunchTemplate launchTemplateBase = templateFileLoader.get(obj.getString("conf"));
+			String optsFileName = obj.optString("opts", null);
+			String eagOpts = optsFileName != null ? optsFileLoader.get(optsFileName) : null;
+			JSONArray allowList = obj.getJSONArray("allow");
+			Set<EnumClientFormatType> toAllow = new HashSet<>(allowList.length());
+			for(int j = 0, m = allowList.length(); j < m; ++j) {
+				toAllow.add(EnumClientFormatType.valueOf(allowList.getString(j)));
+			}
+			JSONArray parseTypesList = obj.getJSONArray("parseTypes");
+			Set<EnumOfflineParseType> toParseTypes = new HashSet<>(parseTypesList.length());
+			for(int j = 0, m = parseTypesList.length(); j < m; ++j) {
+				toParseTypes.add(EnumOfflineParseType.valueOf(parseTypesList.getString(j)));
+			}
+			defaultLaunchTemplates.add(new DefaultLaunchTemplate(obj.getString("name"), toAllow, toParseTypes, launchTemplateBase.mutateOpts(eagOpts)));
+		}
+	}
+
+	public List<DefaultLaunchTemplate> getTemplatesForClientData(EnumClientFormatType formatType) {
+		List<DefaultLaunchTemplate> ret = new ArrayList<>();
+		for(DefaultLaunchTemplate template : defaultLaunchTemplates) {
+			if(template.supportedFormats.contains(formatType)) {
+				ret.add(template);
+			}
+		}
+		return ret;
+	}
+
+	public List<DefaultLaunchTemplate> getTemplatesForParseType(EnumOfflineParseType parseType) {
+		List<DefaultLaunchTemplate> ret = new ArrayList<>();
+		for(DefaultLaunchTemplate template : defaultLaunchTemplates) {
+			if(template.parseTypes.contains(parseType)) {
+				ret.add(template);
+			}
+		}
+		return ret;
+	}
+
+	protected String loadDataFileString(String name) {
+		byte[] data = BootMenuAssets.loadResourceBytes(basePath + name);
+		if(data == null) {
+			throw new RuntimeException("Missing metadata file: " + name);
+		}
+		return new String(data, StandardCharsets.UTF_8);
+	}
+
+	protected LaunchTemplate loadDataFileLaunchTemplate(String name) {
+		return new LaunchTemplate(new JSONObject(loadDataFileString(name)));
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootableClientEntry.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootableClientEntry.java
new file mode 100755
index 0000000..2dbffe4
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootableClientEntry.java
@@ -0,0 +1,366 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.BootMenuEntryPoint.UnsignedClientEPKLoader;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class BootableClientEntry {
+
+	public static enum EnumDataType {
+		SITE_ORIGIN, EMBEDDED, LOCAL_STORAGE;
+	}
+
+	public static interface BootAdapter {
+		String getDisplayName();
+		void bootClient(IProgressMsgCallback cb);
+		void downloadOffline(IProgressMsgCallback cb);
+		void downloadEPK(IProgressMsgCallback cb);
+		ClientDataEntry getClientDataEntry();
+		LaunchConfigEntry getLaunchConfigEntry();
+		Map<EaglercraftUUID,Supplier<byte[]>> getBlobLoaders();
+	}
+
+	public final EnumDataType dataType;
+	public final BootAdapter bootAdapter;
+
+	public BootableClientEntry(EnumDataType dataType, BootAdapter bootAdapter) {
+		this.dataType = dataType;
+		this.bootAdapter = bootAdapter;
+	}
+
+	public static BootableClientEntry getOriginClient() {
+		final ClientDataEntry originClientDat;
+		final LaunchConfigEntry originLaunchDat;
+		final Map<EaglercraftUUID, Supplier<byte[]>> siteOriginLoader = new HashMap<>(2);
+		if(BootMenuEntryPoint.isSignedClient()) {
+			siteOriginLoader.put(BootMenuConstants.UUID_ORIGIN_SIGNED_SIGNATURE, BootMenuEntryPoint::getSignedClientSignature);
+			siteOriginLoader.put(BootMenuConstants.UUID_ORIGIN_SIGNED_BUNDLE, BootMenuEntryPoint::getSignedClientBundle);
+			originClientDat = new ClientDataEntry(EnumClientFormatType.EAGLER_SIGNED_OFFLINE,
+					BootMenuConstants.UUID_CLIENT_DATA_ORIGIN, BootMenuConstants.UUID_ORIGIN_SIGNED_BUNDLE, null,
+					BootMenuConstants.UUID_ORIGIN_SIGNED_SIGNATURE, null);
+			originLaunchDat = new LaunchConfigEntry(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN,
+					BootMenuConstants.UUID_CLIENT_DATA_ORIGIN,
+					BootMenuConstants.client_projectForkName + " " + BootMenuConstants.client_projectOriginRevision
+							+ " " + BootMenuConstants.client_projectOriginVersion,
+					EnumClientLaunchType.EAGLERX_SIGNED_V1, null, null, null, null, null,
+					BootMenuEntryPoint.getOriginLaunchOpts(), false);
+		}else {
+			siteOriginLoader.put(BootMenuConstants.UUID_ORIGIN_UNSIGNED_CLASSES_JS, BootMenuEntryPoint::getUnsignedClientClassesJS);
+			UnsignedClientEPKLoader loader = BootMenuEntryPoint.getUnsignedClientAssetsEPK();
+			siteOriginLoader.putAll(loader.loaders);
+			originClientDat = new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_OFFLINE,
+					BootMenuConstants.UUID_CLIENT_DATA_ORIGIN, BootMenuConstants.UUID_ORIGIN_UNSIGNED_CLASSES_JS, null,
+					null, loader.list);
+			originLaunchDat = new LaunchConfigEntry(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN,
+						BootMenuConstants.UUID_CLIENT_DATA_ORIGIN,
+						BootMenuConstants.client_projectForkName + " " + BootMenuConstants.client_projectOriginRevision
+								+ " " + BootMenuConstants.client_projectOriginVersion,
+						EnumClientLaunchType.EAGLERX_V1, null, null, null, null, null,
+						BootMenuEntryPoint.getOriginLaunchOpts(), false);
+		}
+		return new BootableClientEntry(EnumDataType.SITE_ORIGIN, new BootAdapter() {
+
+			private final String displayName = BootMenuConstants.client_projectForkName + " " + BootMenuConstants.client_projectOriginRevision + " "
+					+ BootMenuConstants.client_projectOriginVersion + " (site origin)";
+
+			@Override
+			public String getDisplayName() {
+				return displayName;
+			}
+
+			@Override
+			public void bootClient(IProgressMsgCallback cb) {
+				BootMenuMain.continueBootToOriginClient(BootMenuMain::sanitizeEaglercraftXOpts);
+			}
+
+			@Override
+			public void downloadOffline(IProgressMsgCallback cb) {
+				OfflineDownloadFactory.downloadOffline(originLaunchDat, originClientDat, siteOriginLoader, cb);
+			}
+
+			@Override
+			public void downloadEPK(IProgressMsgCallback cb) {
+				EPKClientFactory.downloadEPKClient(originLaunchDat, originClientDat, siteOriginLoader, cb);
+			}
+
+			@Override
+			public ClientDataEntry getClientDataEntry() {
+				return originClientDat;
+			}
+
+			@Override
+			public LaunchConfigEntry getLaunchConfigEntry() {
+				return originLaunchDat;
+			}
+
+			@Override
+			public Map<EaglercraftUUID, Supplier<byte[]>> getBlobLoaders() {
+				return siteOriginLoader;
+			}
+
+		});
+	}
+
+	public static List<BootableClientEntry> enumerateBootableClients() {
+		List<BootableClientEntry> ret = new ArrayList<>(16);
+		final Map<EaglercraftUUID, Supplier<byte[]>> siteOriginLoader = new HashMap<>(2);
+		final ClientDataEntry originClientDat;
+		final LaunchConfigEntry originLaunchDat;
+		if(BootMenuEntryPoint.isSignedClient()) {
+			siteOriginLoader.put(BootMenuConstants.UUID_ORIGIN_SIGNED_SIGNATURE, BootMenuEntryPoint::getSignedClientSignature);
+			siteOriginLoader.put(BootMenuConstants.UUID_ORIGIN_SIGNED_BUNDLE, BootMenuEntryPoint::getSignedClientBundle);
+			originClientDat = new ClientDataEntry(EnumClientFormatType.EAGLER_SIGNED_OFFLINE,
+					BootMenuConstants.UUID_CLIENT_DATA_ORIGIN, BootMenuConstants.UUID_ORIGIN_SIGNED_BUNDLE, null,
+					BootMenuConstants.UUID_ORIGIN_SIGNED_SIGNATURE, null);
+			originLaunchDat = new LaunchConfigEntry(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN,
+					BootMenuConstants.UUID_CLIENT_DATA_ORIGIN,
+					BootMenuConstants.client_projectForkName + " " + BootMenuConstants.client_projectOriginRevision
+							+ " " + BootMenuConstants.client_projectOriginVersion,
+					EnumClientLaunchType.EAGLERX_SIGNED_V1, null, null, null, null, null,
+					BootMenuEntryPoint.getOriginLaunchOpts(), false);
+		}else {
+			siteOriginLoader.put(BootMenuConstants.UUID_ORIGIN_UNSIGNED_CLASSES_JS, BootMenuEntryPoint::getUnsignedClientClassesJS);
+			UnsignedClientEPKLoader loader = BootMenuEntryPoint.getUnsignedClientAssetsEPK();
+			siteOriginLoader.putAll(loader.loaders);
+			originClientDat = new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_OFFLINE,
+					BootMenuConstants.UUID_CLIENT_DATA_ORIGIN, BootMenuConstants.UUID_ORIGIN_UNSIGNED_CLASSES_JS, null,
+					null, loader.list);
+			originLaunchDat = new LaunchConfigEntry(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN,
+						BootMenuConstants.UUID_CLIENT_DATA_ORIGIN,
+						BootMenuConstants.client_projectForkName + " " + BootMenuConstants.client_projectOriginRevision
+								+ " " + BootMenuConstants.client_projectOriginVersion,
+						EnumClientLaunchType.EAGLERX_V1, null, null, null, null, null,
+						BootMenuEntryPoint.getOriginLaunchOpts(), false);
+		}
+		ret.add(new BootableClientEntry(EnumDataType.SITE_ORIGIN, new BootAdapter() {
+
+			private final String displayName = BootMenuConstants.client_projectForkName + " " + BootMenuConstants.client_projectOriginRevision + " "
+					+ BootMenuConstants.client_projectOriginVersion + " (site origin)";
+
+			@Override
+			public String getDisplayName() {
+				return displayName;
+			}
+
+			@Override
+			public void bootClient(IProgressMsgCallback cb) {
+				BootMenuMain.continueBootToOriginClient(BootMenuMain::sanitizeEaglercraftXOpts);
+			}
+
+			@Override
+			public void downloadOffline(IProgressMsgCallback cb) {
+				OfflineDownloadFactory.downloadOffline(originLaunchDat, originClientDat, siteOriginLoader, cb);
+			}
+
+			@Override
+			public void downloadEPK(IProgressMsgCallback cb) {
+				EPKClientFactory.downloadEPKClient(originLaunchDat, originClientDat, siteOriginLoader, cb);
+			}
+
+			@Override
+			public ClientDataEntry getClientDataEntry() {
+				return originClientDat;
+			}
+
+			@Override
+			public LaunchConfigEntry getLaunchConfigEntry() {
+				return originLaunchDat;
+			}
+
+			@Override
+			public Map<EaglercraftUUID, Supplier<byte[]>> getBlobLoaders() {
+				return siteOriginLoader;
+			}
+
+		}));
+		for(final LaunchConfigEntry etr : BootMenuMain.bootMenuFatOfflineLoader.launchDatas) {
+			final ClientDataEntry etr2 = BootMenuConstants.UUID_CLIENT_DATA_ORIGIN.equals(etr.clientDataUUID)
+					? originClientDat
+					: BootMenuMain.bootMenuFatOfflineLoader.clientDatas.get(etr.clientDataUUID);
+			if(etr2 != null) {
+				Collection<EaglercraftUUID> refBlobs = etr2.getReferencedBlobs();
+				final Map<EaglercraftUUID, Supplier<byte[]>> loaderMap = new HashMap<>(2);
+				for(final EaglercraftUUID uuid : refBlobs) {
+					loaderMap.put(uuid, () -> {
+						Supplier<byte[]> sup = siteOriginLoader.get(uuid);
+						if(sup != null) {
+							byte[] ret2 = sup.get();
+							if(ret2 != null) {
+								return ret2;
+							}
+						}
+						return BootMenuMain.bootMenuFatOfflineLoader.loadDataBinary(uuid.toString());
+					});
+				}
+				ret.add(new BootableClientEntry(EnumDataType.EMBEDDED, new BootAdapter() {
+
+					private final String displayName = etr.displayName + " (embedded"
+							+ (etr.type == EnumClientLaunchType.EAGLERX_SIGNED_V1 ? ", signed)" : ")");
+
+					@Override
+					public String getDisplayName() {
+						return displayName;
+					}
+
+					@Override
+					public void bootClient(IProgressMsgCallback cb) {
+						ClientBootFactory.bootClient(etr, etr2, loaderMap, cb);
+					}
+
+					@Override
+					public void downloadOffline(IProgressMsgCallback cb) {
+						OfflineDownloadFactory.downloadOffline(etr, etr2, loaderMap, cb);
+					}
+
+					@Override
+					public void downloadEPK(IProgressMsgCallback cb) {
+						EPKClientFactory.downloadEPKClient(etr, etr2, loaderMap, cb);
+					}
+
+					@Override
+					public ClientDataEntry getClientDataEntry() {
+						return etr2;
+					}
+
+					@Override
+					public LaunchConfigEntry getLaunchConfigEntry() {
+						return etr;
+					}
+
+					@Override
+					public Map<EaglercraftUUID, Supplier<byte[]>> getBlobLoaders() {
+						return loaderMap;
+					}
+
+				}));
+			}
+		}
+		for(EaglercraftUUID etrUUID : BootMenuMain.bootMenuDataManager.launchDatasList) {
+			final LaunchConfigEntry etr = BootMenuMain.bootMenuDataManager.launchDatas.get(etrUUID);
+			if(etr != null) {
+				final ClientDataEntry etr2 = BootMenuConstants.UUID_CLIENT_DATA_ORIGIN.equals(etr.clientDataUUID)
+						? originClientDat
+						: BootMenuMain.bootMenuDataManager.clientDatas.get(etr.clientDataUUID);
+				if(etr2 != null) {
+					Collection<EaglercraftUUID> refBlobs = etr2.getReferencedBlobs();
+					final Map<EaglercraftUUID, Supplier<byte[]>> loaderMap = new HashMap<>(2);
+					for(final EaglercraftUUID uuid : refBlobs) {
+						loaderMap.put(uuid, () -> {
+							Supplier<byte[]> sup = siteOriginLoader.get(uuid);
+							if(sup != null) {
+								byte[] ret2 = sup.get();
+								if(ret2 != null) {
+									return ret2;
+								}
+							}
+							return BootMenuMain.bootMenuDatastore.getItem("blobs/" + uuid);
+						});
+					}
+					ret.add(new BootableClientEntry(EnumDataType.LOCAL_STORAGE, new BootAdapter() {
+
+						private final String displayName = etr.displayName + " (local storage"
+								+ (etr.type == EnumClientLaunchType.EAGLERX_SIGNED_V1 ? ", signed)" : ")");
+
+						@Override
+						public String getDisplayName() {
+							return displayName;
+						}
+
+						@Override
+						public void bootClient(IProgressMsgCallback cb) {
+							ClientBootFactory.bootClient(etr, etr2, loaderMap, cb);
+						}
+
+						@Override
+						public void downloadOffline(IProgressMsgCallback cb) {
+							OfflineDownloadFactory.downloadOffline(etr, etr2, loaderMap, cb);
+						}
+
+						@Override
+						public void downloadEPK(IProgressMsgCallback cb) {
+							EPKClientFactory.downloadEPKClient(etr, etr2, loaderMap, cb);
+						}
+
+						@Override
+						public ClientDataEntry getClientDataEntry() {
+							return etr2;
+						}
+
+						@Override
+						public LaunchConfigEntry getLaunchConfigEntry() {
+							return etr;
+						}
+
+						@Override
+						public Map<EaglercraftUUID, Supplier<byte[]>> getBlobLoaders() {
+							return loaderMap;
+						}
+
+					}));
+				}
+			}
+		}
+		return ret;
+	}
+
+	/**
+	 * returns true if uuidsList has changed
+	 */
+	public static boolean applyClientOrdering(List<EaglercraftUUID> uuidsList, List<BootableClientEntry> bootableClients) {
+		if(bootableClients.isEmpty()) return false;
+		
+		List<BootableClientEntry> bootableClientsCopy = new ArrayList<>(bootableClients);
+		Set<EaglercraftUUID> uuidsSet = new HashSet<>(uuidsList);
+		Map<EaglercraftUUID,BootableClientEntry> bootableClientsLookup = new HashMap<>(bootableClients.size());
+		bootableClients.clear();
+		
+		for(int i = 0, l = bootableClientsCopy.size(); i < l; ++i) {
+			BootableClientEntry etr = bootableClientsCopy.get(i);
+			bootableClientsLookup.put(etr.bootAdapter.getLaunchConfigEntry().uuid, etr);
+		}
+		
+		for(int i = 0, l = uuidsList.size(); i < l; ++i) {
+			BootableClientEntry etr = bootableClientsLookup.get(uuidsList.get(i));
+			if(etr != null) {
+				bootableClients.add(etr);
+			}
+		}
+		
+		boolean flag = false;
+		for(int i = 0, l = bootableClientsCopy.size(); i < l; ++i) {
+			BootableClientEntry etr = bootableClientsCopy.get(i);
+			EaglercraftUUID uuid = etr.bootAdapter.getLaunchConfigEntry().uuid;
+			if(!uuidsSet.contains(uuid)) {
+				bootableClients.add(etr);
+				uuidsList.add(uuid);
+				flag = true;
+			}
+		}
+		
+		return flag;
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/CheckboxListController.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/CheckboxListController.java
new file mode 100755
index 0000000..7e08f44
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/CheckboxListController.java
@@ -0,0 +1,108 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class CheckboxListController<T extends SelectionListController.ListItem>
+		extends SelectionListController<SelectionListController.ListItem> {
+
+	protected static final SelectionListController.ListItem LIST_ITEM_CANCEL = new SelectionListController.ListItem() {
+		@Override
+		public String getName() {
+			return "Cancel";
+		}
+	};
+
+	protected static final SelectionListController.ListItem LIST_ITEM_DONE = new SelectionListController.ListItem() {
+		@Override
+		public String getName() {
+			return "Done";
+		}
+	};
+
+	protected static class ListItemWrapper implements SelectionListController.ListItem {
+
+		protected final SelectionListController.ListItem parent;
+
+		protected ListItemWrapper(SelectionListController.ListItem parent) {
+			this.parent = parent;
+		}
+
+		@Override
+		public String getName() {
+			return (parent.getAlwaysSelected() ? "[X] " : "[ ] ") + parent.getName();
+		}
+
+		@Override
+		public boolean getAlwaysSelected() {
+			return parent.getAlwaysSelected();
+		}
+
+	}
+
+	public CheckboxListController(HTMLElement parent, List<T> selectionList) {
+		super(parent, Lists.newArrayList(Iterators.concat(Iterators.transform(selectionList.iterator(), ListItemWrapper::new),
+						Arrays.asList(LIST_ITEM_CANCEL, LIST_ITEM_DONE).iterator())));
+	}
+
+	public List<T> getSelectedItems() {
+		return Lists.newArrayList(Collections2.transform(
+				Collections2.filter(selectionEnableList, (e) -> (e.userVal && !e.listItem.getAlwaysSelected())),
+				(e) -> (T) ((ListItemWrapper) e.listItem).parent));
+	}
+
+	protected void itemSelectedLow(ListItemInstance<SelectionListController.ListItem> item) {
+		if(item.listItem == LIST_ITEM_CANCEL) {
+			cancelSelected();
+		}else if(item.listItem == LIST_ITEM_DONE) {
+			doneSelected(getSelectedItems());
+		}else {
+			if(!item.listItem.getAlwaysSelected()) {
+				item.userVal = !item.userVal;
+				item.element.setInnerText((item.userVal ? "[X]" : "[ ]") + item.element.getInnerText().substring(3));
+			}
+		}
+	}
+
+	public void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_SPACE) {
+			if(currentSelected >= 0 && currentSelected < selectionEnableList.size()) {
+				if(!selectionEnableList.get(currentSelected).listItem.getAlwaysSelected()) {
+					fireSelect();
+				}
+			}
+			return;
+		}
+		super.handleKeyDown(keyCode);
+	}
+
+	@Override
+	protected final void itemSelected(SelectionListController.ListItem item) {
+	}
+
+	protected abstract void cancelSelected();
+
+	protected abstract void doneSelected(List<T> selectedItems);
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ClientBootFactory.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ClientBootFactory.java
new file mode 100755
index 0000000..58f4edc
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ClientBootFactory.java
@@ -0,0 +1,725 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Supplier;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.teavm.jso.JSBody;
+import org.teavm.jso.dom.html.HTMLDocument;
+import org.teavm.jso.dom.html.HTMLScriptElement;
+
+import net.lax1dude.eaglercraft.v1_8.Base64;
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMBlobURLHandle;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMBlobURLManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ClientBootFactory {
+
+	private static final Logger logger = LogManager.getLogger("ClientBootFactory");
+
+	private static class UUIDStringPair {
+
+		private final EaglercraftUUID uuid;
+		private final String str;
+
+		private UUIDStringPair(EaglercraftUUID uuid, String str) {
+			this.uuid = uuid;
+			this.str = str;
+		}
+
+		@Override
+		public int hashCode() {
+			return (31 + uuid.hashCode()) * 31 + str.hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || !(obj instanceof UUIDStringPair))
+				return false;
+			UUIDStringPair other = (UUIDStringPair) obj;
+			return Objects.equals(str, other.str) && Objects.equals(uuid, other.uuid);
+		}
+
+	}
+
+	public static void bootClient(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			Map<EaglercraftUUID, Supplier<byte[]>> loaders, IProgressMsgCallback cb) {
+		if(launchConf.clearCookiesBeforeLaunch) {
+			BootMenuEntryPoint.clearCookies();
+		}
+		if(BootMenuConstants.UUID_CLIENT_DATA_ORIGIN.equals(clientData.uuid)) {
+			bootOriginClient(launchConf, clientData, cb);
+			return;
+		}
+		EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCacheA = new EaglerLoadingCache<EaglercraftUUID, byte[]>((uuid) -> {
+			Supplier<byte[]> sup = loaders.get(uuid);
+			return sup != null ? sup.get() : null;
+		});
+		EaglerLoadingCache<UUIDStringPair, TeaVMBlobURLHandle> loadingCacheB = new EaglerLoadingCache<UUIDStringPair, TeaVMBlobURLHandle>((uuidMime) -> {
+			byte[] b = loadingCacheA.get(uuidMime.uuid);
+			return b != null ? TeaVMBlobURLManager.registerNewURLByte(b, uuidMime.str) : null;
+		});
+		switch(launchConf.type) {
+		case STANDARD_OFFLINE_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				bootClientStandardOffline(launchConf, clientData, loadingCacheB, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for STANDARD_OFFLINE_V1!");
+			}
+			break;
+		case EAGLERX_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				bootClientEaglerX18(launchConf, clientData, loadingCacheB, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for EAGLERX_V1!");
+			}
+			break;
+		case EAGLERX_SIGNED_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_SIGNED_OFFLINE) {
+				bootClientEaglerX18Signed(launchConf, clientData, loadingCacheA, loadingCacheB, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for EAGLERX_SIGNED_V1!");
+			}
+			break;
+		case EAGLER_1_5_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				bootClientEagler15Old(launchConf, clientData, loadingCacheB, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for EAGLER_1_5_V1!");
+			}
+			break;
+		case EAGLER_1_5_V2:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_1_5_OFFLINE) {
+				bootClientEagler15New(launchConf, clientData, loadingCacheA, loadingCacheB, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for EAGLER_1_5_V2!");
+			}
+			break;
+		case EAGLER_BETA_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				bootClientEaglerB13(launchConf, clientData, loadingCacheB, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for EAGLER_1_5_V2!");
+			}
+			break;
+		case PEYTON_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				bootClientPeytonIndev(launchConf, clientData, loadingCacheB, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for PEYTON_V1!");
+			}
+			break;
+		case PEYTON_V2:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				bootClientPeytonAlphaBeta(launchConf, clientData, loadingCacheB, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for PEYTON_V2!");
+			}
+			break;
+		}
+	}
+
+	private static void doUpdateMessage(IProgressMsgCallback cb, String str) {
+		logger.info(str);
+		cb.updateMessage(str);
+	}
+
+	@JSBody(params = { "mainName" }, script = "window[mainName] = null;")
+	private static native boolean clearMain(String mainName);
+
+	@JSBody(params = { "mainName" }, script = "return (typeof window[mainName] === \"function\");")
+	private static native boolean isMainReady(String mainName);
+
+	@JSBody(params = { "optsVarName", "optsVarJSON", "mainName", "blockUnsigned" }, script = "setTimeout(function() { window[optsVarName] = JSON.parse(optsVarJSON); if(blockUnsigned) window[optsVarName].bootMenuBlocksUnsignedClients = true; window[mainName](); }, 1);")
+	private static native void callMain(String optsVarName, String optsVarJSON, String mainName, boolean blockUnsigned);
+
+	@JSBody(params = { "clientSigURL", "clientPayloadURL", "launchOptsJSON", "blockUnsigned" }, script = "window.eaglercraftXOptsHints = JSON.parse(launchOptsJSON); if(blockUnsigned) window.eaglercraftXOptsHints.bootMenuBlocksUnsignedClients = true; window.eaglercraftXClientSignature = clientSigURL; window.eaglercraftXClientBundle = clientPayloadURL;")
+	private static native void setupSignedClientOpts(String clientSigURL, String clientPayloadURL, String launchOptsJSON, boolean blockUnsigned);
+
+	@JSBody(params = { "optsVarName", "containerId", "assetsEPKURL", "b64Opts", "joinServer", "mainName", "blockUnsigned" }, script = "setTimeout(function() { window[optsVarName] = [ containerId, assetsEPKURL, b64Opts ]; if(blockUnsigned && (typeof window.eaglercraftXOpts === \"object\")) window.eaglercraftXOpts.bootMenuBlocksUnsignedClients = true; if(joinServer.length > 0) window[optsVarName].push(joinServer); window[mainName](); }, 1);")
+	private static native void callMainOld15(String optsVarName, String containerId, String assetsEPKURL, String b64Opts, String joinServer, String mainName, boolean blockUnsigned);
+
+	@JSBody(params = { "optsVarName", "containerId", "assetsEPKURL", "joinServer", "mainName", "blockUnsigned" }, script = "setTimeout(function() { window[optsVarName] = [ containerId, assetsEPKURL ]; if(blockUnsigned && (typeof window.eaglercraftXOpts === \"object\")) window.eaglercraftXOpts.bootMenuBlocksUnsignedClients = true; if(joinServer.length > 0) window[optsVarName].push(joinServer); window[mainName](); }, 1);")
+	private static native void callMainOldB13(String optsVarName, String containerId, String assetsEPKURL, String joinServer, String mainName, boolean blockUnsigned);
+
+	@JSBody(params = { "optsVarName", "optsVarJSON", "blockUnsigned" }, script = "window[optsVarName] = JSON.parse(optsVarJSON); if(blockUnsigned) window[optsVarName].bootMenuBlocksUnsignedClients = true;")
+	private static native void setJSONOpts(String optsVarName, String optsVarJSON, boolean blockUnsigned);
+
+	private static void bootOriginClient(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			IProgressMsgCallback cb) {
+		doUpdateMessage(cb, "Preparing launch opts...");
+		JSONObject launchOpts = new JSONObject(launchConf.launchOpts);
+		launchOpts.put("container", BootMenuEntryPoint.getOriginContainer());
+		launchOpts.put("assetsURI", BootMenuEntryPoint.getUnsignedClientAssetsEPKRaw());
+		final String launchOptsStr = RelayRandomizeHelper.replaceRelayMacroWithConstant(launchOpts.toString());
+		BootMenuMain.continueBootToOriginClient(() -> {
+			setJSONOpts("eaglercraftXOpts", launchOptsStr, IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients());
+		});
+	}
+
+	private static void bootClientEaglerX18(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<UUIDStringPair, TeaVMBlobURLHandle> loadingCache, IProgressMsgCallback cb) {
+		boolean blockUnsigned = IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients();
+		if(blockUnsigned) {
+			throw new UnsignedBootException();
+		}
+		JSONObject launchOpts = new JSONObject(launchConf.launchOpts);
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		TeaVMBlobURLHandle classesJSURL = loadingCache.get(new UUIDStringPair(clientData.mainPayload, "text/javascript"));
+		List<TeaVMBlobURLHandle> toCleanOnException = new ArrayList<>();
+		if(classesJSURL == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(classesJSURL);
+		JSONArray epkFiles = new JSONArray();
+		for(EPKDataEntry etr : clientData.epkFiles) {
+			doUpdateMessage(cb, "Resolving assets.epk (" + etr.dataUUID + ", path: /" + etr.extractTo + ")");
+			TeaVMBlobURLHandle epkURL = loadingCache.get(new UUIDStringPair(etr.dataUUID, "application/octet-stream"));
+			if(epkURL == null) {
+				for(TeaVMBlobURLHandle url : toCleanOnException) {
+					try {
+						TeaVMBlobURLManager.releaseURL(url);
+					}catch(Throwable t) {
+					}
+				}
+				String msg = "Could not resolve assets.epk! (" + etr.dataUUID + ", path: /" + etr.extractTo + ")";
+				logger.error(msg);
+				throw new NullPointerException(msg);
+			}
+			toCleanOnException.add(epkURL);
+			JSONObject epkEntry = new JSONObject();
+			epkEntry.put("url", epkURL.toExternalForm());
+			epkEntry.put("path", etr.extractTo);
+			epkFiles.put(epkEntry);
+		}
+		launchOpts.put("assetsURI", epkFiles);
+		doUpdateMessage(cb, "Launching client...");
+		BootMenuMain.runLaterMS(() -> {
+			clearMain("main");
+			HTMLDocument docTemp = BootMenuMain.doc;
+			launchOpts.put("container", BootMenuMain.createRootElementForClient());
+			final String launchOptsStr = RelayRandomizeHelper.replaceRelayMacroWithConstant(launchOpts.toString());
+			HTMLScriptElement scriptElement = (HTMLScriptElement)docTemp.createElement("script");
+			scriptElement.addEventListener("load", (evt) -> {
+				BootMenuMain.runLater(() -> {
+					while(!isMainReady("main")) {
+						logger.error("main function is not available yet! waiting 250ms...");
+						EagUtils.sleep(250l);
+					}
+					BootMenuMain.stopEventLoop();
+					callMain("eaglercraftXOpts", launchOptsStr, "main", blockUnsigned);
+				});
+			});
+			scriptElement.setType("text/javascript");
+			scriptElement.setSrc(classesJSURL.toExternalForm());
+			docTemp.getHead().appendChild(scriptElement);
+		}, 250);
+	}
+
+	private static void bootClientEaglerX18Signed(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCacheBytes,
+			EaglerLoadingCache<UUIDStringPair, TeaVMBlobURLHandle> loadingCache, IProgressMsgCallback cb) {
+		JSONObject launchOpts = new JSONObject(launchConf.launchOpts);
+		if(!launchOpts.has("hintsVersion")) {
+			launchOpts.put("hintsVersion", 1);
+		}
+		doUpdateMessage(cb, "Resolving client signature (" + clientData.clientSignature + ")");
+		byte[] clientSigBytes = loadingCacheBytes.get(clientData.clientSignature);
+		final TeaVMBlobURLHandle clientSigURL = loadingCache.get(new UUIDStringPair(clientData.clientSignature, "application/octet-stream"));
+		List<TeaVMBlobURLHandle> toCleanOnException = new ArrayList<>();
+		if(clientSigURL == null) {
+			clientSigBytes = null;
+			String msg = "Could not resolve client signature! (" + clientData.clientSignature + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(clientSigURL);
+		doUpdateMessage(cb, "Resolving client payload (" + clientData.mainPayload + ")");
+		byte[] clientPayloadBytes = loadingCacheBytes.get(clientData.mainPayload);
+		final TeaVMBlobURLHandle clientPayloadURL = loadingCache.get(new UUIDStringPair(clientData.mainPayload, "application/octet-stream"));
+		if(clientPayloadURL == null) {
+			clientSigBytes = null;
+			clientPayloadBytes = null;
+			for(TeaVMBlobURLHandle url : toCleanOnException) {
+				try {
+					TeaVMBlobURLManager.releaseURL(url);
+				}catch(Throwable t) {
+				}
+			}
+			String msg = "Could not resolve client payload! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(clientPayloadURL);
+		boolean blockUnsigned = IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients();
+		if(blockUnsigned) {
+			doUpdateMessage(cb, "Verifying signature...");
+			boolean valid = SignatureCheckHelper.checkSignatureValid(clientSigBytes, clientPayloadBytes);
+			if(!valid) {
+				for(TeaVMBlobURLHandle url : toCleanOnException) {
+					try {
+						TeaVMBlobURLManager.releaseURL(url);
+					}catch(Throwable t) {
+					}
+				}
+				throw new UnsignedBootException();
+			}
+		}
+		doUpdateMessage(cb, "Decompressing payload...");
+		EaglerOutputStream bao = new EaglerOutputStream(0x1000000);
+		try(InputStream is = EaglerZLIB.newGZIPInputStream(new EaglerInputStream(clientPayloadBytes))) {
+			byte[] copybuffer = new byte[16384];
+			int i;
+			while((i = is.read(copybuffer)) != -1) {
+				bao.write(copybuffer, 0, i);
+			}
+		}catch(IOException ex) {
+			clientSigBytes = null;
+			clientPayloadBytes = null;
+			for(TeaVMBlobURLHandle url : toCleanOnException) {
+				try {
+					TeaVMBlobURLManager.releaseURL(url);
+				}catch(Throwable t) {
+				}
+			}
+			throw new IllegalArgumentException("Could not decompress signed client payload!");
+		}
+		byte[] decompressed = bao.toByteArray();
+		bao = null;
+		clientSigBytes = null;
+		clientPayloadBytes = null;
+		final TeaVMBlobURLHandle clientPayloadURLDecompress = TeaVMBlobURLManager.registerNewURLByte(decompressed, "text/javascript");
+		toCleanOnException.add(clientPayloadURLDecompress);
+		doUpdateMessage(cb, "Launching client...");
+		BootMenuMain.runLaterMS(() -> {
+			HTMLDocument docTemp = BootMenuMain.doc;
+			launchOpts.put("container", BootMenuMain.createRootElementForClient());
+			final String launchOptsStr = RelayRandomizeHelper.replaceRelayMacroWithConstant(launchOpts.toString());
+			setupSignedClientOpts(clientSigURL.toExternalForm(), clientPayloadURL.toExternalForm(), launchOptsStr, blockUnsigned);
+			HTMLScriptElement scriptElement = (HTMLScriptElement)docTemp.createElement("script");
+			scriptElement.setType("text/javascript");
+			scriptElement.setSrc(clientPayloadURLDecompress.toExternalForm());
+			docTemp.getHead().appendChild(scriptElement);
+			BootMenuMain.stopEventLoop();
+		}, 250);
+	}
+
+	private static void bootClientEagler15New(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCacheBytes,
+			EaglerLoadingCache<UUIDStringPair, TeaVMBlobURLHandle> loadingCache, IProgressMsgCallback cb) {
+		boolean blockUnsigned = IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients();
+		if(blockUnsigned) {
+			throw new UnsignedBootException();
+		}
+		if(clientData.epkFiles.size() != 1) {
+			throw new UnsupportedOperationException("Wrong number of EPK files: " + clientData.epkFiles.size());
+		}
+		JSONObject launchOpts = new JSONObject(launchConf.launchOpts);
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		TeaVMBlobURLHandle classesJSURL = loadingCache.get(new UUIDStringPair(clientData.mainPayload, "text/javascript"));
+		List<TeaVMBlobURLHandle> toCleanOnException = new ArrayList<>();
+		if(classesJSURL == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(classesJSURL);
+		doUpdateMessage(cb, "Resolving classes_server.js (" + clientData.integratedServer + ")");
+		byte[] classesServerJS = loadingCacheBytes.get(clientData.integratedServer);
+		if(classesServerJS == null) {
+			for(TeaVMBlobURLHandle url : toCleanOnException) {
+				try {
+					TeaVMBlobURLManager.releaseURL(url);
+				}catch(Throwable t) {
+				}
+			}
+			String msg = "Could not resolve classes_server.js! (" + clientData.integratedServer + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		classesServerJS = OfflineDownloadFactory.removeUseStrict(classesServerJS);
+		byte[] appendToClassesServerJS = "\"use strict\";var eaglercraftServerOpts;onmessage = function(o) { eaglercraftServerOpts = o.data; main(); };".getBytes(StandardCharsets.UTF_8);
+		byte[] concatClassesServerJS = new byte[classesServerJS.length + appendToClassesServerJS.length];
+		System.arraycopy(appendToClassesServerJS, 0, concatClassesServerJS, 0, appendToClassesServerJS.length);
+		System.arraycopy(classesServerJS, 0, concatClassesServerJS, appendToClassesServerJS.length, classesServerJS.length);
+		TeaVMBlobURLHandle classesServerJSURL = TeaVMBlobURLManager.registerNewURLByte(concatClassesServerJS, "text/javascript");
+		toCleanOnException.add(classesServerJSURL);
+		launchOpts.put("serverWorkerURI", classesServerJSURL);
+		doUpdateMessage(cb, "Resolving assets.epk (" + clientData.epkFiles.get(0).dataUUID + ")");
+		TeaVMBlobURLHandle assetsEPKURL = loadingCache.get(new UUIDStringPair(clientData.epkFiles.get(0).dataUUID, "application/octet-stream"));
+		if(assetsEPKURL == null) {
+			for(TeaVMBlobURLHandle url : toCleanOnException) {
+				try {
+					TeaVMBlobURLManager.releaseURL(url);
+				}catch(Throwable t) {
+				}
+			}
+			String msg = "Could not resolve assets.epk! (" + clientData.epkFiles.get(0).dataUUID + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(assetsEPKURL);
+		launchOpts.put("assetsURI", assetsEPKURL.toExternalForm());
+		doUpdateMessage(cb, "Launching client...");
+		BootMenuMain.runLaterMS(() -> {
+			clearMain("main");
+			HTMLDocument docTemp = BootMenuMain.doc;
+			launchOpts.put("container", BootMenuMain.createRootElementForClient());
+			final String launchOptsStr = RelayRandomizeHelper.replaceRelayMacroWithConstant(launchOpts.toString());
+			HTMLScriptElement scriptElement = (HTMLScriptElement)docTemp.createElement("script");
+			scriptElement.addEventListener("load", (evt) -> {
+				BootMenuMain.runLater(() -> {
+					while(!isMainReady("main")) {
+						logger.error("main function is not available yet! waiting 250ms...");
+						EagUtils.sleep(250l);
+					}
+					BootMenuMain.stopEventLoop();
+					callMain("eaglercraftOpts", launchOptsStr, "main", blockUnsigned);
+				});
+			});
+			scriptElement.setType("text/javascript");
+			scriptElement.setSrc(classesJSURL.toExternalForm());
+			docTemp.getHead().appendChild(scriptElement);
+		}, 250);
+	}
+
+	private static void bootClientEagler15Old(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<UUIDStringPair, TeaVMBlobURLHandle> loadingCache, IProgressMsgCallback cb) {
+		boolean blockUnsigned = IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients();
+		if(blockUnsigned) {
+			throw new UnsignedBootException();
+		}
+		final String b64Opts = translateNBTOpts(launchConf.launchOpts);
+		if(clientData.epkFiles.size() != 1) {
+			throw new UnsupportedOperationException("Wrong number of EPK files: " + clientData.epkFiles.size());
+		}
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		final TeaVMBlobURLHandle classesJSURL = loadingCache.get(new UUIDStringPair(clientData.mainPayload, "text/javascript"));
+		List<TeaVMBlobURLHandle> toCleanOnException = new ArrayList<>();
+		if(classesJSURL == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(classesJSURL);
+		doUpdateMessage(cb, "Resolving assets.epk (" + clientData.epkFiles.get(0) + ")");
+		final TeaVMBlobURLHandle assetsEPKURL = loadingCache.get(new UUIDStringPair(clientData.epkFiles.get(0).dataUUID, "application/octet-stream"));
+		if(assetsEPKURL == null) {
+			for(TeaVMBlobURLHandle url : toCleanOnException) {
+				try {
+					TeaVMBlobURLManager.releaseURL(url);
+				}catch(Throwable t) {
+				}
+			}
+			String msg = "Could not resolve assets.epk! (" + clientData.epkFiles.get(0).dataUUID + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(assetsEPKURL);
+		doUpdateMessage(cb, "Launching client...");
+		BootMenuMain.runLaterMS(() -> {
+			clearMain("main");
+			HTMLDocument docTemp = BootMenuMain.doc;
+			final String container = BootMenuMain.createRootElementForClient();
+			HTMLScriptElement scriptElement = (HTMLScriptElement)docTemp.createElement("script");
+			scriptElement.addEventListener("load", (evt) -> {
+				BootMenuMain.runLater(() -> {
+					while(!isMainReady("main")) {
+						logger.error("main function is not available yet! waiting 250ms...");
+						EagUtils.sleep(250l);
+					}
+					BootMenuMain.stopEventLoop();
+					callMainOld15("minecraftOpts", container, assetsEPKURL.toExternalForm(), b64Opts, launchConf.joinServer, "main", blockUnsigned);
+				});
+			});
+			scriptElement.setType("text/javascript");
+			scriptElement.setSrc(classesJSURL.toExternalForm());
+			docTemp.getHead().appendChild(scriptElement);
+		}, 250);
+	}
+
+	static String translateNBTOpts(String opts) {
+		opts = opts.trim();
+		if(!opts.startsWith("[NBT]") || !opts.endsWith("[/NBT]")) {
+			throw new IllegalArgumentException("Eaglercraft opts are not in NBT format!");
+		}
+		NBTTagCompound readTag;
+		try {
+			readTag = JsonToNBT.getTagFromJson(opts.substring(5, opts.length() - 6).trim());
+		} catch (NBTException e) {
+			throw new IllegalArgumentException("Eaglercraft opts are invalid: " + e.getMessage());
+		}
+		EaglerOutputStream bao = new EaglerOutputStream(256);
+		try {
+			CompressedStreamTools.write(readTag, new DataOutputStream(bao));
+		} catch (IOException e) {
+			throw new RuntimeException("Could not write NBT tag compound!");
+		}
+		return Base64.encodeBase64String(bao.toByteArray());
+	}
+
+	private static void bootClientEaglerB13(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<UUIDStringPair, TeaVMBlobURLHandle> loadingCache, IProgressMsgCallback cb) {
+		boolean blockUnsigned = IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients();
+		if(blockUnsigned) {
+			throw new UnsignedBootException();
+		}
+		if(clientData.epkFiles.size() != 1) {
+			throw new UnsupportedOperationException("Wrong number of EPK files: " + clientData.epkFiles.size());
+		}
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		final TeaVMBlobURLHandle classesJSURL = loadingCache.get(new UUIDStringPair(clientData.mainPayload, "text/javascript"));
+		List<TeaVMBlobURLHandle> toCleanOnException = new ArrayList<>();
+		if(classesJSURL == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(classesJSURL);
+		doUpdateMessage(cb, "Resolving assets.epk (" + clientData.epkFiles.get(0) + ")");
+		final TeaVMBlobURLHandle assetsEPKURL = loadingCache.get(new UUIDStringPair(clientData.epkFiles.get(0).dataUUID, "application/octet-stream"));
+		if(assetsEPKURL == null) {
+			for(TeaVMBlobURLHandle url : toCleanOnException) {
+				try {
+					TeaVMBlobURLManager.releaseURL(url);
+				}catch(Throwable t) {
+				}
+			}
+			String msg = "Could not resolve assets.epk! (" + clientData.epkFiles.get(0).dataUUID + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(assetsEPKURL);
+		doUpdateMessage(cb, "Launching client...");
+		BootMenuMain.runLaterMS(() -> {
+			clearMain("main");
+			HTMLDocument docTemp = BootMenuMain.doc;
+			final String container = BootMenuMain.createRootElementForClient();
+			HTMLScriptElement scriptElement = (HTMLScriptElement)docTemp.createElement("script");
+			scriptElement.addEventListener("load", (evt) -> {
+				BootMenuMain.runLater(() -> {
+					while(!isMainReady("main")) {
+						logger.error("main function is not available yet! waiting 250ms...");
+						EagUtils.sleep(250l);
+					}
+					BootMenuMain.stopEventLoop();
+					callMainOldB13("minecraftOpts", container, assetsEPKURL.toExternalForm(), launchConf.joinServer, "main", blockUnsigned);
+				});
+			});
+			scriptElement.setType("text/javascript");
+			scriptElement.setSrc(classesJSURL.toExternalForm());
+			docTemp.getHead().appendChild(scriptElement);
+		}, 250);
+	}
+
+	private static void bootClientPeytonAlphaBeta(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<UUIDStringPair, TeaVMBlobURLHandle> loadingCache, IProgressMsgCallback cb) {
+		boolean blockUnsigned = IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients();
+		if(blockUnsigned) {
+			throw new UnsignedBootException();
+		}
+		if(clientData.epkFiles.size() != 1) {
+			throw new UnsupportedOperationException("Wrong number of EPK files: " + clientData.epkFiles.size());
+		}
+		JSONObject launchOpts = new JSONObject(launchConf.launchOpts);
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		final TeaVMBlobURLHandle classesJSURL = loadingCache.get(new UUIDStringPair(clientData.mainPayload, "text/javascript"));
+		List<TeaVMBlobURLHandle> toCleanOnException = new ArrayList<>();
+		if(classesJSURL == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(classesJSURL);
+		doUpdateMessage(cb, "Resolving assets.epk (" + clientData.epkFiles.get(0) + ")");
+		final TeaVMBlobURLHandle assetsEPKURL = loadingCache.get(new UUIDStringPair(clientData.epkFiles.get(0).dataUUID, "application/octet-stream"));
+		if(assetsEPKURL == null) {
+			for(TeaVMBlobURLHandle url : toCleanOnException) {
+				try {
+					TeaVMBlobURLManager.releaseURL(url);
+				}catch(Throwable t) {
+				}
+			}
+			String msg = "Could not resolve assets.epk! (" + clientData.epkFiles.get(0).dataUUID + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(assetsEPKURL);
+		launchOpts.put("assetsLocation", assetsEPKURL.toExternalForm());
+		doUpdateMessage(cb, "Launching client...");
+		BootMenuMain.runLaterMS(() -> {
+			clearMain("main");
+			HTMLDocument docTemp = BootMenuMain.doc;
+			launchOpts.put("gameContainer", BootMenuMain.createRootElementForClient());
+			final String launchOptsStr = launchOpts.toString();
+			HTMLScriptElement scriptElement = (HTMLScriptElement)docTemp.createElement("script");
+			scriptElement.addEventListener("load", (evt) -> {
+				BootMenuMain.runLater(() -> {
+					while(!isMainReady("main")) {
+						logger.error("main function is not available yet! waiting 250ms...");
+						EagUtils.sleep(250l);
+					}
+					BootMenuMain.stopEventLoop();
+					callMain("config", launchOptsStr, "main", blockUnsigned);
+				});
+			});
+			scriptElement.setType("text/javascript");
+			scriptElement.setSrc(classesJSURL.toExternalForm());
+			docTemp.getHead().appendChild(scriptElement);
+		}, 250);
+	}
+
+	private static void bootClientPeytonIndev(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<UUIDStringPair, TeaVMBlobURLHandle> loadingCache, IProgressMsgCallback cb) {
+		boolean blockUnsigned = IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients();
+		if(blockUnsigned) {
+			throw new UnsignedBootException();
+		}
+		if(clientData.epkFiles.size() != 1) {
+			throw new UnsupportedOperationException("Wrong number of EPK files: " + clientData.epkFiles.size());
+		}
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		final TeaVMBlobURLHandle classesJSURL = loadingCache.get(new UUIDStringPair(clientData.mainPayload, "text/javascript"));
+		List<TeaVMBlobURLHandle> toCleanOnException = new ArrayList<>();
+		if(classesJSURL == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(classesJSURL);
+		doUpdateMessage(cb, "Resolving assets.epk (" + clientData.epkFiles.get(0) + ")");
+		final TeaVMBlobURLHandle assetsEPKURL = loadingCache.get(new UUIDStringPair(clientData.epkFiles.get(0).dataUUID, "application/octet-stream"));
+		if(assetsEPKURL == null) {
+			for(TeaVMBlobURLHandle url : toCleanOnException) {
+				try {
+					TeaVMBlobURLManager.releaseURL(url);
+				}catch(Throwable t) {
+				}
+			}
+			String msg = "Could not resolve assets.epk! (" + clientData.epkFiles.get(0).dataUUID + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(assetsEPKURL);
+		doUpdateMessage(cb, "Launching client...");
+		BootMenuMain.runLaterMS(() -> {
+			clearMain("main");
+			HTMLDocument docTemp = BootMenuMain.doc;
+			final String container = BootMenuMain.createRootElementForClient();
+			HTMLScriptElement scriptElement = (HTMLScriptElement)docTemp.createElement("script");
+			scriptElement.addEventListener("load", (evt) -> {
+				BootMenuMain.runLater(() -> {
+					while(!isMainReady("main")) {
+						logger.error("main function is not available yet! waiting 250ms...");
+						EagUtils.sleep(250l);
+					}
+					BootMenuMain.stopEventLoop();
+					callMainOldB13("classicConfig", container, assetsEPKURL.toExternalForm(), "", "main", blockUnsigned);
+				});
+			});
+			scriptElement.setType("text/javascript");
+			scriptElement.setSrc(classesJSURL.toExternalForm());
+			docTemp.getHead().appendChild(scriptElement);
+		}, 250);
+	}
+
+	private static void bootClientStandardOffline(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<UUIDStringPair, TeaVMBlobURLHandle> loadingCache, IProgressMsgCallback cb) {
+		boolean blockUnsigned = IBootMenuConfigAdapter.instance.isBootMenuBlocksUnsignedClients();
+		if(blockUnsigned) {
+			throw new UnsignedBootException();
+		}
+		JSONObject launchOpts = new JSONObject(launchConf.launchOpts);
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		TeaVMBlobURLHandle classesJSURL = loadingCache.get(new UUIDStringPair(clientData.mainPayload, "text/javascript"));
+		List<TeaVMBlobURLHandle> toCleanOnException = new ArrayList<>();
+		if(classesJSURL == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		toCleanOnException.add(classesJSURL);
+		JSONArray epkFiles = new JSONArray();
+		for(EPKDataEntry etr : clientData.epkFiles) {
+			doUpdateMessage(cb, "Resolving assets.epk (" + etr.dataUUID + ", path: /" + etr.extractTo + ")");
+			TeaVMBlobURLHandle epkURL = loadingCache.get(new UUIDStringPair(etr.dataUUID, "application/octet-stream"));
+			if(epkURL == null) {
+				for(TeaVMBlobURLHandle url : toCleanOnException) {
+					try {
+						TeaVMBlobURLManager.releaseURL(url);
+					}catch(Throwable t) {
+					}
+				}
+				String msg = "Could not resolve assets.epk! (" + etr.dataUUID + ", path: /" + etr.extractTo + ")";
+				logger.error(msg);
+				throw new NullPointerException(msg);
+			}
+			toCleanOnException.add(epkURL);
+			JSONObject epkEntry = new JSONObject();
+			epkEntry.put("url", epkURL.toExternalForm());
+			epkEntry.put("path", etr.extractTo);
+			epkFiles.put(epkEntry);
+		}
+		launchOpts.put(launchConf.launchOptsAssetsURIVar, epkFiles);
+		doUpdateMessage(cb, "Launching client...");
+		BootMenuMain.runLaterMS(() -> {
+			clearMain("main");
+			HTMLDocument docTemp = BootMenuMain.doc;
+			launchOpts.put(launchConf.launchOptsContainerVar, BootMenuMain.createRootElementForClient());
+			final String launchOptsStr = RelayRandomizeHelper.replaceRelayMacroWithConstant(launchOpts.toString());
+			HTMLScriptElement scriptElement = (HTMLScriptElement)docTemp.createElement("script");
+			scriptElement.addEventListener("load", (evt) -> {
+				BootMenuMain.runLater(() -> {
+					while(!isMainReady("main")) {
+						logger.error("main function is not available yet! waiting 250ms...");
+						EagUtils.sleep(250l);
+					}
+					BootMenuMain.stopEventLoop();
+					callMain(launchConf.launchOptsVar, launchOptsStr, launchConf.mainFunction, blockUnsigned);
+				});
+			});
+			scriptElement.setType("text/javascript");
+			scriptElement.setSrc(classesJSURL.toExternalForm());
+			docTemp.getHead().appendChild(scriptElement);
+		}, 250);
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ClientDataEntry.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ClientDataEntry.java
new file mode 100755
index 0000000..6c24a38
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ClientDataEntry.java
@@ -0,0 +1,152 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import com.google.common.collect.Collections2;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ClientDataEntry {
+
+	public final EnumClientFormatType type;
+	public final EaglercraftUUID uuid;
+	public final EaglercraftUUID mainPayload;
+	public final EaglercraftUUID integratedServer;
+	public final EaglercraftUUID clientSignature;
+	public final List<EPKDataEntry> epkFiles;
+
+	public ClientDataEntry(EnumClientFormatType type, EaglercraftUUID uuid, EaglercraftUUID mainPayload,
+			EaglercraftUUID integratedServer, EaglercraftUUID clientSignature, List<EPKDataEntry> epkFiles) {
+		this.type = type;
+		this.uuid = uuid;
+		this.mainPayload = mainPayload;
+		this.integratedServer = integratedServer;
+		this.clientSignature = clientSignature;
+		this.epkFiles = epkFiles;
+	}
+
+	public ClientDataEntry(EaglercraftUUID uuid, JSONObject jsonObject) {
+		this.uuid = uuid;
+		EaglercraftUUID sanityUUID = EaglercraftUUID.fromString(jsonObject.getString("uuid"));
+		if(!sanityUUID.equals(uuid)) {
+			throw new IllegalArgumentException("The file's name UUID does not equal the UUID string found in the file!");
+		}
+		int typeId = jsonObject.getInt("type");
+		type = EnumClientFormatType.getById(typeId);
+		if(type == null) {
+			throw new IllegalArgumentException("Unknown client data type " + typeId + "!");
+		}
+		switch(type) {
+		default:
+		case EAGLER_STANDARD_OFFLINE:
+			mainPayload = EaglercraftUUID.fromString(jsonObject.getString("mainPayload"));
+			integratedServer = null;
+			clientSignature = null;
+			epkFiles = loadEPKFiles(jsonObject.getJSONArray("epkFiles"));
+			break;
+		case EAGLER_STANDARD_1_5_OFFLINE:
+			mainPayload = EaglercraftUUID.fromString(jsonObject.getString("mainPayload"));
+			integratedServer = EaglercraftUUID.fromString(jsonObject.getString("integratedServer"));
+			clientSignature = null;
+			epkFiles = loadEPKFiles(jsonObject.getJSONArray("epkFiles"));
+			break;
+		case EAGLER_SIGNED_OFFLINE:
+			mainPayload = EaglercraftUUID.fromString(jsonObject.getString("mainPayload"));
+			integratedServer = null;
+			clientSignature = EaglercraftUUID.fromString(jsonObject.getString("clientSignature"));
+			epkFiles = null;
+			break;
+		}
+	}
+
+	public void writeJSON(JSONObject jsonObject) {
+		jsonObject.put("uuid", uuid.toString());
+		jsonObject.put("type", type.id);
+		switch(type) {
+		case EAGLER_STANDARD_OFFLINE:
+		default:
+			jsonObject.put("mainPayload", mainPayload.toString());
+			jsonObject.put("epkFiles", storeEPKFiles(epkFiles));
+			break;
+		case EAGLER_STANDARD_1_5_OFFLINE:
+			jsonObject.put("mainPayload", mainPayload.toString());
+			jsonObject.put("integratedServer", integratedServer.toString());
+			jsonObject.put("epkFiles", storeEPKFiles(epkFiles));
+			break;
+		case EAGLER_SIGNED_OFFLINE:
+			jsonObject.put("mainPayload", mainPayload.toString());
+			jsonObject.put("clientSignature", clientSignature.toString());
+			break;
+		}
+	}
+
+	protected static List<EPKDataEntry> loadEPKFiles(JSONArray arr) {
+		int cnt = arr.length();
+		List<EPKDataEntry> ret = new ArrayList<>(cnt);
+		for(int i = 0; i < cnt; ++i) {
+			JSONObject obj = arr.getJSONObject(i);
+			ret.add(new EPKDataEntry(obj.optString("path", ""), EaglercraftUUID.fromString(obj.getString("uuid"))));
+		}
+		return ret;
+	}
+
+	protected static JSONArray storeEPKFiles(List<EPKDataEntry> arr) {
+		int cnt = arr.size();
+		JSONArray ret = new JSONArray(cnt);
+		for(int i = 0; i < cnt; ++i) {
+			EPKDataEntry etr = arr.get(i);
+			JSONObject obj = (new JSONObject()).put("uuid", etr.dataUUID.toString());
+			if(etr.extractTo.length() > 0) {
+				obj.put("path", etr.extractTo);
+			}
+			ret.put(obj);
+		}
+		return ret;
+	}
+
+	public Collection<EaglercraftUUID> getReferencedBlobs() {
+		List<EaglercraftUUID> toRet = new ArrayList<>(4);
+		switch(type) {
+		case EAGLER_STANDARD_OFFLINE:
+		default:
+			toRet.add(mainPayload);
+			toRet.addAll(Collections2.transform(epkFiles, (e) -> e.dataUUID));
+			break;
+		case EAGLER_STANDARD_1_5_OFFLINE:
+			toRet.add(mainPayload);
+			toRet.add(integratedServer);
+			toRet.addAll(Collections2.transform(epkFiles, (e) -> e.dataUUID));
+			break;
+		case EAGLER_SIGNED_OFFLINE:
+			toRet.add(mainPayload);
+			toRet.add(clientSignature);
+			break;
+		}
+		return toRet;
+	}
+
+	public ClientDataEntry rotateUUID(EaglercraftUUID rotatedClientUUID) {
+		return new ClientDataEntry(type, rotatedClientUUID, mainPayload, integratedServer, clientSignature, epkFiles);
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ConfirmationPopupController.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ConfirmationPopupController.java
new file mode 100755
index 0000000..8dd6013
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ConfirmationPopupController.java
@@ -0,0 +1,191 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+import com.google.common.escape.Escaper;
+import com.google.common.html.HtmlEscapers;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class ConfirmationPopupController<T extends ConfirmationPopupController.SelectionOption> {
+
+	public static interface SelectionOption {
+
+		String getName();
+		
+		default boolean getEnabled() {
+			return true;
+		}
+
+	}
+
+	public static class SelectionOptionEnum<E> implements SelectionOption {
+
+		protected final String displayName;
+		protected final boolean enabled;
+		protected final E itemEnum;
+
+		public SelectionOptionEnum(String displayName, boolean enabled, E itemEnum) {
+			this.displayName = displayName;
+			this.enabled = enabled;
+			this.itemEnum = itemEnum;
+		}
+
+		public SelectionOptionEnum(String displayName, E itemEnum) {
+			this.displayName = displayName;
+			this.enabled = true;
+			this.itemEnum = itemEnum;
+		}
+
+		@Override
+		public String getName() {
+			return displayName;
+		}
+
+		@Override
+		public boolean getEnabled() {
+			return enabled;
+		}
+
+		public E getEnum() {
+			return itemEnum;
+		}
+
+	}
+
+	protected static class ConfirmationOptionInstance<E extends ConfirmationPopupController.SelectionOption> {
+		
+		protected final E listItem;
+		protected final HTMLElement element;
+		
+		protected ConfirmationOptionInstance(E listItem, HTMLElement element) {
+			this.listItem = listItem;
+			this.element = element;
+		}
+		
+	}
+
+	protected final HTMLElement parent;
+	protected final List<T> optionList;
+	protected final List<ConfirmationOptionInstance<T>> optionEnableList;
+	protected int currentSelected = -1;
+
+	public ConfirmationPopupController(HTMLElement parent, List<T> optionList) {
+		this.parent = parent;
+		this.optionList = optionList;
+		this.optionEnableList = new ArrayList<>(optionList.size());
+	}
+
+	public void setup() {
+		optionEnableList.clear();
+		parent.setInnerHTML("");
+		StringBuilder htmlBuilder = new StringBuilder();
+		Escaper escaper = HtmlEscapers.htmlEscaper();
+		currentSelected = -1;
+		for(int i = 0, l = optionList.size(); i < l; ++i) {
+			T itm = optionList.get(i);
+			if(i > 0) {
+				htmlBuilder.append(" &emsp; ");
+			}
+			htmlBuilder.append(
+					"<span class=\"_eaglercraftX_boot_menu_popup_confirm_opt _eaglercraftX_boot_menu_popup_confirm_opt"
+							+ i + "\">&nbsp;&lt;&nbsp;");
+			htmlBuilder.append(escaper.escape(itm.getName()));
+			htmlBuilder.append("&nbsp;&gt;&nbsp;</span>");
+		}
+		parent.setInnerHTML(htmlBuilder.toString());
+		for(int i = 0, l = optionList.size(); i < l; ++i) {
+			T itm = optionList.get(i);
+			HTMLElement el = parent.querySelector("._eaglercraftX_boot_menu_popup_confirm_opt" + i);
+			if(el == null) {
+				throw new RuntimeException("Failed to select element from page: ._eaglercraftX_boot_menu_popup_confirm_opt" + i);
+			}
+			if(itm.getEnabled()) {
+				if(currentSelected == -1) {
+					currentSelected = 0;
+					el.getClassList().add(BootMenuConstants.cssClassPrefixBootMenu + "popup_confirm_opt_selected");
+				}
+				final ConfirmationOptionInstance<T> newInstance = new ConfirmationOptionInstance<T>(itm, el);
+				final int ii = optionEnableList.size();
+				el.addEventListener("mouseover", (evt) -> {
+					BootMenuMain.runLater(() -> {
+						setSelected(ii);
+					});
+				});
+				el.addEventListener("click", (evt) -> {
+					BootMenuMain.runLater(() -> {
+						optionSelected(newInstance.listItem);
+					});
+				});
+				optionEnableList.add(newInstance);
+			}else {
+				el.getClassList().add(BootMenuConstants.cssClassPrefixBootMenu + "popup_confirm_opt_disabled");
+			}
+		}
+	}
+
+	public void destroy() {
+		parent.setInnerHTML("");
+		currentSelected = -1;
+		optionEnableList.clear();
+	}
+
+	public void setSelected(int idx) {
+		int listLen = optionEnableList.size();
+		if(listLen == 0) {
+			idx = -1;
+		}else if(idx >= listLen) {
+			idx = listLen - 1;
+		}else if(idx < 0) {
+			idx = 0;
+		}
+		if(idx == currentSelected) {
+			return;
+		}
+		if(currentSelected >= 0 && currentSelected < optionEnableList.size()) {
+			optionEnableList.get(currentSelected).element.getClassList().remove(BootMenuConstants.cssClassPrefixBootMenu + "popup_confirm_opt_selected");
+		}
+		currentSelected = idx;
+		if(idx != -1) {
+			optionEnableList.get(idx).element.getClassList().add(BootMenuConstants.cssClassPrefixBootMenu + "popup_confirm_opt_selected");
+		}
+	}
+
+	public void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ARROW_LEFT) {
+			setSelected(currentSelected - 1);
+		}else if(keyCode == KeyCodes.DOM_KEY_ARROW_RIGHT) {
+			setSelected(currentSelected + 1);
+		}else if(keyCode == KeyCodes.DOM_KEY_ENTER) {
+			if(currentSelected >= 0 && currentSelected < optionEnableList.size()) {
+				optionSelected(optionEnableList.get(currentSelected).listItem);
+			}
+		}
+	}
+
+	public void handleKeyRepeat(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ARROW_LEFT) {
+			setSelected(currentSelected - 1);
+		}else if(keyCode == KeyCodes.DOM_KEY_ARROW_RIGHT) {
+			setSelected(currentSelected + 1);
+		}
+	}
+
+	protected abstract void optionSelected(T item);
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EPKClientFactory.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EPKClientFactory.java
new file mode 100755
index 0000000..7325710
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EPKClientFactory.java
@@ -0,0 +1,100 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Supplier;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.sp.server.export.EPKCompiler;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class EPKClientFactory {
+
+	private static final Logger logger = LogManager.getLogger("EPKClientFactory");
+
+	private static void doUpdateMessage(IProgressMsgCallback cb, String str) {
+		logger.info(str);
+		cb.updateMessage(str);
+	}
+
+	public static void downloadEPKClient(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			Map<EaglercraftUUID, Supplier<byte[]>> loaders, IProgressMsgCallback cb) {
+		doUpdateMessage(cb, "Generating manifest...");
+		EaglercraftUUID randomLaunchUUID = EaglercraftUUID.randomUUID();
+		EaglercraftUUID randomClientUUID = EaglercraftUUID.randomUUID();
+		launchConf = launchConf.rotateUUIDs(randomLaunchUUID, randomClientUUID);
+		clientData = clientData.rotateUUID(randomClientUUID);
+		JSONArray launchDatas = new JSONArray();
+		JSONObject launchObj = new JSONObject();
+		launchConf.writeJSON(launchObj);
+		launchDatas.put(launchObj);
+		JSONArray clientDatas = new JSONArray();
+		JSONObject clientObj = new JSONObject();
+		clientData.writeJSON(clientObj);
+		clientDatas.put(clientObj);
+		JSONObject manifestObj = new JSONObject();
+		manifestObj.put("launchData", launchDatas);
+		manifestObj.put("clientData", clientDatas);
+		byte[] manifestBytes = manifestObj.toString().getBytes(StandardCharsets.UTF_8);
+		Map<String,byte[]> blobs = new HashMap<>();
+		for(EaglercraftUUID uuid : clientData.getReferencedBlobs()) {
+			String name = uuid.toString();
+			doUpdateMessage(cb, "Resolving blobs (" + name + ")");
+			if(!blobs.containsKey(name)) {
+				Supplier<byte[]> loader = loaders.get(uuid);
+				byte[] dat = null;
+				if(loader != null) {
+					dat = loader.get();
+				}
+				if(dat == null) {
+					String msg = "Could not resolve blob! (" + name + ")";
+					logger.error(msg);
+					throw new NullPointerException(msg);
+				}
+				blobs.put(name, dat);
+			}
+		}
+		doUpdateMessage(cb, "Compressing EPK file...");
+		String fileName = launchConf.displayName.replaceAll("[^a-zA-Z0-9\\-_\\.]", "_");
+		if(fileName.length() > 251) {
+			fileName = fileName.substring(0, 251);
+		}
+		fileName = fileName + ".epk";
+		EPKCompiler epkComp = new EPKCompiler(fileName, "unknown", "epk/client-archive-v1", true, false,
+				"\n\n #  Eagler EPK v2.0 Client Archive v1\n #  Clients: \"" + launchConf.displayName + "\"\n\n");
+		byte[] epkData;
+		try {
+			epkComp.append("manifest.json", manifestBytes);
+			for(Entry<String,byte[]> blob : blobs.entrySet()) {
+				epkComp.append(blob.getKey(), blob.getValue());
+			}
+		}finally {
+			epkData = epkComp.complete();
+		}
+		doUpdateMessage(cb, "Downloading file...");
+		EagRuntime.downloadFileWithName(fileName, epkData);
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EPKClientParser.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EPKClientParser.java
new file mode 100755
index 0000000..bd0af0b
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EPKClientParser.java
@@ -0,0 +1,136 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.OfflineDownloadParser.ParsedOfflineAdapter;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.sp.server.export.EPKDecompiler;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class EPKClientParser {
+
+	private static final Logger logger = LogManager.getLogger("EPKClientParser");
+
+	public static List<ParsedOfflineAdapter> parseEPKClient(byte[] epkData) throws IOException {
+		EPKDecompiler epkDecompiler = new EPKDecompiler(epkData);
+		EPKDecompiler.FileEntry fetr = epkDecompiler.readFile();
+		if(fetr == null || !fetr.type.equals("HEAD") || !fetr.name.equals("file-type")) {
+			epkDecompiler.close();
+			throw new IOException("File is incomplete!");
+		}
+		if(!Arrays.equals(fetr.data, "epk/client-archive-v1".getBytes(StandardCharsets.UTF_8))) {
+			throw new IOException("File is not a client archive!");
+		}
+		Map<String,byte[]> files = new HashMap<>();
+		while((fetr = epkDecompiler.readFile()) != null) {
+			if(fetr.type.equals("FILE")) {
+				files.put(fetr.name, fetr.data);
+			}else {
+				logger.error("Skipping non-FILE entry: {} {}", fetr.type, fetr.name);
+			}
+		}
+		byte[] manifestData = files.get("manifest.json");
+		if(manifestData == null) {
+			throw new IOException("File is incomplete!");
+		}
+		List<EaglercraftUUID> lst = new ArrayList<>();
+		Map<EaglercraftUUID,ClientDataEntry> clientDatas;
+		List<LaunchConfigEntry> launchDatas;
+		try {
+			JSONObject mainfestJSON = new JSONObject(new String(manifestData, StandardCharsets.UTF_8));
+			JSONArray launches = mainfestJSON.getJSONArray("launchData");
+			JSONArray clients = mainfestJSON.getJSONArray("clientData");
+			clientDatas = new HashMap<>(clients.length());
+			launchDatas = new ArrayList<>(launches.length());
+			for(int i = 0, l = clients.length(); i < l; ++i) {
+				JSONObject obj = clients.getJSONObject(i);
+				EaglercraftUUID theUUID = EaglercraftUUID.fromString(obj.getString("uuid"));
+				if(!theUUID.equals(BootMenuConstants.UUID_CLIENT_DATA_ORIGIN)) {
+					clientDatas.put(theUUID, new ClientDataEntry(theUUID, obj));
+				}
+			}
+			for(int i = 0, l = launches.length(); i < l; ++i) {
+				JSONObject obj = launches.getJSONObject(i);
+				EaglercraftUUID theUUID = EaglercraftUUID.fromString(obj.getString("uuid"));
+				if(!theUUID.equals(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN)) {
+					LaunchConfigEntry theEtr = new LaunchConfigEntry(theUUID, obj);
+					if(!BootMenuConstants.UUID_CLIENT_DATA_ORIGIN.equals(theEtr.clientDataUUID)) {
+						if(clientDatas.containsKey(theEtr.clientDataUUID)) {
+							launchDatas.add(theEtr);
+						}else {
+							logger.warn("Skipping launch config {} because the client data {} is missing!", theUUID, theEtr.clientDataUUID);
+						}
+					}
+				}
+			}
+		}catch(JSONException ex) {
+			throw new IOException("File manifest is corrupt!", ex);
+		}
+		Map<EaglercraftUUID, byte[]> blobs = new HashMap<>();
+		Iterator<ClientDataEntry> itr = clientDatas.values().iterator();
+		loadClientDatas: while(itr.hasNext()) {
+			ClientDataEntry etr = itr.next();
+			for(EaglercraftUUID uuid : etr.getReferencedBlobs()) {
+				if(!blobs.containsKey(uuid)) {
+					byte[] blobBytes = files.get(uuid.toString());
+					if(blobBytes == null) {
+						logger.error("Blob UUID {} for client data {} is missing!", uuid, etr.uuid);
+						itr.remove();
+						continue loadClientDatas;
+					}
+					if(!EaglercraftUUID.nameUUIDFromBytes(blobBytes).equals(uuid)) {
+						logger.error("Blob UUID {} for client data {} has an invalid checksum!", uuid, etr.uuid);
+						itr.remove();
+						continue loadClientDatas;
+					}
+					blobs.put(uuid, blobBytes);
+				}
+			}
+		}
+		List<ParsedOfflineAdapter> list = new ArrayList<>(launchDatas.size());
+		for(LaunchConfigEntry etr : launchDatas) {
+			ClientDataEntry clientData = clientDatas.get(etr.clientDataUUID);
+			if(clientData == null) {
+				logger.error("Client data UUID {} for launch data {} is missing!", etr.clientDataUUID, etr.uuid);
+				continue;
+			}
+			Map<EaglercraftUUID, byte[]> entryBlob = new HashMap<>();
+			for(EaglercraftUUID uuid : clientData.getReferencedBlobs()) {
+				entryBlob.put(uuid, blobs.get(uuid));
+			}
+			list.add(new ParsedOfflineAdapter(etr, clientData, entryBlob));
+		}
+		logger.info("Loaded {} blobs from fat offline", blobs.size());
+		logger.info("Loaded {} client configurations from EPK file", clientDatas.size());
+		logger.info("Loaded {} launch configurations from EPK file", launchDatas.size());
+		return list;
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EPKDataEntry.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EPKDataEntry.java
new file mode 100755
index 0000000..830635a
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EPKDataEntry.java
@@ -0,0 +1,30 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class EPKDataEntry {
+
+	public final String extractTo;
+	public final EaglercraftUUID dataUUID;
+
+	public EPKDataEntry(String extractTo, EaglercraftUUID dataUUID) {
+		this.extractTo = extractTo;
+		this.dataUUID = dataUUID;
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EnumClientFormatType.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EnumClientFormatType.java
new file mode 100755
index 0000000..2f917d9
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EnumClientFormatType.java
@@ -0,0 +1,67 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.Set;
+
+import com.google.common.collect.Sets;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumClientFormatType {
+	/**
+	 * Eagler 1.8, b1.3, or pre-singleplayer 1.5 offline
+	 */
+	EAGLER_STANDARD_OFFLINE(0, "Standard Offline", Sets.newHashSet(EnumClientLaunchType.EAGLERX_V1, EnumClientLaunchType.EAGLER_1_5_V1,
+					EnumClientLaunchType.EAGLER_BETA_V1, EnumClientLaunchType.PEYTON_V2, EnumClientLaunchType.PEYTON_V1,
+					EnumClientLaunchType.STANDARD_OFFLINE_V1)),
+
+	/**
+	 * Eagler 1.5 offline with integrated server
+	 */
+	EAGLER_STANDARD_1_5_OFFLINE(1, "Standard 1.5 Offline", Sets.newHashSet(EnumClientLaunchType.EAGLER_1_5_V2)),
+	
+	/**
+	 * Eagler 1.8 with certificate
+	 */
+	EAGLER_SIGNED_OFFLINE(2, "Signed Offline", Sets.newHashSet(EnumClientLaunchType.EAGLERX_SIGNED_V1));
+
+	public final int id;
+	public final String displayName;
+	public final Set<EnumClientLaunchType> launchTypes;
+
+	private EnumClientFormatType(int id, String displayName, Set<EnumClientLaunchType> launchTypes) {
+		this.id = id;
+		this.displayName = displayName;
+		this.launchTypes = launchTypes;
+	}
+
+	private static final EnumClientFormatType[] lookup = new EnumClientFormatType[3];
+
+	public static EnumClientFormatType getById(int id) {
+		if(id >= 0 && id < lookup.length) {
+			return lookup[id];
+		}else {
+			return null;
+		}
+	}
+
+	static {
+		EnumClientFormatType[] _values = values();
+		for(int i = 0; i < _values.length; ++i) {
+			lookup[_values[i].id] = _values[i];
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EnumClientLaunchType.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EnumClientLaunchType.java
new file mode 100755
index 0000000..72f3d76
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EnumClientLaunchType.java
@@ -0,0 +1,86 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumClientLaunchType {
+	/**
+	 * Configuable Eagler 1.8-like offline
+	 */
+	STANDARD_OFFLINE_V1(0),
+	
+	/**
+	 * Eagler 1.8 standard
+	 */
+	EAGLERX_V1(1),
+	
+	/**
+	 * Eagler 1.8 with certificate
+	 */
+	EAGLERX_SIGNED_V1(2),
+	
+	/**
+	 * Eagler 1.5 array "window.minecraftOpts" of element id, epk file, servers, server to join
+	 */
+	EAGLER_1_5_V1(3),
+	
+	/**
+	 * Eagler 1.5 array "window.eaglercraftOpts" with "container" and "assetsURI" and "serverWorkerURI"
+	 */
+	EAGLER_1_5_V2(4),
+	
+	/**
+	 * Eagler beta array "window.minecraftOpts" of element id, epk file, server to join
+	 */
+	EAGLER_BETA_V1(5),
+	
+	/**
+	 * Peyton format with "window.classicConfig" array of root element id and epk file
+	 */
+	PEYTON_V1(6),
+	
+	/**
+	 * Peyton format with "window.config" JSON object with "gameContainer" and "assetsLocation"
+	 */
+	PEYTON_V2(7);
+
+	public final int id;
+
+	private EnumClientLaunchType(int id) {
+		this.id = id;
+	}
+
+	private static final EnumClientLaunchType[] lookup = new EnumClientLaunchType[8];
+
+	public static EnumClientLaunchType getById(int id) {
+		if(id >= 0 && id < lookup.length) {
+			return lookup[id];
+		}else {
+			return null;
+		}
+	}
+
+	public static EnumClientLaunchType[] _values() {
+		return lookup;
+	}
+
+	static {
+		EnumClientLaunchType[] _values = values();
+		for(int i = 0; i < _values.length; ++i) {
+			lookup[_values[i].id] = _values[i];
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EnumOfflineParseType.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EnumOfflineParseType.java
new file mode 100755
index 0000000..c6c5206
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/EnumOfflineParseType.java
@@ -0,0 +1,53 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumOfflineParseType {
+	EAGLERCRAFTX_1_8_OFFLINE,
+	EAGLERCRAFTX_1_8_SIGNED,
+	EAGLERCRAFTX_1_8_FAT_OFFLINE,
+	EAGLERCRAFTX_1_8_FAT_SIGNED,
+	EAGLERCRAFT_1_5_NEW_OFFLINE,
+	EAGLERCRAFT_1_5_OLD_OFFLINE,
+	EAGLERCRAFT_BETA_B1_3_OFFLINE,
+	PEYTONPLAYZ585_ALPHA_BETA,
+	PEYTONPLAYZ585_INDEV,
+	EXPORTED_STANDARD_OFFLINE,
+	EAGLERCRAFT_EPK_FILE;
+
+	public static EnumOfflineParseType inferFromClientFormat(EnumClientLaunchType etr) {
+		switch(etr) {
+		case STANDARD_OFFLINE_V1:
+			return EXPORTED_STANDARD_OFFLINE;
+		case EAGLERX_V1:
+			return EAGLERCRAFTX_1_8_OFFLINE;
+		case EAGLERX_SIGNED_V1:
+			return EAGLERCRAFTX_1_8_SIGNED;
+		case EAGLER_1_5_V1:
+			return EAGLERCRAFT_1_5_OLD_OFFLINE;
+		case EAGLER_1_5_V2:
+			return EAGLERCRAFT_1_5_NEW_OFFLINE;
+		case EAGLER_BETA_V1:
+			return EAGLERCRAFT_BETA_B1_3_OFFLINE;
+		case PEYTON_V1:
+			return PEYTONPLAYZ585_INDEV;
+		case PEYTON_V2:
+			return PEYTONPLAYZ585_ALPHA_BETA;
+		default:
+			throw new IllegalArgumentException();
+		}
+	}
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/FatOfflineDownloadFactory.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/FatOfflineDownloadFactory.java
new file mode 100755
index 0000000..497a17f
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/FatOfflineDownloadFactory.java
@@ -0,0 +1,207 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import net.lax1dude.eaglercraft.v1_8.Base64;
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.BootMenuEntryPoint.UnsignedClientEPKLoader;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class FatOfflineDownloadFactory {
+
+	private static final Logger logger = LogManager.getLogger("FatOfflineDownloadFactory");
+
+	public static void downloadOffline(List<BootableClientEntry> lst, IProgressMsgCallback cb) {
+		Map<EaglercraftUUID, byte[]> loadedBlobs = new HashMap<>();
+		JSONArray manifestClientDatas = new JSONArray();
+		Set<EaglercraftUUID> manifestClientDatasSet = new HashSet<>();
+		JSONArray manifestLaunchDatas = new JSONArray();
+		Set<EaglercraftUUID> manifestLaunchDatasSet = new HashSet<>();
+		for(BootableClientEntry etr : lst) {
+			ClientDataEntry clientData = etr.bootAdapter.getClientDataEntry();
+			LaunchConfigEntry launchConf = etr.bootAdapter.getLaunchConfigEntry();
+			if(launchConf.uuid.equals(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN)) {
+				logger.warn("Cannot export origin launch configuration to fat offline!");
+				continue;
+			}
+			if(manifestLaunchDatasSet.add(launchConf.uuid)) {
+				JSONObject obj = new JSONObject();
+				launchConf.writeJSON(obj);
+				manifestLaunchDatas.put(obj);
+				if(!clientData.uuid.equals(BootMenuConstants.UUID_CLIENT_DATA_ORIGIN) && manifestClientDatasSet.add(clientData.uuid)) {
+					obj = new JSONObject();
+					clientData.writeJSON(obj);
+					manifestClientDatas.put(obj);
+					Map<EaglercraftUUID, Supplier<byte[]>> loaders = etr.bootAdapter.getBlobLoaders();
+					for(EaglercraftUUID uuid : clientData.getReferencedBlobs()) {
+						doUpdateMessage(cb, "Resolving data for \"" + launchConf.displayName + "\" (" + uuid + ")");
+						if(!cacheLoad(loadedBlobs, loaders, uuid)) {
+							throw new NullPointerException("Blob for configuration \"" + launchConf.displayName + "\" is missing: " + uuid);
+						}
+					}
+				}
+			}else {
+				logger.warn("Skipping duplicate launch config uuid: {}", launchConf.uuid);
+			}
+		}
+		JSONObject manifest = new JSONObject();
+		manifest.put("clientData", manifestClientDatas);
+		manifest.put("launchData", manifestLaunchDatas);
+		String manifestStr = manifest.toString().replace(StringUtils.reverse(">elyts/<"), "<_style>");
+		boolean isSigned = BootMenuEntryPoint.isSignedClient();
+		String template;
+		if(isSigned) {
+			doUpdateMessage(cb, "Loading offline_template_eaglercraftX_1_8_fat_signed.html");
+			template = OfflineDownloadFactory.loadTemplate("offline_template_eaglercraftX_1_8_fat_signed.html");
+		}else {
+			doUpdateMessage(cb, "Loading offline_template_eaglercraftX_1_8_fat_offline.html");
+			template = OfflineDownloadFactory.loadTemplate("offline_template_eaglercraftX_1_8_fat_offline.html");
+		}
+		template = template.replace("${date}", (new SimpleDateFormat("MM/dd/yyyy")).format(new Date()));
+		template = template.replace("${num_clients}", Integer.toString(manifestLaunchDatas.length() + 1));
+		JSONObject optsDump = BootMenuEntryPoint.getOriginLaunchOptsJSON();
+		optsDump.put("bootMenuBlocksUnsignedClients", false);
+		RelayRandomizeHelper.makeOptsJSONHaveMacroHack(optsDump);
+		String optsStr = optsDump.toString();
+		JSONObject launchConfJSON = new JSONObject();
+		(new LaunchConfigEntry(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN, BootMenuConstants.UUID_CLIENT_DATA_ORIGIN,
+				BootMenuConstants.client_projectForkName + " " + BootMenuConstants.client_projectOriginRevision + " "
+						+ BootMenuConstants.client_projectOriginVersion,
+				isSigned ? EnumClientLaunchType.EAGLERX_SIGNED_V1 : EnumClientLaunchType.EAGLERX_V1, null, null, null,
+				null, null, optsStr, false)).writeJSON(launchConfJSON);
+		template = template.replace("${launch_conf_json}", launchConfJSON.toString());
+		int relayIdCount = RelayRandomizeHelper.countRelayMacro(optsStr);
+		if(relayIdCount > 0) {
+			optsStr = RelayRandomizeHelper.replaceRelayMacroWithEqRelayId(optsStr);
+		}
+		template = template.replace("${relayId_max}", Integer.toString(relayIdCount));
+		template = template.replace("${launch_opts}", optsStr);
+		if(isSigned) {
+			doUpdateMessage(cb, "Retrieving origin client signature and payload");
+			template = template.replace("${client_signature}", Base64.encodeBase64String(BootMenuEntryPoint.getSignedClientSignature()));
+			template = template.replace("${client_bundle}", Base64.encodeBase64String(BootMenuEntryPoint.getSignedClientBundle()));
+		}else {
+			doUpdateMessage(cb, "Retrieving origin client classes.js");
+			byte[] classesJS = BootMenuEntryPoint.getUnsignedClientClassesJS();
+			if(classesJS == null) {
+				throw new NullPointerException("Could not load classes.js!");
+			}
+			template = template.replace(StringUtils.reverse("}sj_sessalc{$"), new String(OfflineDownloadFactory.removeUseStrict(classesJS), StandardCharsets.UTF_8));
+			UnsignedClientEPKLoader epkLoader = BootMenuEntryPoint.getUnsignedClientAssetsEPK();
+			String assetsEPKVal;
+			int epkNum = epkLoader.list.size();
+			if(epkNum > 1 || !StringUtils.isEmpty(epkLoader.list.get(0).extractTo)) {
+				StringBuilder assetsEPKBuilder = new StringBuilder("[ ");
+				for(int i = 0; i < epkNum; ++i) {
+					EPKDataEntry epk = epkLoader.list.get(i);
+					doUpdateMessage(cb, "Resolving assets.epk (" + epk.dataUUID + ", path: /" + epk.extractTo + ")");
+					Supplier<byte[]> epkDataGetter = epkLoader.loaders.get(epk.dataUUID);
+					byte[] epkData = null;
+					if(epkDataGetter != null) {
+						epkData = epkDataGetter.get();
+					}
+					if(epkData == null) {
+						String msg = "Could not resolve assets.epk! (" + epk.dataUUID + ", path: /" + epk.extractTo + ")";
+						logger.error(msg);
+						throw new NullPointerException(msg);
+					}
+					if(i > 0) {
+						assetsEPKBuilder.append(", ");
+					}
+					assetsEPKBuilder.append("{ url: \"data:application/octet-stream;base64,");
+					assetsEPKBuilder.append(Base64.encodeBase64String(epkData));
+					assetsEPKBuilder.append("\", path: \"");
+					assetsEPKBuilder.append(OfflineDownloadFactory.stupidJSONEscape(epk.extractTo));
+					assetsEPKBuilder.append("\" }");
+				}
+				assetsEPKBuilder.append(" ]");
+				assetsEPKVal = assetsEPKBuilder.toString();
+			}else {
+				EPKDataEntry epk = epkLoader.list.get(0);
+				doUpdateMessage(cb, "Resolving assets.epk (" + epk.dataUUID + ", path: /)");
+				Supplier<byte[]> epkDataGetter = epkLoader.loaders.get(epk.dataUUID);
+				byte[] epkData = null;
+				if(epkDataGetter != null) {
+					epkData = epkDataGetter.get();
+				}
+				if(epkData == null) {
+					String msg = "Could not resolve assets.epk! (" + epk.dataUUID + ", path: /)";
+					logger.error(msg);
+					throw new NullPointerException(msg);
+				}
+				assetsEPKVal = "\"data:application/octet-stream;base64," + Base64.encodeBase64String(epkData) + "\"";
+			}
+			
+			template = template.replace(StringUtils.reverse("}kpe_stessa{$"), assetsEPKVal);
+		}
+		doUpdateMessage(cb, "Embedding additional clients as base64");
+		StringBuilder fatOfflineDataBuilder = new StringBuilder();
+		fatOfflineDataBuilder.append(StringUtils.reverse(">\"1v_tsefinam_enilffOtaFrelgae_\"=di \"tfarcrelgae\"=epyt elyts<"));
+		fatOfflineDataBuilder.append(manifestStr);
+		fatOfflineDataBuilder.append(StringUtils.reverse("\n>elyts/<"));
+		for(Entry<EaglercraftUUID, byte[]> etr : loadedBlobs.entrySet()) {
+			fatOfflineDataBuilder.append(StringUtils.reverse("_enilffOtaFrelgae_\"=di \"tfarcrelgae\"=epyt elyts<") + etr.getKey().toString() + "\">");
+			fatOfflineDataBuilder.append(Base64.encodeBase64String(etr.getValue()));
+			fatOfflineDataBuilder.append(StringUtils.reverse("\n>elyts/<"));
+		}
+		template = template.replace(StringUtils.reverse("}atad_enilffo_taf{$"), fatOfflineDataBuilder.toString());
+		doUpdateMessage(cb, "Downloading file...");
+		EagRuntime.downloadFileWithName("EaglercraftX_1.8_Fat_Offline_Download.html", template.getBytes(StandardCharsets.UTF_8));
+	}
+
+	private static void doUpdateMessage(IProgressMsgCallback cb, String str) {
+		logger.info(str);
+		cb.updateMessage(str);
+	}
+
+	private static boolean cacheLoad(Map<EaglercraftUUID, byte[]> loadedBlobs,
+			Map<EaglercraftUUID, Supplier<byte[]>> loaders, EaglercraftUUID uuid) {
+		if(!loadedBlobs.containsKey(uuid)) {
+			Supplier<byte[]> getter = loaders.get(uuid);
+			if(getter != null) {
+				byte[] dat = getter.get();
+				if(dat != null) {
+					loadedBlobs.put(uuid, dat);
+					return true;
+				}else {
+					return false;
+				}
+			}else {
+				return false;
+			}
+		}else {
+			return true;
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/IBootMenuConfigAdapter.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/IBootMenuConfigAdapter.java
new file mode 100755
index 0000000..c614b0e
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/IBootMenuConfigAdapter.java
@@ -0,0 +1,30 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMClientConfigAdapter;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface IBootMenuConfigAdapter {
+
+	public static final IBootMenuConfigAdapter instance = (IBootMenuConfigAdapter)TeaVMClientConfigAdapter.instance;
+
+	boolean isAllowBootMenu();
+
+	boolean isShowBootMenuOnLaunch();
+
+	boolean isBootMenuBlocksUnsignedClients();
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/IProgressMsgCallback.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/IProgressMsgCallback.java
new file mode 100755
index 0000000..274e2be
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/IProgressMsgCallback.java
@@ -0,0 +1,22 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface IProgressMsgCallback {
+
+	void updateMessage(String msg);
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/InputPopupController.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/InputPopupController.java
new file mode 100755
index 0000000..4ecd3cb
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/InputPopupController.java
@@ -0,0 +1,111 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import org.teavm.jso.dom.html.HTMLElement;
+import org.teavm.jso.dom.html.HTMLInputElement;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class InputPopupController {
+
+	public final HTMLInputElement inputField;
+	public final boolean intValue;
+	public final HTMLElement cancelButton;
+	public final  HTMLElement doneButton;
+	protected boolean cancelSelected = true;
+
+	public InputPopupController(HTMLInputElement inputField, boolean intValue, HTMLElement cancelButton, HTMLElement doneButton) {
+		this.inputField = inputField;
+		this.intValue = intValue;
+		this.cancelButton = cancelButton;
+		this.doneButton = doneButton;
+	}
+
+	public void setup(String initialValue) {
+		cancelSelected = true;
+		inputField.setValue(initialValue);
+		cancelButton.getClassList().add(BootMenuConstants.cssClassPrefixBootMenu + "popup_input_opt_selected");
+		doneButton.getClassList().remove(BootMenuConstants.cssClassPrefixBootMenu + "popup_input_opt_selected");
+	}
+
+	public void handleOnChanged(HTMLElement htmlElement) {
+		if(inputField == htmlElement) {
+			if(intValue) {
+				int i;
+				try {
+					i = Integer.parseInt(inputField.getValue().trim());
+				}catch(NumberFormatException ex) {
+					inputField.setValue("0");
+					return;
+				}
+				if(i < 0) {
+					inputField.setValue("0");
+				}
+			}else {
+				inputField.setValue(inputField.getValue().trim());
+			}
+		}
+	}
+
+	public void handleOnClick(HTMLElement htmlElement) {
+		if(doneButton == htmlElement) {
+			onSave(inputField);
+		}else if(cancelButton == htmlElement) {
+			onCancel();
+		}
+	}
+
+	public void handleOnMouseOver(HTMLElement htmlElement) {
+		if(doneButton == htmlElement) {
+			setCancelSelected(false);
+		}else if(cancelButton == htmlElement) {
+			setCancelSelected(true);
+		}
+	}
+
+	public void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ARROW_RIGHT) {
+			setCancelSelected(false);
+		}else if(keyCode == KeyCodes.DOM_KEY_ARROW_LEFT) {
+			setCancelSelected(true);
+		}else if(keyCode == KeyCodes.DOM_KEY_ENTER) {
+			handleOnChanged(inputField);
+			onSave(inputField);
+		}else if(keyCode == KeyCodes.DOM_KEY_ESCAPE) {
+			onCancel();
+		}
+	}
+
+	public void setCancelSelected(boolean sel) {
+		if(sel) {
+			if(!cancelSelected) {
+				cancelSelected = true;
+				cancelButton.getClassList().add(BootMenuConstants.cssClassPrefixBootMenu + "popup_input_opt_selected");
+				doneButton.getClassList().remove(BootMenuConstants.cssClassPrefixBootMenu + "popup_input_opt_selected");
+			}
+		}else {
+			if(cancelSelected) {
+				cancelSelected = false;
+				doneButton.getClassList().add(BootMenuConstants.cssClassPrefixBootMenu + "popup_input_opt_selected");
+				cancelButton.getClassList().remove(BootMenuConstants.cssClassPrefixBootMenu + "popup_input_opt_selected");
+			}
+		}
+	}
+
+	protected abstract void onSave(HTMLInputElement inputField);
+
+	protected abstract void onCancel();
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/KeyCodes.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/KeyCodes.java
new file mode 100755
index 0000000..74f42af
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/KeyCodes.java
@@ -0,0 +1,34 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class KeyCodes {
+
+	public static final int DOM_KEY_SHIFT = 16;
+	public static final int DOM_KEY_CONTROL = 17;
+	public static final int DOM_KEY_ALT = 18;
+	public static final int DOM_KEY_ENTER = 13;
+	public static final int DOM_KEY_ESCAPE = 27;
+
+	public static final int DOM_KEY_E = 69;
+	public static final int DOM_KEY_SPACE = 32;
+
+	public static final int DOM_KEY_ARROW_LEFT = 37;
+	public static final int DOM_KEY_ARROW_UP = 38;
+	public static final int DOM_KEY_ARROW_RIGHT = 39;
+	public static final int DOM_KEY_ARROW_DOWN = 40;
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/LaunchConfigEntry.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/LaunchConfigEntry.java
new file mode 100755
index 0000000..daed772
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/LaunchConfigEntry.java
@@ -0,0 +1,143 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import org.json.JSONObject;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class LaunchConfigEntry {
+
+	public final EaglercraftUUID uuid;
+	public final EaglercraftUUID clientDataUUID;
+	public String displayName;
+	public EnumClientLaunchType type;
+	public String joinServer;
+	public String launchOptsVar;
+	public String launchOptsAssetsURIVar;
+	public String launchOptsContainerVar;
+	public String mainFunction;
+	public String launchOpts;
+	public boolean clearCookiesBeforeLaunch;
+
+	public LaunchConfigEntry(EaglercraftUUID uuid, EaglercraftUUID clientDataUUID) {
+		this.uuid = uuid;
+		this.clientDataUUID = clientDataUUID;
+	}
+
+	public LaunchConfigEntry(EaglercraftUUID uuid, EaglercraftUUID clientDataUUID, String displayName,
+			EnumClientLaunchType type, String joinServer, String launchOptsVar, String assetsURIVar,
+			String containerVar, String mainFunction, String launchOpts, boolean clearCookiesBeforeLaunch) {
+		this.uuid = uuid;
+		this.clientDataUUID = clientDataUUID;
+		this.displayName = displayName;
+		this.type = type;
+		this.joinServer = joinServer;
+		this.launchOptsVar = launchOptsVar;
+		this.launchOptsAssetsURIVar = assetsURIVar;
+		this.launchOptsContainerVar = containerVar;
+		this.mainFunction = mainFunction;
+		this.launchOpts = launchOpts;
+		this.clearCookiesBeforeLaunch = clearCookiesBeforeLaunch;
+	}
+
+	public LaunchConfigEntry(EaglercraftUUID uuid, JSONObject jsonObject) {
+		this.uuid = uuid;
+		EaglercraftUUID sanityUUID = EaglercraftUUID.fromString(jsonObject.getString("uuid"));
+		if(!sanityUUID.equals(uuid)) {
+			throw new IllegalArgumentException("The file's name UUID does not equal the UUID string found in the file!");
+		}
+		int typeId = jsonObject.getInt("type");
+		type = EnumClientLaunchType.getById(typeId);
+		if(type == null) {
+			throw new IllegalArgumentException("Unknown launch configuration type " + typeId + "!");
+		}
+		clientDataUUID = EaglercraftUUID.fromString(jsonObject.getString("dataUUID"));
+		displayName = jsonObject.getString("displayName");
+		clearCookiesBeforeLaunch = jsonObject.getBoolean("clearCookies");
+		switch(type) {
+		case STANDARD_OFFLINE_V1:
+			launchOpts = jsonObject.getString("launchOpts");
+			launchOptsVar = jsonObject.getString("launchOptsVar");
+			launchOptsAssetsURIVar = jsonObject.getString("assetsURIVar");
+			launchOptsContainerVar = jsonObject.getString("containerVar");
+			mainFunction = jsonObject.getString("entryPoint");
+			break;
+		case EAGLERX_V1:
+		case EAGLERX_SIGNED_V1:
+		case EAGLER_1_5_V2:
+		case PEYTON_V2:
+			launchOpts = jsonObject.getString("launchOpts");
+			break;
+		case EAGLER_1_5_V1:
+			launchOpts = jsonObject.getString("launchOpts");
+			joinServer = jsonObject.getString("joinServer");
+			break;
+		case EAGLER_BETA_V1:
+			joinServer = jsonObject.getString("joinServer");
+			break;
+		case PEYTON_V1:
+			break;
+		default: //?
+			break;
+		}
+	}
+
+	public void writeJSON(JSONObject jsonObject) {
+		jsonObject.put("uuid", uuid.toString());
+		jsonObject.put("type", type.id);
+		jsonObject.put("dataUUID", clientDataUUID.toString());
+		jsonObject.put("displayName", displayName);
+		jsonObject.put("clearCookies", clearCookiesBeforeLaunch);
+		switch(type) {
+		case STANDARD_OFFLINE_V1:
+			jsonObject.put("launchOpts", launchOpts != null ? launchOpts : "{ }");
+			jsonObject.put("launchOptsVar", launchOptsVar != null ? launchOptsVar : "eaglercraftXOpts");
+			jsonObject.put("assetsURIVar", launchOptsAssetsURIVar != null ? launchOptsAssetsURIVar : "assetsURI");
+			jsonObject.put("containerVar", launchOptsContainerVar != null ? launchOptsContainerVar : "container");
+			jsonObject.put("entryPoint", mainFunction != null ? mainFunction : "main");
+			break;
+		case EAGLERX_V1:
+		case EAGLERX_SIGNED_V1:
+		case EAGLER_1_5_V2:
+		case PEYTON_V2:
+			jsonObject.put("launchOpts", launchOpts != null ? launchOpts : "{ }");
+			break;
+		case EAGLER_1_5_V1:
+			jsonObject.put("launchOpts", launchOpts != null ? launchOpts : "[NBT]{ }[/NBT]");
+			jsonObject.put("joinServer", joinServer != null ? joinServer : "");
+			break;
+		case EAGLER_BETA_V1:
+			jsonObject.put("joinServer", joinServer != null ? joinServer : "");
+			break;
+		case PEYTON_V1:
+			break;
+		default: //?
+			break;
+		}
+	}
+
+	public LaunchConfigEntry rotateUUIDs(EaglercraftUUID rotatedLaunchUUID, EaglercraftUUID rotatedClientUUID) {
+		return new LaunchConfigEntry(rotatedLaunchUUID, rotatedClientUUID, displayName, type, joinServer, launchOptsVar,
+				launchOptsAssetsURIVar, launchOptsContainerVar, mainFunction, launchOpts, clearCookiesBeforeLaunch);
+	}
+
+	public LaunchConfigEntry fork() {
+		return new LaunchConfigEntry(uuid, clientDataUUID, displayName, type, joinServer, launchOptsVar,
+				launchOptsAssetsURIVar, launchOptsContainerVar, mainFunction, launchOpts, clearCookiesBeforeLaunch);
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateConfirmation.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateConfirmation.java
new file mode 100755
index 0000000..ab6c363
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateConfirmation.java
@@ -0,0 +1,141 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+import com.google.common.collect.Collections2;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class MenuPopupStateConfirmation<E> extends MenuState {
+
+	public static enum EnumYesNoHelper {
+		YES("Yes"),
+		NO("No");
+		
+		private final String str;
+		
+		private EnumYesNoHelper(String str) {
+			this.str = str;
+		}
+		
+		@Override
+		public String toString() {
+			return str;
+		}
+	}
+
+	protected class SelectionItem implements ConfirmationPopupController.SelectionOption {
+
+		protected E enumValue;
+
+		protected SelectionItem(E enumValue) {
+			this.enumValue = enumValue;
+		}
+
+		@Override
+		public String getName() {
+			return enumValue.toString();
+		}
+
+	}
+
+	protected final String title;
+	protected final List<E> options;
+	protected final ConfirmationPopupController<SelectionItem> popupController;
+
+	public MenuPopupStateConfirmation(String title, List<E> options) {
+		this.title = title;
+		this.options = options;
+		this.popupController = new ConfirmationPopupController<SelectionItem>(
+				BootMenuMain.bootMenuDOM.popup_confirm_opts,
+				new ArrayList<SelectionItem>(Collections2.transform(options, SelectionItem::new))) {
+			@Override
+			protected void optionSelected(SelectionItem item) {
+				MenuPopupStateConfirmation.this.selectCallback(item.enumValue);
+			}
+		};
+	}
+
+	@Override
+	protected void enterState() {
+		popupController.setup();
+		BootMenuMain.bootMenuDOM.popup_confirm_title.setInnerText(title);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup_view_confirm);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup);
+	}
+
+	@Override
+	protected void exitState() {
+		popupController.destroy();
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup_view_confirm);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ESCAPE) {
+			BootMenuMain.currentState.changePopupState(null);
+			return;
+		}
+		popupController.handleKeyDown(keyCode);
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		popupController.handleKeyRepeat(keyCode);
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+	protected abstract void selectCallback(E enumValue);
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateEditInteger.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateEditInteger.java
new file mode 100755
index 0000000..1aa60ee
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateEditInteger.java
@@ -0,0 +1,114 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import org.teavm.jso.dom.html.HTMLElement;
+import org.teavm.jso.dom.html.HTMLInputElement;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class MenuPopupStateEditInteger extends MenuState {
+
+	protected final InputPopupController inputPopupController;
+	protected final String menuTitle;
+	protected final int defaultValue;
+
+	public MenuPopupStateEditInteger(String menuTitle, int defaultValue) {
+		this.inputPopupController = new InputPopupController((HTMLInputElement) BootMenuMain.bootMenuDOM.popup_input_val,
+				true, BootMenuMain.bootMenuDOM.popup_input_opt_cancel, BootMenuMain.bootMenuDOM.popup_input_opt_done) {
+
+					@Override
+					protected void onSave(HTMLInputElement inputField) {
+						int i = 0;
+						try {
+							i = Integer.parseInt(inputField.getValue().trim());
+						}catch(NumberFormatException ex) {
+						}
+						MenuPopupStateEditInteger.this.onSave(i);
+					}
+
+					@Override
+					protected void onCancel() {
+						MenuPopupStateEditInteger.this.onCancel();
+					}
+
+		};
+		this.menuTitle = menuTitle;
+		this.defaultValue = defaultValue;
+	}
+
+	@Override
+	protected void enterState() {
+		BootMenuMain.bootMenuDOM.popup_input_title.setInnerText(menuTitle);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup_view_input);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup);
+		inputPopupController.setup(Integer.toString(defaultValue));
+	}
+
+	@Override
+	protected void exitState() {
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup_view_input);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		inputPopupController.handleKeyDown(keyCode);
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		inputPopupController.handleOnChanged(htmlElement);
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		inputPopupController.handleOnClick(htmlElement);
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		inputPopupController.handleOnMouseOver(htmlElement);
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+	protected abstract void onSave(int i);
+
+	protected abstract void onCancel();
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateEditString.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateEditString.java
new file mode 100755
index 0000000..5610545
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateEditString.java
@@ -0,0 +1,109 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import org.teavm.jso.dom.html.HTMLElement;
+import org.teavm.jso.dom.html.HTMLInputElement;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class MenuPopupStateEditString extends MenuState {
+
+	protected final InputPopupController inputPopupController;
+	protected final String menuTitle;
+	protected final String defaultValue;
+
+	public MenuPopupStateEditString(String menuTitle, String defaultValue) {
+		this.inputPopupController = new InputPopupController((HTMLInputElement) BootMenuMain.bootMenuDOM.popup_input_val,
+				false, BootMenuMain.bootMenuDOM.popup_input_opt_cancel, BootMenuMain.bootMenuDOM.popup_input_opt_done) {
+
+					@Override
+					protected void onSave(HTMLInputElement inputField) {
+						MenuPopupStateEditString.this.onSave(inputField.getValue().trim());
+					}
+
+					@Override
+					protected void onCancel() {
+						MenuPopupStateEditString.this.onCancel();
+					}
+
+		};
+		this.menuTitle = menuTitle;
+		this.defaultValue = defaultValue;
+	}
+
+	@Override
+	protected void enterState() {
+		BootMenuMain.bootMenuDOM.popup_input_title.setInnerText(menuTitle);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup_view_input);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup);
+		inputPopupController.setup(defaultValue);
+	}
+
+	@Override
+	protected void exitState() {
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup_view_input);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		inputPopupController.handleKeyDown(keyCode);
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		inputPopupController.handleOnChanged(htmlElement);
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		inputPopupController.handleOnClick(htmlElement);
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		inputPopupController.handleOnMouseOver(htmlElement);
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+	protected abstract void onSave(String str);
+
+	protected abstract void onCancel();
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateFileChooser.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateFileChooser.java
new file mode 100755
index 0000000..dcc3293
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateFileChooser.java
@@ -0,0 +1,106 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class MenuPopupStateFileChooser extends MenuState {
+
+	protected final String text;
+	protected final String mime;
+	protected final String ext;
+	protected String msg;
+	private boolean waitingForFile = false;
+
+	public MenuPopupStateFileChooser(String text, String mime, String ext) {
+		this.text = text;
+		this.mime = mime;
+		this.ext = ext;
+	}
+
+	@Override
+	protected void enterState() {
+		BootMenuMain.bootMenuDOM.popup_confirm_opts.setInnerHTML("");
+		BootMenuMain.bootMenuDOM.popup_confirm_title.setInnerText(text + "\n\nPress ESC to cancel");
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup_view_confirm);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup);
+		EagRuntime.displayFileChooser(mime, ext);
+		waitingForFile = true;
+	}
+
+	@Override
+	protected void exitState() {
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup_view_confirm);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ESCAPE) {
+			waitingForFile = false;
+			onResult(null);
+		}
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void update() {
+		if(waitingForFile && EagRuntime.fileChooserHasResult()) {
+			waitingForFile = false;
+			onResult(EagRuntime.getFileChooserResult());
+		}
+	}
+
+	protected abstract void onResult(FileChooserResult res);
+
+}
\ No newline at end of file
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateLoading.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateLoading.java
new file mode 100755
index 0000000..2a64512
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateLoading.java
@@ -0,0 +1,98 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import org.apache.commons.lang3.StringUtils;
+import org.teavm.jso.dom.html.HTMLElement;
+
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class MenuPopupStateLoading extends MenuState implements IProgressMsgCallback {
+
+	protected final String text;
+	protected String msg;
+
+	public MenuPopupStateLoading(String text) {
+		this.text = text;
+	}
+
+	@Override
+	protected void enterState() {
+		BootMenuMain.bootMenuDOM.popup_confirm_opts.setInnerHTML("");
+		BootMenuMain.bootMenuDOM.popup_confirm_title.setInnerText(!StringUtils.isAllEmpty(msg) ? (text + "\n\n" + msg) : text);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup_view_confirm);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup);
+	}
+
+	@Override
+	protected void exitState() {
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup_view_confirm);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	public void updateMessage(String msg) {
+		this.msg = msg;
+		BootMenuMain.bootMenuDOM.popup_confirm_title.setInnerText(!StringUtils.isAllEmpty(msg) ? (text + "\n\n" + msg) : text);
+		EagUtils.sleep(50l);
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateSelection.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateSelection.java
new file mode 100755
index 0000000..86ee032
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateSelection.java
@@ -0,0 +1,141 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+import com.google.common.collect.Collections2;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class MenuPopupStateSelection<T> extends MenuState {
+
+	public static class SelectionItem<E> implements SelectionListController.ListItem {
+
+		protected final String name;
+		protected final E enumValue;
+
+		public SelectionItem(E enumValue, String name) {
+			this.name = name;
+			this.enumValue = enumValue;
+		}
+
+		public SelectionItem(E enumValue) {
+			this.name = enumValue.toString();
+			this.enumValue = enumValue;
+		}
+
+		@Override
+		public String getName() {
+			return name;
+		}
+
+	}
+
+	protected final String title;
+	protected final List<SelectionItem<T>> items;
+	protected SelectionListController<SelectionItem<T>> selectionController;
+
+	public MenuPopupStateSelection(String title, List<SelectionItem<T>> items) {
+		this.title = title;
+		this.items = items;
+		this.selectionController = new SelectionListController<SelectionItem<T>>(BootMenuMain.bootMenuDOM.popup_selection, items) {
+			@Override
+			protected void itemSelected(SelectionItem<T> item) {
+				MenuPopupStateSelection.this.itemSelected(item.enumValue);
+			}
+		};
+	}
+
+	public static <T> MenuPopupStateSelection<T> createHelper(String title, List<T> items, Consumer<T> selectCallback) {
+		return new MenuPopupStateSelection<T>(title,
+				new ArrayList<SelectionItem<T>>(Collections2.transform(items, SelectionItem<T>::new))) {
+			@Override
+			protected void itemSelected(T item) {
+				selectCallback.accept(item);
+			}
+		};
+	}
+
+	@Override
+	protected void enterState() {
+		selectionController.setup();
+		BootMenuMain.bootMenuDOM.popup_selection_title.setInnerText(title);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup_view_selection);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.popup);
+	}
+
+	@Override
+	protected void exitState() {
+		selectionController.destroy();
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup_view_selection);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.popup);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		throw new IllegalStateException();
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ESCAPE) {
+			BootMenuMain.currentState.changePopupState(null);
+			return;
+		}
+		selectionController.handleKeyDown(keyCode);
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		selectionController.handleKeyRepeat(keyCode);
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+	protected abstract void itemSelected(T item);
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuState.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuState.java
new file mode 100755
index 0000000..7ffb7f1
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuState.java
@@ -0,0 +1,135 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class MenuState {
+
+	protected MenuState currentPopup = null;
+
+	public void changePopupState(MenuState popup) {
+		if(popup == null) {
+			if(currentPopup != null) {
+				currentPopup.exitState();
+				exitPopupBlockingState();
+				currentPopup = null;
+			}
+		}else {
+			if(currentPopup != null) {
+				currentPopup.exitState();
+			}
+			currentPopup = popup;
+			enterPopupBlockingState();
+			popup.enterState();
+		}
+	}
+
+	public void doEnterState() {
+		enterState();
+		if(currentPopup != null) {
+			enterPopupBlockingState();
+			currentPopup.enterState();
+		}
+	}
+
+	public void doExitState() {
+		if(currentPopup != null) {
+			currentPopup.exitState();
+			exitPopupBlockingState();
+		}
+		exitState();
+	}
+
+	protected abstract void enterState();
+
+	protected abstract void exitState();
+
+	protected abstract void enterPopupBlockingState();
+
+	protected abstract void exitPopupBlockingState();
+
+	public void doHandleKeyDown(int keyCode) {
+		if(currentPopup != null) {
+			currentPopup.doHandleKeyDown(keyCode);
+		}else {
+			handleKeyDown(keyCode);
+		}
+	}
+
+	public void doHandleKeyUp(int keyCode) {
+		if(currentPopup != null) {
+			currentPopup.doHandleKeyUp(keyCode);
+		}else {
+			handleKeyUp(keyCode);
+		}
+	}
+
+	public void doHandleKeyRepeat(int keyCode) {
+		if(currentPopup != null) {
+			currentPopup.doHandleKeyRepeat(keyCode);
+		}else {
+			handleKeyRepeat(keyCode);
+		}
+	}
+
+	public void doHandleOnChange(HTMLElement element) {
+		if(currentPopup != null) {
+			currentPopup.doHandleOnChange(element);
+		}else {
+			handleOnChanged(element);
+		}
+	}
+
+	public void doHandleOnClick(HTMLElement element) {
+		if(currentPopup != null) {
+			currentPopup.doHandleOnClick(element);
+		}else {
+			handleOnClick(element);
+		}
+	}
+
+	public void doHandleOnMouseOver(HTMLElement element) {
+		if(currentPopup != null) {
+			currentPopup.doHandleOnMouseOver(element);
+		}else {
+			handleOnMouseOver(element);
+		}
+	}
+
+	public void doUpdate() {
+		if(currentPopup != null) {
+			currentPopup.doUpdate();
+		}else {
+			update();
+		}
+	}
+
+	protected abstract void handleKeyDown(int keyCode);
+
+	protected abstract void handleKeyUp(int keyCode);
+
+	protected abstract void handleKeyRepeat(int keyCode);
+
+	protected abstract void handleOnChanged(HTMLElement htmlElement);
+
+	protected abstract void handleOnClick(HTMLElement htmlElement);
+
+	protected abstract void handleOnMouseOver(HTMLElement htmlElement);
+
+	protected abstract void update();
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateBoot.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateBoot.java
new file mode 100755
index 0000000..6de8a25
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateBoot.java
@@ -0,0 +1,583 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.BootMenuMetadata.DefaultLaunchTemplate;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.OfflineDownloadParser.ParsedOfflineAdapter;
+import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class MenuStateBoot extends MenuState {
+
+	private static final Logger logger = LogManager.getLogger("MenuStateBoot");
+
+	private static class BootItem implements SelectionListController.ListItem, Runnable {
+
+		private final String name;
+		private final Consumer<BootItem> runnable;
+		private final Consumer<BootItem> onEdit;
+
+		private BootItem(String name, Consumer<BootItem> runnable, Consumer<BootItem> onEdit) {
+			this.name = name;
+			this.runnable = runnable;
+			this.onEdit = onEdit;
+		}
+
+		@Override
+		public String getName() {
+			return name;
+		}
+
+		@Override
+		public void run() {
+			runnable.accept(this);
+		}
+
+	}
+
+	protected SelectionListController<BootItem> selectionController;
+
+	private static enum EnumImportExportMenu {
+		IMPORT_CLIENT("Import Client"),
+		EXPORT_CLIENT("Export Client"),
+		EXPORT_OFFLINE_BUNDLE("Export Offline Bundle"),
+		CANCEL("Cancel");
+		
+		private final String str;
+		
+		private EnumImportExportMenu(String str) {
+			this.str = str;
+		}
+
+		@Override
+		public String toString() {
+			return str;
+		}
+
+	}
+
+	private static final List<EnumImportExportMenu> OPTIONS_NO_BUNDLE = Arrays.asList(
+			EnumImportExportMenu.IMPORT_CLIENT, EnumImportExportMenu.EXPORT_CLIENT, EnumImportExportMenu.CANCEL);
+
+	private static final List<EnumImportExportMenu> OPTIONS_BUNDLE = Arrays.asList(EnumImportExportMenu.IMPORT_CLIENT,
+			EnumImportExportMenu.EXPORT_CLIENT, EnumImportExportMenu.EXPORT_OFFLINE_BUNDLE,
+			EnumImportExportMenu.CANCEL);
+
+	private static enum EnumImportModeMenu {
+		AUTO_DETECT("Auto Detect"),
+		EAGLERCRAFT_EPK_FILE(".EPK Client Archive"),
+		EAGLERCRAFTX_1_8_OFFLINE("EaglercraftX 1.8 Offline .HTML"),
+		EAGLERCRAFTX_1_8_SIGNED("EaglercraftX 1.8 Signed .HTML"),
+		EAGLERCRAFTX_1_8_FAT_OFFLINE("EaglercraftX 1.8 Fat Offline .HTML"),
+		EAGLERCRAFTX_1_8_FAT_SIGNED("EaglercraftX 1.8 Fat Signed .HTML"),
+		EAGLERCRAFT_1_5_NEW_OFFLINE("Eaglercraft 1.5.2 Offline .HTML (post-22w34a)"),
+		EAGLERCRAFT_1_5_OLD_OFFLINE("Eaglercraft 1.5.2 Offline .HTML (pre-22w34a)"),
+		EAGLERCRAFT_BETA_B1_3_OFFLINE("Eaglercraft Beta 1.3 Offline .HTML"),
+		PEYTONPLAYZ585_BETA_1_7_3("PeytonPlayz585 Beta 1.7.3 Offline .HTML"),
+		PEYTONPLAYZ585_ALPHA_1_2_6("PeytonPlayz585 Alpha 1.2.6 Offline .HTML"),
+		PEYTONPLAYZ585_INDEV("PeytonPlayz585 Indev Offline .HTML"),
+		CANCEL("Cancel");
+		
+		private final String str;
+		
+		private EnumImportModeMenu(String str) {
+			this.str = str;
+		}
+
+		@Override
+		public String toString() {
+			return str;
+		}
+
+	}
+
+	private static enum EnumUnsignedClientAction {
+		DOWNLOAD_OFFLINE("Download Client"),
+		DOWNLOAD_EAGLERX_OFFLINE("Download EaglercraftX"),
+		CANCEL("Cancel");
+		
+		private final String str;
+		
+		private EnumUnsignedClientAction(String str) {
+			this.str = str;
+		}
+		
+		@Override
+		public String toString() {
+			return str;
+		}
+	}
+
+	public static void displayUnsignedError(final MenuState parentState, final Consumer<IProgressMsgCallback> onDownloadOffline, final Runnable onDone) {
+		parentState.changePopupState(new MenuPopupStateConfirmation<EnumUnsignedClientAction>(
+				"Error: This client does not have a valid signature!\n\nUnsigned clients are disabled on this website",
+				Arrays.asList(EnumUnsignedClientAction.values())) {
+			@Override
+			protected void selectCallback(EnumUnsignedClientAction enumValue) {
+				switch(enumValue) {
+				case DOWNLOAD_OFFLINE:
+					MenuPopupStateLoading loadingScreen = new MenuPopupStateLoading("Downloading client...");
+					parentState.changePopupState(loadingScreen);
+					try {
+						onDownloadOffline.accept(loadingScreen);
+					}catch(Throwable t) {
+						logger.error("Failed to invoke download offline function!");
+						logger.error(t);
+						parentState.changePopupState(new MenuPopupStateConfirmation<String>(
+								"Error: Failed to download!\n\n" + t.toString(),
+								Arrays.asList("OK")) {
+							@Override
+							protected void selectCallback(String enumValue) {
+								onDone.run();
+							}
+						});
+						return;
+					}
+					onDone.run();
+					break;
+				case DOWNLOAD_EAGLERX_OFFLINE:
+					loadingScreen = new MenuPopupStateLoading("Downloading client...");
+					parentState.changePopupState(loadingScreen);
+					try {
+						BootableClientEntry.getOriginClient().bootAdapter.downloadOffline(loadingScreen);
+					}catch(Throwable t) {
+						logger.error("Failed to invoke download offline function!");
+						logger.error(t);
+						parentState.changePopupState(new MenuPopupStateConfirmation<String>(
+								"Error: Failed to download!\n\n" + t.toString(),
+								Arrays.asList("OK")) {
+							@Override
+							protected void selectCallback(String enumValue) {
+								onDone.run();
+							}
+						});
+						return;
+					}
+					onDone.run();
+					break;
+				case CANCEL:
+				default:
+					onDone.run();
+					break;
+				}
+			}
+		});
+	}
+
+	protected int bootCountDown = 0;
+	protected int bootCountDownCur = 0;
+	protected long bootCountDownStart = 0l;
+	protected boolean doCountDown;
+
+	public MenuStateBoot(boolean doCountDown) {
+		this.doCountDown = doCountDown;
+		List<BootItem> list = new ArrayList<>();
+		final List<BootableClientEntry> bootableClients = BootableClientEntry.enumerateBootableClients();
+		if(BootableClientEntry.applyClientOrdering(BootMenuMain.bootMenuDataManager.launchOrderList, bootableClients)) {
+			BootMenuMain.bootMenuDataManager.writeManifest();
+		}
+		for(int i = 0, l = bootableClients.size(); i < l; ++i) {
+			final BootableClientEntry etr = bootableClients.get(i);
+			list.add(new BootItem(etr.bootAdapter.getDisplayName(),
+					(itm) -> {
+						MenuPopupStateLoading popupState = new MenuPopupStateLoading("Booting: '" + itm.name + "'...");
+						MenuStateBoot.this.changePopupState(popupState);
+						BootMenuMain.runLaterMS(() -> {
+							try {
+								etr.bootAdapter.bootClient(popupState);
+							}catch(UnsignedBootException ex) {
+								displayUnsignedError(MenuStateBoot.this, etr.bootAdapter::downloadOffline, () -> {
+									MenuStateBoot.this.changePopupState(null);
+								});
+								return;
+							}catch(Throwable t) {
+								logger.error("Failed to boot client!");
+								logger.error(t);
+								changePopupState(new MenuPopupStateConfirmation<String>("Error: Failed to boot client!\n\n" + t.toString(),
+										Arrays.asList("OK")) {
+									@Override
+									protected void selectCallback(String enumValue) {
+										MenuStateBoot.this.changePopupState(null);
+									}
+								});
+								return;
+							}
+						}, 250);
+					}, (itm) -> {
+						ClientDataEntry clientData = etr.bootAdapter.getClientDataEntry();
+						LaunchConfigEntry launchConf = etr.bootAdapter.getLaunchConfigEntry();
+						if(clientData != null && launchConf != null) {
+							BootMenuMain.changeState(new MenuStateEditingLaunch(MenuStateBoot.this, launchConf.fork(),
+									clientData, false, etr.bootAdapter.getBlobLoaders()));
+						}
+					}));
+		}
+		list.add(new BootItem("Import/Export",
+				(itm) -> {
+					MenuStateBoot.this.changePopupState(MenuPopupStateSelection.createHelper("What do you wanna do?",
+							bootableClients.size() > 1 ? OPTIONS_BUNDLE : OPTIONS_NO_BUNDLE, (enumValue) -> {
+								switch(enumValue) {
+								case IMPORT_CLIENT:
+									MenuStateBoot.this.changePopupState(MenuPopupStateSelection.createHelper("Select the format of the client:",
+											Arrays.asList(EnumImportModeMenu.values()), (enumValue2) -> {
+												EnumOfflineParseType parseType = null;
+												if(enumValue2 == EnumImportModeMenu.CANCEL) {
+													MenuStateBoot.this.changePopupState(null);
+													return;
+												}else if(enumValue2 != EnumImportModeMenu.AUTO_DETECT) {
+													switch(enumValue2) {
+													case EAGLERCRAFTX_1_8_OFFLINE: parseType = EnumOfflineParseType.EAGLERCRAFTX_1_8_OFFLINE; break;
+													case EAGLERCRAFTX_1_8_SIGNED: parseType = EnumOfflineParseType.EAGLERCRAFTX_1_8_SIGNED; break;
+													case EAGLERCRAFTX_1_8_FAT_OFFLINE: parseType = EnumOfflineParseType.EAGLERCRAFTX_1_8_FAT_OFFLINE; break;
+													case EAGLERCRAFTX_1_8_FAT_SIGNED: parseType = EnumOfflineParseType.EAGLERCRAFTX_1_8_FAT_SIGNED; break;
+													case EAGLERCRAFT_1_5_NEW_OFFLINE: parseType = EnumOfflineParseType.EAGLERCRAFT_1_5_NEW_OFFLINE; break;
+													case EAGLERCRAFT_1_5_OLD_OFFLINE: parseType = EnumOfflineParseType.EAGLERCRAFT_1_5_OLD_OFFLINE; break;
+													case EAGLERCRAFT_BETA_B1_3_OFFLINE: parseType = EnumOfflineParseType.EAGLERCRAFT_BETA_B1_3_OFFLINE; break;
+													case PEYTONPLAYZ585_BETA_1_7_3: parseType = EnumOfflineParseType.PEYTONPLAYZ585_ALPHA_BETA; break;
+													case PEYTONPLAYZ585_ALPHA_1_2_6: parseType = EnumOfflineParseType.PEYTONPLAYZ585_ALPHA_BETA; break;
+													case PEYTONPLAYZ585_INDEV: parseType = EnumOfflineParseType.PEYTONPLAYZ585_INDEV; break;
+													case EAGLERCRAFT_EPK_FILE: parseType = EnumOfflineParseType.EAGLERCRAFT_EPK_FILE; break;
+													default:
+														MenuStateBoot.this.changePopupState(null);
+														return;
+													}
+												}
+												String mime = parseType == EnumOfflineParseType.EAGLERCRAFT_EPK_FILE ? null : "text/html";
+												String ext = parseType == EnumOfflineParseType.EAGLERCRAFT_EPK_FILE ? "epk" : "html";
+												final EnumOfflineParseType parseTypeF = parseType;
+												MenuStateBoot.this.changePopupState(new MenuPopupStateFileChooser("Importing client...", mime, ext) {
+													@Override
+													protected void onResult(FileChooserResult res) {
+														if(res != null) {
+															MenuPopupStateLoading loadingScreen = new MenuPopupStateLoading("Importing client...");
+															MenuStateBoot.this.changePopupState(loadingScreen);
+															EagUtils.sleep(50l);
+															String offlineData = new String(res.fileData, StandardCharsets.UTF_8).replace("\r\n", "\n");
+															EnumOfflineParseType parseType2 = parseTypeF;
+															if(parseType2 == null) {
+																loadingScreen.updateMessage("Detecting type...");
+																try {
+																	parseType2 = OfflineDownloadParser.detectOfflineType(offlineData);
+																	if(parseType2 == null) {
+																		throw new IllegalStateException("Failed to detect offline download type!");
+																	}
+																}catch(Throwable t) {
+																	MenuStateBoot.this.changePopupState(new MenuPopupStateConfirmation<EnumImportModeMenu>(
+																			t.toString(), Arrays.asList(EnumImportModeMenu.CANCEL)) {
+																		@Override
+																		protected void selectCallback(EnumImportModeMenu enumValue) {
+																			MenuStateBoot.this.changePopupState(null);
+																			return;
+																		}
+																	});
+																	return;
+																}
+															}
+															loadingScreen.updateMessage("Parsing file...");
+															List<ParsedOfflineAdapter> parsedOfflines;
+															try {
+																if(parseType2 == EnumOfflineParseType.EAGLERCRAFT_EPK_FILE) {
+																	parsedOfflines = EPKClientParser.parseEPKClient(res.fileData);
+																}else {
+																	parsedOfflines = OfflineDownloadParser.parseOffline(parseType2, offlineData);
+																}
+																if(parsedOfflines == null || parsedOfflines.size() == 0) {
+																	throw new IllegalStateException("Failed to parse the file as \"" + parseType2 + "\"!");
+																}
+															}catch(Throwable t) {
+																MenuStateBoot.this.changePopupState(new MenuPopupStateConfirmation<EnumImportModeMenu>(
+																		t.toString(), Arrays.asList(EnumImportModeMenu.CANCEL)) {
+																	@Override
+																	protected void selectCallback(EnumImportModeMenu enumValue) {
+																		MenuStateBoot.this.changePopupState(null);
+																	}
+																});
+																return;
+															}
+															if(parsedOfflines.size() == 1) {
+																ParsedOfflineAdapter pp = parsedOfflines.get(0);
+																if(pp.launchData == null) {
+																	List<DefaultLaunchTemplate> templates = BootMenuMain.bootMenuMetadata.getTemplatesForParseType(pp.parseType);
+																	if(templates.size() == 0) {
+																		throw new IllegalStateException("Missing default launch type for parse type: " + pp.parseType);
+																	}
+																	if(templates.size() == 1) {
+																		EaglercraftUUID rotatedLaunchUUID = EaglercraftUUID.randomUUID();
+																		EaglercraftUUID rotatedClientUUID = EaglercraftUUID.randomUUID();
+																		LaunchConfigEntry launchConfig = templates.get(0).createLaunchConfig(rotatedLaunchUUID, rotatedClientUUID);
+																		ClientDataEntry clientData = pp.clientData.rotateUUID(rotatedClientUUID);
+																		MenuStateBoot.this.changePopupState(null);
+																		BootMenuMain.changeState(MenuStateEditingLaunch.createHelper(MenuStateBoot.this, launchConfig, clientData, true, pp.blobs));
+																	}else {
+																		MenuStateBoot.this.changePopupState(
+																				MenuPopupStateSelection.createHelper(
+																						"Please select the template launch configuration to use:",
+																						templates, (template) -> {
+																			if(template != null) {
+																				EaglercraftUUID rotatedLaunchUUID = EaglercraftUUID.randomUUID();
+																				EaglercraftUUID rotatedClientUUID = EaglercraftUUID.randomUUID();
+																				LaunchConfigEntry launchConfig = template.createLaunchConfig(rotatedLaunchUUID, rotatedClientUUID);
+																				ClientDataEntry clientData = pp.clientData.rotateUUID(rotatedClientUUID);
+																				MenuStateBoot.this.changePopupState(null);
+																				BootMenuMain.changeState(MenuStateEditingLaunch.createHelper(MenuStateBoot.this, launchConfig, clientData, true, pp.blobs));
+																			}else {
+																				MenuStateBoot.this.changePopupState(null);
+																			}
+																		}));
+																	}
+																}else {
+																	EaglercraftUUID rotatedLaunchUUID = EaglercraftUUID.randomUUID();
+																	EaglercraftUUID rotatedClientUUID = EaglercraftUUID.randomUUID();
+																	LaunchConfigEntry launchConfig = pp.launchData.rotateUUIDs(rotatedLaunchUUID, rotatedClientUUID);
+																	ClientDataEntry clientData = pp.clientData.rotateUUID(rotatedClientUUID);
+																	MenuStateBoot.this.changePopupState(null);
+																	BootMenuMain.changeState(MenuStateEditingLaunch.createHelper(MenuStateBoot.this, launchConfig, clientData, true, pp.blobs));
+																}
+															}else {
+																MenuStateBoot.this.changePopupState(null);
+																BootMenuMain.changeState(new MenuStateImportMultiSelect(MenuStateBoot.this, parsedOfflines));
+															}
+														}else {
+															MenuStateBoot.this.changePopupState(null);
+															return;
+														}
+													}
+												});
+												
+											}));
+									break;
+								case EXPORT_CLIENT:
+									final MenuState[] formatSelState = new MenuState[1];
+									formatSelState[0] = MenuPopupStateSelection.createHelper("Select the format of the client:",
+											Arrays.asList(EnumImportModeMenu.AUTO_DETECT, EnumImportModeMenu.EAGLERCRAFT_EPK_FILE,
+													EnumImportModeMenu.EAGLERCRAFTX_1_8_OFFLINE,
+													EnumImportModeMenu.EAGLERCRAFTX_1_8_SIGNED,
+													EnumImportModeMenu.EAGLERCRAFT_1_5_NEW_OFFLINE,
+													EnumImportModeMenu.EAGLERCRAFT_1_5_OLD_OFFLINE,
+													EnumImportModeMenu.EAGLERCRAFT_BETA_B1_3_OFFLINE,
+													EnumImportModeMenu.PEYTONPLAYZ585_BETA_1_7_3,
+													EnumImportModeMenu.PEYTONPLAYZ585_ALPHA_1_2_6,
+													EnumImportModeMenu.PEYTONPLAYZ585_INDEV,
+													EnumImportModeMenu.CANCEL), (enumValue2) -> {
+												List<BootableClientEntry> filteredList;
+												if(enumValue2 == EnumImportModeMenu.CANCEL) {
+													MenuStateBoot.this.changePopupState(null);
+													return;
+												}else if(enumValue2 == EnumImportModeMenu.AUTO_DETECT || enumValue2 == EnumImportModeMenu.EAGLERCRAFT_EPK_FILE) {
+													filteredList = bootableClients;
+												}else {
+													filteredList = Lists.newArrayList(Collections2.filter(bootableClients, (etr) -> {
+														switch(enumValue2) {
+														case EAGLERCRAFTX_1_8_OFFLINE:
+														case EAGLERCRAFT_1_5_OLD_OFFLINE:
+														case EAGLERCRAFT_BETA_B1_3_OFFLINE:
+														case PEYTONPLAYZ585_BETA_1_7_3:
+														case PEYTONPLAYZ585_ALPHA_1_2_6:
+														case PEYTONPLAYZ585_INDEV:
+															return etr.bootAdapter.getClientDataEntry().type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE;
+														case EAGLERCRAFTX_1_8_SIGNED:
+															return etr.bootAdapter.getClientDataEntry().type == EnumClientFormatType.EAGLER_SIGNED_OFFLINE;
+														case EAGLERCRAFT_1_5_NEW_OFFLINE:
+															return etr.bootAdapter.getClientDataEntry().type == EnumClientFormatType.EAGLER_STANDARD_1_5_OFFLINE;
+														default:
+															return false;
+														}
+													}));
+												}
+												if(filteredList.size() > 0) {
+													MenuStateBoot.this.changePopupState(null);
+													BootMenuMain.changeState(new MenuStateSelectExportClients(enumValue2 == EnumImportModeMenu.EAGLERCRAFT_EPK_FILE, MenuStateBoot.this, filteredList));
+												}else {
+													changePopupState(new MenuPopupStateConfirmation<String>("Error: No clients available to export!",
+															Arrays.asList("OK")) {
+														@Override
+														protected void selectCallback(String enumValue) {
+															MenuStateBoot.this.changePopupState(formatSelState[0]);
+														}
+													});
+												}
+											});
+									MenuStateBoot.this.changePopupState(formatSelState[0]);
+									break;
+								case EXPORT_OFFLINE_BUNDLE:
+									MenuStateBoot.this.changePopupState(null);
+									BootMenuMain.changeState(new MenuStateClientMultiSelect(MenuStateBoot.this, bootableClients) {
+										@Override
+										protected void onDone(List<BootableClientEntry> entries) {
+											if(entries.size() > 0) {
+												MenuPopupStateLoading popupState = new MenuPopupStateLoading("Exporting Fat Offline...");
+												this.changePopupState(popupState);
+												try {
+													FatOfflineDownloadFactory.downloadOffline(entries, popupState);
+												}catch(Throwable t) {
+													logger.error("Failed to export fat offline!");
+													logger.error(t);
+													changePopupState(new MenuPopupStateConfirmation<String>(
+															"Error: Failed to export!\n\n" + t.toString(),
+															Arrays.asList("OK")) {
+														@Override
+														protected void selectCallback(String enumValue) {
+															BootMenuMain.changeState(MenuStateBoot.this);
+														}
+													});
+													return;
+												}
+											}
+											BootMenuMain.changeState(MenuStateBoot.this);
+										}
+									});
+									break;
+								case CANCEL:
+									MenuStateBoot.this.changePopupState(null);
+									break;
+								default:
+									break;
+								}
+							}));
+				}, null));
+		list.add(new BootItem("Enter Setup",
+				(itm) -> {
+					BootMenuMain.changeState(new MenuStateEnterSetup(bootableClients));
+				}, null));
+		selectionController = new SelectionListController<BootItem>(BootMenuMain.bootMenuDOM.content_selection, list) {
+				@Override
+				protected void itemSelected(BootItem item) {
+					item.run();
+				}
+		};
+	}
+
+	@Override
+	protected void enterState() {
+		if(doCountDown) {
+			bootCountDownStart = EagRuntime.steadyTimeMillis();
+			bootCountDown = BootMenuMain.bootMenuDataManager.confBootTimeout;
+			bootCountDownCur = bootCountDown;
+		}
+		selectionController.setup();
+		if(bootCountDown > 0) {
+			BootMenuDOM.show(BootMenuMain.bootMenuDOM.footer_text_boot_select_count);
+			BootMenuMain.bootMenuDOM.footer_text_boot_countdown.setInnerText(Integer.toString(bootCountDown));
+		}else {
+			BootMenuDOM.show(BootMenuMain.bootMenuDOM.footer_text_boot_select);
+		}
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.content_view_selection);
+	}
+
+	@Override
+	protected void exitState() {
+		selectionController.destroy();
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.footer_text_boot_select);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.footer_text_boot_select_count);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.content_view_selection);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		selectionController.setCursorEventsSuspended(true);
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		selectionController.setCursorEventsSuspended(false);
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		boolean cancelEsc = bootCountDown > 0;
+		cancelCountdown();
+		if(keyCode == KeyCodes.DOM_KEY_ESCAPE) {
+			if(!cancelEsc) {
+				BootItem def = selectionController.selectionEnableList.get(0).listItem;
+				def.runnable.accept(def);
+			}
+		}else if(keyCode == KeyCodes.DOM_KEY_E) {
+			BootItem itm = selectionController.getSelected();
+			if(itm.onEdit != null) {
+				itm.onEdit.accept(itm);
+			}
+		}else {
+			selectionController.handleKeyDown(keyCode);
+		}
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		cancelCountdown();
+		selectionController.handleKeyRepeat(keyCode);
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void update() {
+		if(bootCountDown > 0) {
+			int countDownCur = bootCountDown - (int)((EagRuntime.steadyTimeMillis() - bootCountDownStart) / 1000l);
+			if(countDownCur < 0) {
+				BootItem def = selectionController.selectionEnableList.get(0).listItem;
+				def.runnable.accept(def);
+				bootCountDown = 0;
+				return;
+			}
+			if(bootCountDownCur != countDownCur) {
+				bootCountDownCur = countDownCur;
+				BootMenuMain.bootMenuDOM.footer_text_boot_countdown.setInnerText(Integer.toString(countDownCur));
+			}
+		}
+	}
+
+	public void cancelCountdown() {
+		if(bootCountDown > 0) {
+			bootCountDown = 0;
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.footer_text_boot_select_count);
+			BootMenuDOM.show(BootMenuMain.bootMenuDOM.footer_text_boot_select);
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateClientMultiSelect.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateClientMultiSelect.java
new file mode 100755
index 0000000..d704131
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateClientMultiSelect.java
@@ -0,0 +1,137 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class MenuStateClientMultiSelect extends MenuState {
+
+	protected static class BootItem implements SelectionListController.ListItem {
+
+		protected final BootableClientEntry bootableClient;
+		protected final boolean alwaysSelected;
+
+		public BootItem(BootableClientEntry bootableClient) {
+			this.bootableClient = bootableClient;
+			this.alwaysSelected = BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN
+					.equals(bootableClient.bootAdapter.getLaunchConfigEntry().uuid);
+		}
+
+		@Override
+		public String getName() {
+			return bootableClient.bootAdapter.getDisplayName();
+		}
+
+		@Override
+		public boolean getAlwaysSelected() {
+			return alwaysSelected;
+		}
+
+	}
+
+	protected MenuState parentState;
+	protected CheckboxListController<BootItem> selectionController;
+
+	public MenuStateClientMultiSelect(MenuState parentState, List<BootableClientEntry> bootableClients) {
+		this.parentState = parentState;
+		List<BootItem> list = new ArrayList<>(Collections2.transform(bootableClients, BootItem::new));
+		selectionController = new CheckboxListController<BootItem>(BootMenuMain.bootMenuDOM.content_selection, list) {
+
+			@Override
+			protected void cancelSelected() {
+				BootMenuMain.changeState(MenuStateClientMultiSelect.this.parentState);
+			}
+
+			@Override
+			protected void doneSelected(List<BootItem> selectedItems) {
+				MenuStateClientMultiSelect.this.onDone(Lists.newArrayList(Collections2.transform(selectedItems, (itm) -> itm.bootableClient)));
+			}
+
+		};
+	}
+
+	@Override
+	protected void enterState() {
+		selectionController.setup();
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.content_view_selection);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.footer_text_menu_select);
+	}
+
+	@Override
+	protected void exitState() {
+		selectionController.destroy();
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.content_view_selection);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.footer_text_menu_select);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		selectionController.setCursorEventsSuspended(true);
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		selectionController.setCursorEventsSuspended(false);
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ESCAPE) {
+			BootMenuMain.changeState(MenuStateClientMultiSelect.this.parentState);
+		}else {
+			selectionController.handleKeyDown(keyCode);
+		}
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		selectionController.handleKeyRepeat(keyCode);
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+	protected abstract void onDone(List<BootableClientEntry> entries);
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateEditBootOrder.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateEditBootOrder.java
new file mode 100755
index 0000000..d5f60f3
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateEditBootOrder.java
@@ -0,0 +1,268 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class MenuStateEditBootOrder extends MenuState {
+
+	private static final EaglercraftUUID MAGIC_UUID_CANCEL = new EaglercraftUUID(0xD13983F5B764B3DL, 0xBF2C5157DEFDB5F9L);
+	private static final EaglercraftUUID MAGIC_UUID_DONE = new EaglercraftUUID(0x1F2BBFD548DD4818L, 0xB00B79D143BBF607L);
+
+	private static final BootOrderItem CANCEL_ITEM = new BootOrderItem("Cancel", MAGIC_UUID_CANCEL);
+	private static final BootOrderItem DONE_ITEM = new BootOrderItem("Done", MAGIC_UUID_DONE);
+
+	public static class BootOrderItem implements SelectionListController.ListItem {
+
+		public final String displayName;
+		public final EaglercraftUUID uuid;
+
+		public BootOrderItem(String displayName, EaglercraftUUID uuid) {
+			this.displayName = displayName;
+			this.uuid = uuid;
+		}
+
+		@Override
+		public String getName() {
+			return displayName;
+		}
+
+	}
+
+	public static class BootOrderItemContainer {
+
+		public final EaglercraftUUID uuid;
+		public final BootOrderItem exists;
+
+		public BootOrderItemContainer(EaglercraftUUID uuid, BootOrderItem exists) {
+			this.uuid = uuid;
+			this.exists = exists;
+		}
+
+	}
+
+	protected final MenuState parent;
+	protected final SelectionListController<BootOrderItem> selectionController;
+	protected final List<BootOrderItem> existingBootItems;
+	protected final List<BootOrderItemContainer> allBootItems;
+	protected boolean controlDown = false;
+
+	public MenuStateEditBootOrder(MenuState parent) {
+		this(parent, helper());
+	}
+
+	private static List<BootableClientEntry> helper() {
+		List<BootableClientEntry> enumBootItems = BootableClientEntry.enumerateBootableClients();
+		if(BootableClientEntry.applyClientOrdering(BootMenuMain.bootMenuDataManager.launchOrderList, enumBootItems)) {
+			BootMenuMain.bootMenuDataManager.writeManifest();
+		}
+		return enumBootItems;
+	}
+
+	public MenuStateEditBootOrder(MenuState parent, List<BootableClientEntry> enumBootItems) {
+		this.parent = parent;
+		Map<EaglercraftUUID,BootableClientEntry> enumBootItemsMap = new HashMap<>(enumBootItems.size());
+		for(int i = 0, l = enumBootItems.size(); i < l; ++i) {
+			BootableClientEntry etr = enumBootItems.get(i);
+			enumBootItemsMap.put(etr.bootAdapter.getLaunchConfigEntry().uuid, etr);
+		}
+		List<BootOrderItem> lst = new ArrayList<>();
+		List<BootOrderItemContainer> lst2 = new ArrayList<>();
+		List<EaglercraftUUID> lstSrc = BootMenuMain.bootMenuDataManager.launchOrderList;
+		for(int i = 0, l = lstSrc.size(); i < l; ++i) {
+			EaglercraftUUID uuid = lstSrc.get(i);
+			BootableClientEntry etr =  enumBootItemsMap.get(uuid);
+			if(etr != null) {
+				BootOrderItem itm = new BootOrderItem(etr.bootAdapter.getDisplayName(), uuid);
+				lst.add(itm);
+				lst2.add(new BootOrderItemContainer(uuid, itm));
+			}else {
+				lst2.add(new BootOrderItemContainer(uuid, null));
+			}
+		}
+		existingBootItems = lst;
+		allBootItems = lst2;
+		List<BootOrderItem> lst3 = new ArrayList<>(lst.size() + 2);
+		lst3.addAll(lst);
+		lst3.add(CANCEL_ITEM);
+		lst3.add(DONE_ITEM);
+		selectionController = new SelectionListController<BootOrderItem>(BootMenuMain.bootMenuDOM.content_selection, lst3) {
+			@Override
+			protected void itemSelected(BootOrderItem item) {
+				if(item == DONE_ITEM) {
+					MenuStateEditBootOrder.this.fireHandleSave();
+				}else if(item == CANCEL_ITEM) {
+					MenuStateEditBootOrder.this.handleCancel();
+				}
+			}
+		};
+		selectionController.setCursorEventsSuspended(true); // mouse over events might make it hard to reorder
+	}
+
+	protected void fireHandleSave() {
+		List<EaglercraftUUID> retList = new ArrayList<>(allBootItems.size());
+		for(int i = 0, l = allBootItems.size(); i < l; ++i) {
+			retList.add(allBootItems.get(i).uuid);
+		}
+		handleSave(retList);
+	}
+
+	@Override
+	protected void enterState() {
+		selectionController.setup();
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.footer_text_boot_order);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.content_view_selection);
+	}
+
+	@Override
+	protected void exitState() {
+		selectionController.destroy();
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.footer_text_boot_order);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.content_view_selection);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ESCAPE) {
+			handleCancel();
+		}else if(keyCode == KeyCodes.DOM_KEY_CONTROL) {
+			controlDown = true;
+		}else if(controlDown && keyCode == KeyCodes.DOM_KEY_ARROW_UP) {
+			moveEntryUp();
+		}else if(controlDown && keyCode == KeyCodes.DOM_KEY_ARROW_DOWN) {
+			moveEntryDown();
+		}else {
+			selectionController.handleKeyDown(keyCode);
+		}
+	}
+
+	protected void moveEntryUp() {
+		BootOrderItem itm = selectionController.getSelected();
+		if(itm == null || itm == DONE_ITEM || itm == CANCEL_ITEM) {
+			return;
+		}
+		int index = selectionController.currentSelected;
+		if(index <= 0) {
+			return;
+		}
+		EaglercraftUUID currentUUID = itm.uuid;
+		int index2 = -1;
+		for(int i = 0, l = allBootItems.size(); i < l; ++i) {
+			BootOrderItemContainer itm2 = allBootItems.get(i);
+			if(itm2.uuid.equals(currentUUID)) {
+				index2 = i;
+				break;
+			}
+		}
+		if(index2 == -1) {
+			throw new IllegalStateException();
+		}
+		int newIndex = index - 1;
+		int newIndex2 = index2 - 1;
+		while(newIndex2 > 0 && allBootItems.get(newIndex2).exists == null) {
+			--newIndex2;
+		}
+		Collections.swap(existingBootItems, index, newIndex);
+		Collections.swap(allBootItems, index2, newIndex2);
+		selectionController.moveEntryUp(index);
+	}
+
+	protected void moveEntryDown() {
+		BootOrderItem itm = selectionController.getSelected();
+		if(itm == null || itm == DONE_ITEM || itm == CANCEL_ITEM) {
+			return;
+		}
+		int index = selectionController.currentSelected;
+		if(index >= existingBootItems.size() - 1) {
+			return;
+		}
+		EaglercraftUUID currentUUID = itm.uuid;
+		int index2 = -1;
+		for(int i = 0, l = allBootItems.size(); i < l; ++i) {
+			BootOrderItemContainer itm2 = allBootItems.get(i);
+			if(itm2.uuid.equals(currentUUID)) {
+				index2 = i;
+				break;
+			}
+		}
+		if(index2 == -1) {
+			throw new IllegalStateException();
+		}
+		int newIndex = index + 1;
+		int newIndex2 = index2 + 1;
+		while(newIndex2 < allBootItems.size() - 1 && allBootItems.get(newIndex2).exists == null) {
+			++newIndex2;
+		}
+		Collections.swap(existingBootItems, index, newIndex);
+		Collections.swap(allBootItems, index2, newIndex2);
+		selectionController.moveEntryDown(index);
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_CONTROL) {
+			controlDown = false;
+		}
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		selectionController.handleKeyDown(keyCode);
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+	protected abstract void handleSave(List<EaglercraftUUID> reorderedList);
+
+	protected abstract void handleCancel();
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateEditingLaunch.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateEditingLaunch.java
new file mode 100755
index 0000000..a5db272
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateEditingLaunch.java
@@ -0,0 +1,674 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.teavm.jso.dom.html.HTMLElement;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.BootMenuMetadata.DefaultLaunchTemplate;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.BootMenuMetadata.LaunchTemplate;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class MenuStateEditingLaunch extends MenuState {
+
+	private static final Logger logger = LogManager.getLogger("MenuStateEditingLaunch");
+
+	protected final MenuState previousMenu;
+	protected final LaunchConfigEntry launchConf;
+	protected final ClientDataEntry clientData;
+	protected final boolean isImporting;
+	protected final Map<EaglercraftUUID, Supplier<byte[]>> importClientBlobs;
+	protected boolean controlDown = false;
+
+	public static MenuStateEditingLaunch createHelper(MenuState previousMenu, LaunchConfigEntry launchConf,
+			ClientDataEntry clientData, boolean isImporting, Map<EaglercraftUUID, byte[]> importClientBlobs) {
+		return new MenuStateEditingLaunch(previousMenu, launchConf, clientData, isImporting,
+				Maps.transformValues(importClientBlobs, (blob) -> {
+			return () -> blob;
+		}));
+	}
+
+	public MenuStateEditingLaunch(MenuState previousMenu, LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			boolean isImporting, Map<EaglercraftUUID, Supplier<byte[]>> importClientBlobs) {
+		this.previousMenu = previousMenu;
+		this.launchConf = launchConf;
+		this.clientData = clientData;
+		this.isImporting = isImporting;
+		this.importClientBlobs = importClientBlobs;
+	}
+
+	private void setVisibleControlSet() {
+		EnumClientLaunchType launchType = launchConf.type;
+		switch(launchType) {
+		case EAGLERX_V1:
+		case EAGLERX_SIGNED_V1:
+		case EAGLER_1_5_V2:
+		case PEYTON_V2:
+		case PEYTON_V1:
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_join_server);
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_opts_name);
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_assetsURI);
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_container);
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_main_func);
+			break;
+		case EAGLER_1_5_V1:
+		case EAGLER_BETA_V1:
+			BootMenuDOM.show(BootMenuMain.bootMenuDOM.launch_conf_join_server);
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_opts_name);
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_assetsURI);
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_container);
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_main_func);
+			break;
+		case STANDARD_OFFLINE_V1:
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_join_server);
+			BootMenuDOM.show(BootMenuMain.bootMenuDOM.launch_conf_opts_name);
+			BootMenuDOM.show(BootMenuMain.bootMenuDOM.launch_conf_assetsURI);
+			BootMenuDOM.show(BootMenuMain.bootMenuDOM.launch_conf_container);
+			BootMenuDOM.show(BootMenuMain.bootMenuDOM.launch_conf_main_func);
+			break;
+		}
+	}
+
+	private void setControlSetValues() {
+		BootMenuMain.bootMenuDOM.launch_conf_val_data_format.setInnerText(clientData.type.displayName);
+		EnumClientLaunchType launchType = launchConf.type;
+		BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_launch_type, launchType.toString());
+		BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_profile_name, launchConf.displayName);
+		BootMenuDOM.setChecked(BootMenuMain.bootMenuDOM.launch_conf_val_clear_cookies, launchConf.clearCookiesBeforeLaunch);
+		switch(launchType) {
+		case EAGLERX_V1:
+		case EAGLERX_SIGNED_V1:
+		case EAGLER_1_5_V2:
+		case PEYTON_V2:
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_opt_editor, tryJSONFormat(launchConf.launchOpts));
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_container, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, "");
+			break;
+		case EAGLER_1_5_V1:
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_opt_editor, launchConf.launchOpts);
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, launchConf.joinServer);
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_container, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, "");
+			break;
+		case EAGLER_BETA_V1:
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_opt_editor, "JSON opts are not supported for Eaglercraft b1.3!");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, launchConf.joinServer);
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_container, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, "");
+			break;
+		case PEYTON_V1:
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_opt_editor, "JSON opts are not supported for Indev!");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_container, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, "");
+			break;
+		case STANDARD_OFFLINE_V1:
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_opt_editor, tryJSONFormat(launchConf.launchOpts));
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, "");
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, launchConf.launchOptsVar);
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, launchConf.launchOptsAssetsURIVar);
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_container, launchConf.launchOptsContainerVar);
+			BootMenuDOM.setValue(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, launchConf.mainFunction);
+			break;
+		}
+	}
+
+	private void setEnabledControlSet() {
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_launch_type, false);
+		setEnabledLaunchTypes();
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_profile_name, false);
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_clear_cookies, false);
+		EnumClientLaunchType launchType = launchConf.type;
+		switch(launchType) {
+		case EAGLERX_V1:
+		case EAGLERX_SIGNED_V1:
+		case EAGLER_1_5_V2:
+		case PEYTON_V2:
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_opt_editor, false);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_container, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, true);
+			break;
+		case EAGLER_1_5_V1:
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_opt_editor, false);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, false);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_container, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, true);
+			break;
+		case EAGLER_BETA_V1:
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_opt_editor, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, false);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_container, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, true);
+			break;
+		case PEYTON_V1:
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_opt_editor, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_container, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, true);
+			break;
+		case STANDARD_OFFLINE_V1:
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_opt_editor, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, true);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, false);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, false);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_container, false);
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, false);
+			break;
+		}
+	}
+
+	private void readAllValues() {
+		EnumClientLaunchType newLaunchType = EnumClientLaunchType.valueOf(BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_conf_val_launch_type));
+		if(!clientData.type.launchTypes.contains(newLaunchType)) {
+			logger.error("nope!");
+			throw new IllegalStateException("nope!");
+		}
+		EnumClientLaunchType launchType = launchConf.type;
+		launchConf.type = newLaunchType;
+		launchConf.displayName = BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_conf_val_profile_name).trim();
+		launchConf.clearCookiesBeforeLaunch = BootMenuDOM.getChecked(BootMenuMain.bootMenuDOM.launch_conf_val_clear_cookies);
+		switch(launchType) {
+		case EAGLERX_V1:
+		case EAGLERX_SIGNED_V1:
+		case EAGLER_1_5_V2:
+		case PEYTON_V2:
+			launchConf.launchOpts = BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_opt_editor).trim();
+			break;
+		case EAGLER_1_5_V1:
+			launchConf.launchOpts = BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_opt_editor).trim();
+			launchConf.joinServer = BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_conf_val_join_server).trim();
+			break;
+		case EAGLER_BETA_V1:
+			launchConf.joinServer = BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_conf_val_join_server).trim();
+			break;
+		case PEYTON_V1:
+			break;
+		case STANDARD_OFFLINE_V1:
+			launchConf.launchOpts = BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_opt_editor).trim();
+			launchConf.launchOptsVar = BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name).trim();
+			launchConf.launchOptsAssetsURIVar = BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI).trim();
+			launchConf.launchOptsContainerVar = BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_conf_val_container).trim();
+			launchConf.mainFunction = BootMenuDOM.getValue(BootMenuMain.bootMenuDOM.launch_conf_val_main_func).trim();
+			break;
+		}
+	}
+
+	private void setEnabledLaunchTypes() {
+		EnumClientFormatType clientType = clientData.type;
+		Set<EnumClientLaunchType> launchTypes = clientType.launchTypes;
+		EnumClientLaunchType[] itr = EnumClientLaunchType._values();
+		for(int i = 0; i < itr.length; ++i) {
+			EnumClientLaunchType enumType = itr[i];
+			BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_launch_type_opts.get(enumType),
+					!launchTypes.contains(enumType));
+		}
+	}
+
+	private static String tryJSONFormat(String input) {
+		try {
+			return (new JSONObject(input)).toString(4);
+		}catch(JSONException ex) {
+			logger.warn("This client's JSON is corrupt! Failed to format");
+			logger.warn(ex);
+			return input;
+		}
+	}
+
+	@Override
+	protected void enterState() {
+		if(isImporting) {
+			BootMenuDOM.show(BootMenuMain.bootMenuDOM.footer_text_opts_editor_alt);
+		}else {
+			BootMenuDOM.show(BootMenuMain.bootMenuDOM.footer_text_opts_editor);
+		}
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.content_view_editor);
+		setEnabledControlSet();
+		setControlSetValues();
+		setVisibleControlSet();
+	}
+
+	@Override
+	protected void exitState() {
+		if(isImporting) {
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.footer_text_opts_editor_alt);
+		}else {
+			BootMenuDOM.hide(BootMenuMain.bootMenuDOM.footer_text_opts_editor);
+		}
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.content_view_editor);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_join_server);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_opts_name);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_assetsURI);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_container);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.launch_conf_main_func);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_opt_editor, true);
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_launch_type, true);
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_profile_name, true);
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_join_server, true);
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_opts_name, true);
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_assetsURI, true);
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_container, true);
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_main_func, true);
+		BootMenuDOM.setDisabled(BootMenuMain.bootMenuDOM.launch_conf_val_clear_cookies, true);
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		setEnabledControlSet();
+	}
+
+	public static enum EnumEditorMenu {
+		BOOT("Boot configuration"),
+		SAVE("Save configuration"),
+		SAVE_COPY("Save a copy"),
+		LOAD_DEFAULTS("Load defaults"),
+		LOAD_TEMPLATE("Load template"),
+		EXPORT_OFFLINE("Export Offline"),
+		DELETE("Delete configuration"),
+		RETURN("Return to menu"),
+		CANCEL("Cancel");
+		
+		private final String str;
+		
+		private EnumEditorMenu(String str) {
+			this.str = str;
+		}
+		
+		@Override
+		public String toString() {
+			return str;
+		}
+	}
+
+	protected static final List<EnumEditorMenu> EDITOR_MENU = Arrays.asList(EnumEditorMenu.BOOT, EnumEditorMenu.SAVE,
+			EnumEditorMenu.SAVE_COPY, EnumEditorMenu.LOAD_DEFAULTS, EnumEditorMenu.LOAD_TEMPLATE,
+			EnumEditorMenu.EXPORT_OFFLINE, EnumEditorMenu.DELETE, EnumEditorMenu.RETURN, EnumEditorMenu.CANCEL);
+
+	protected static final List<EnumEditorMenu> IMPORTER_MENU = Arrays.asList(EnumEditorMenu.SAVE,
+			EnumEditorMenu.LOAD_DEFAULTS, EnumEditorMenu.LOAD_TEMPLATE, EnumEditorMenu.EXPORT_OFFLINE,
+			EnumEditorMenu.RETURN, EnumEditorMenu.CANCEL);
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ESCAPE) {
+			returnToMenu();
+		}else if(keyCode == KeyCodes.DOM_KEY_CONTROL) {
+			controlDown = true;
+		}else if(keyCode == KeyCodes.DOM_KEY_SHIFT) {
+			if(controlDown) {
+				changePopupState(MenuPopupStateSelection.createHelper("What do you wanna do?", isImporting ? IMPORTER_MENU : EDITOR_MENU, (opt) -> {
+					switch(opt) {
+					case BOOT:
+						bootCurrentConfig();
+						break;
+					case SAVE:
+						saveAndExit();
+						break;
+					case SAVE_COPY:
+						saveCopy();
+						break;
+					case LOAD_DEFAULTS:
+						loadDefaults();
+						break;
+					case LOAD_TEMPLATE:
+						loadTemplate();
+						break;
+					case EXPORT_OFFLINE:
+						exportOffline();
+						break;
+					case DELETE:
+						deleteConfig();
+						break;
+					case RETURN:
+						returnToMenu();
+						break;
+					case CANCEL:
+					default:
+						changePopupState(null);
+						break;
+					}
+				}));
+			}
+		}else if(keyCode == KeyCodes.DOM_KEY_ENTER) {
+			if(controlDown) {
+				if(isImporting) {
+					saveAndExit();
+				}else {
+					bootCurrentConfig();
+				}
+			}
+		}
+	}
+
+	private String validateLaunchOpts() {
+		EnumClientLaunchType launchType = launchConf.type;
+		switch(launchType) {
+		case EAGLERX_V1:
+		case EAGLERX_SIGNED_V1:
+		case EAGLER_1_5_V2:
+		case PEYTON_V2:
+		case STANDARD_OFFLINE_V1:
+			try {
+				new JSONObject(launchConf.launchOpts);
+				return null;
+			}catch(JSONException ex) {
+				return ex.toString();
+			}
+		case EAGLER_1_5_V1:
+			if(!launchConf.launchOpts.startsWith("[NBT]") || !launchConf.launchOpts.endsWith("[/NBT]")) {
+				return "Content does not begin/end with \"[NBT]\" and \"[/NBT]\"";
+			}
+			try {
+				String str = launchConf.launchOpts;
+				JsonToNBT.getTagFromJson(str.substring(5, str.length() - 6).trim());
+				return null;
+			}catch(NBTException ex) {
+				return ex.toString();
+			}
+		case EAGLER_BETA_V1:
+		case PEYTON_V1:
+		default:
+			return null;
+		}
+	}
+
+	private void bootCurrentConfig() {
+		readAllValues();
+		String err = validateLaunchOpts();
+		if(err != null) {
+			changePopupState(new MenuPopupStateConfirmation<String>("Error: Invalid syntax in launch opts!\n\n" + err,
+					Arrays.asList("OK")) {
+				@Override
+				protected void selectCallback(String enumValue) {
+					MenuStateEditingLaunch.this.changePopupState(null);
+				}
+			});
+			return;
+		}
+		MenuPopupStateLoading popupState = new MenuPopupStateLoading("Booting: '" + launchConf.displayName + "'...");
+		changePopupState(popupState);
+		BootMenuMain.runLaterMS(() -> {
+			try {
+				ClientBootFactory.bootClient(launchConf, clientData, importClientBlobs, popupState);
+			}catch(UnsignedBootException ex) {
+				MenuStateBoot.displayUnsignedError(MenuStateEditingLaunch.this, (cb) -> {
+					MenuStateEditingLaunch.this.exportOffline();
+				}, () -> {
+					MenuStateEditingLaunch.this.changePopupState(null);
+				});
+				return;
+			}catch(Throwable t) {
+				logger.error("Failed to boot client!");
+				logger.error(t);
+				changePopupState(new MenuPopupStateConfirmation<String>("Error: Failed to boot client!\n\n" + t.toString(),
+						Arrays.asList("OK")) {
+					@Override
+					protected void selectCallback(String enumValue) {
+						MenuStateEditingLaunch.this.changePopupState(null);
+					}
+				});
+				return;
+			}
+			try {
+				changePopupState(null);
+			}catch(Throwable t) {
+			}
+		}, 250);
+	}
+
+	private void saveAndExit() {
+		readAllValues();
+		String err = validateLaunchOpts();
+		if(err != null) {
+			changePopupState(new MenuPopupStateConfirmation<String>("Error: Invalid syntax in launch opts!\n\n" + err,
+					Arrays.asList("OK")) {
+				@Override
+				protected void selectCallback(String enumValue) {
+					MenuStateEditingLaunch.this.changePopupState(null);
+				}
+			});
+			return;
+		}
+		MenuPopupStateLoading popupState = new MenuPopupStateLoading("Saving: '" + launchConf.displayName + "'...");
+		changePopupState(popupState);
+		BootMenuMain.runLaterMS(() -> {
+			try {
+				BootMenuMain.bootMenuDataManager.installNewLaunchConfig(launchConf, clientData,
+						Maps.transformValues(importClientBlobs, (e) -> e.get()), false);
+			}catch(Throwable t) {
+				logger.error("Error: could not save launch config!");
+				logger.error(t);
+				changePopupState(new MenuPopupStateConfirmation<String>("Error: Could not save launch config!\n\n" + t.toString(),
+						Arrays.asList("OK")) {
+					@Override
+					protected void selectCallback(String enumValue) {
+						MenuStateEditingLaunch.this.changePopupState(null);
+					}
+				});
+				return;
+			}
+			BootMenuMain.changeState(new MenuStateBoot(false));
+		}, 250);
+	}
+
+	private void saveCopy() {
+		readAllValues();
+		String err = validateLaunchOpts();
+		if(err != null) {
+			changePopupState(new MenuPopupStateConfirmation<String>("Error: Invalid syntax in launch opts!\n\n" + err,
+					Arrays.asList("OK")) {
+				@Override
+				protected void selectCallback(String enumValue) {
+					MenuStateEditingLaunch.this.changePopupState(null);
+				}
+			});
+			return;
+		}
+		final LaunchConfigEntry launchConfCopy = launchConf.rotateUUIDs(EaglercraftUUID.randomUUID(), launchConf.clientDataUUID);
+		MenuPopupStateLoading popupState = new MenuPopupStateLoading("Saving: '" + launchConfCopy.displayName + "'...");
+		changePopupState(popupState);
+		BootMenuMain.runLaterMS(() -> {
+			try {
+				BootMenuMain.bootMenuDataManager.installNewLaunchConfig(launchConfCopy, clientData,
+						Maps.transformValues(importClientBlobs, (e) -> e.get()), false);
+			}catch(Throwable t) {
+				logger.error("Error: could not save launch config!");
+				logger.error(t);
+				changePopupState(new MenuPopupStateConfirmation<String>("Error: Could not save launch config!\n\n" + t.toString(),
+						Arrays.asList("OK")) {
+					@Override
+					protected void selectCallback(String enumValue) {
+						MenuStateEditingLaunch.this.changePopupState(null);
+					}
+				});
+				return;
+			}
+			BootMenuMain.changeState(new MenuStateBoot(false));
+		}, 250);
+	}
+
+	private void loadDefaults() {
+		LaunchTemplate def = BootMenuMain.bootMenuMetadata.formatDefaultOptsMap.get(launchConf.type);
+		if(def != null) {
+			def.configureLaunchConfig(launchConf);
+			setControlSetValues();
+			changePopupState(null);
+		}else {
+			changePopupState(new MenuPopupStateConfirmation<String>("Error: Could not find default config!",
+					Arrays.asList("OK")) {
+				@Override
+				protected void selectCallback(String enumValue) {
+					MenuStateEditingLaunch.this.changePopupState(null);
+				}
+			});
+		}
+	}
+
+	private void loadTemplate() {
+		List<DefaultLaunchTemplate> templates = BootMenuMain.bootMenuMetadata.getTemplatesForParseType(EnumOfflineParseType.inferFromClientFormat(launchConf.type));
+		if(templates != null && !templates.isEmpty()) {
+			List<Object> listWithCancel = Lists.newArrayList(templates);
+			listWithCancel.add("Cancel");
+			changePopupState(MenuPopupStateSelection.createHelper("Select the template you would like to load:", listWithCancel, (template) -> {
+				if(template != null) {
+					if(!"Cancel".equals(template)) {
+						((DefaultLaunchTemplate)template).templateState.configureLaunchConfig(launchConf);
+						setControlSetValues();
+						changePopupState(null);
+					}else {
+						changePopupState(null);
+					}
+				}
+			}));
+		}else {
+			changePopupState(new MenuPopupStateConfirmation<String>("Error: Could not find any templates!",
+					Arrays.asList("OK")) {
+				@Override
+				protected void selectCallback(String enumValue) {
+					MenuStateEditingLaunch.this.changePopupState(null);
+				}
+			});
+		}
+	}
+
+	private void exportOffline() {
+		readAllValues();
+		String err = validateLaunchOpts();
+		if(err != null) {
+			changePopupState(new MenuPopupStateConfirmation<String>("Error: Invalid syntax in launch opts!\n\n" + err,
+					Arrays.asList("OK")) {
+				@Override
+				protected void selectCallback(String enumValue) {
+					MenuStateEditingLaunch.this.changePopupState(null);
+				}
+			});
+			return;
+		}
+		MenuPopupStateLoading popupState = new MenuPopupStateLoading("Exporting: '" + launchConf.displayName + "'...");
+		changePopupState(popupState);
+		BootMenuMain.runLaterMS(() -> {
+			try {
+				OfflineDownloadFactory.downloadOffline(launchConf, clientData, importClientBlobs, popupState);
+			}catch(Throwable t) {
+				logger.error("Failed to export offline!");
+				logger.error(t);
+				changePopupState(new MenuPopupStateConfirmation<String>("Error: Failed to export offline!\n\n" + t.toString(),
+						Arrays.asList("OK")) {
+					@Override
+					protected void selectCallback(String enumValue) {
+						MenuStateEditingLaunch.this.changePopupState(null);
+					}
+				});
+				return;
+			}
+			MenuStateEditingLaunch.this.changePopupState(null);
+		}, 250);
+		
+	}
+
+	private void deleteConfig() {
+		changePopupState(new MenuPopupStateLoading("Deleting: '" + launchConf.displayName + "'..."));
+		BootMenuMain.runLaterMS(() -> {
+			try {
+				BootMenuMain.bootMenuDataManager.deleteLaunchConfig(launchConf.uuid);
+			}finally {
+				BootMenuMain.changeState(new MenuStateBoot(false));
+			}
+		}, 250);
+	}
+
+	private void returnToMenu() {
+		if(previousMenu != null) {
+			BootMenuMain.changeState(previousMenu);
+		}
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_CONTROL) {
+			controlDown = false;
+		}
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		if(BootMenuMain.bootMenuDOM.launch_conf_val_launch_type == htmlElement) {
+			EnumClientLaunchType launchType = launchConf.type;
+			readAllValues();
+			if(launchConf.type != launchType) {
+				setEnabledControlSet();
+				setControlSetValues();
+				setVisibleControlSet();
+			}
+		}
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateEnterSetup.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateEnterSetup.java
new file mode 100755
index 0000000..4a8e5e6
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateEnterSetup.java
@@ -0,0 +1,261 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.teavm.jso.dom.html.HTMLElement;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class MenuStateEnterSetup extends MenuState {
+
+	private static enum EnumListMultiSelectType {
+		CHECKBOX_ALWAYS_SHOW, SUBMENU_BOOT_ORDER, SUBMENU_DELETE_ITEM, AUTOMATIC_BOOT_TIMEOUT, SUBMENU_CHANGE_TITLE, DONE;
+	}
+
+	private static class MenuItem implements SelectionListController.ListItem {
+
+		private final EnumListMultiSelectType type;
+		private final String displayName;
+
+		private MenuItem(EnumListMultiSelectType type, String displayName) {
+			this.type = type;
+			this.displayName = displayName;
+		}
+
+		@Override
+		public String getName() {
+			return displayName;
+		}
+
+	}
+
+	protected SelectionListController<MenuItem> selectionController;
+
+	public MenuStateEnterSetup(List<BootableClientEntry> bootableClients) {
+		int bootFlagsRet = BootMenuDataManager.getBootMenuFlags(BootMenuMain.win);
+		final int bootFlags = bootFlagsRet == -1 ? 0 : bootFlagsRet;
+		final boolean[] alwaysShowState = new boolean[] { (bootFlags & 1) != 0 };
+		int timeout = BootMenuMain.bootMenuDataManager.confBootTimeout;
+		selectionController = new SelectionListController<MenuItem>(BootMenuMain.bootMenuDOM.content_selection, Arrays.asList(
+					new MenuItem(EnumListMultiSelectType.CHECKBOX_ALWAYS_SHOW, (alwaysShowState[0] ? "[X]" : "[ ]") + " Always show boot menu on launch"),
+					new MenuItem(EnumListMultiSelectType.SUBMENU_BOOT_ORDER, "Change Boot Order"),
+					new MenuItem(EnumListMultiSelectType.SUBMENU_DELETE_ITEM, "Delete Boot Item"),
+					new MenuItem(EnumListMultiSelectType.AUTOMATIC_BOOT_TIMEOUT, "Automatic Boot Timeout: " + (timeout == 0 ? "Disabled" : timeout)),
+					new MenuItem(EnumListMultiSelectType.SUBMENU_CHANGE_TITLE, "Change Menu Title"),
+					new MenuItem(EnumListMultiSelectType.DONE, "Done")
+				)) {
+
+			@Override
+			public void handleKeyDown(int keyCode) {
+				if(keyCode == KeyCodes.DOM_KEY_SPACE) {
+					if(currentSelected == 0) { // the checkbox
+						fireSelect();
+					}
+				}else {
+					super.handleKeyDown(keyCode);
+				}
+			}
+
+			@Override
+			protected void itemSelectedLow(ListItemInstance<MenuItem> item) {
+				switch(item.listItem.type) {
+				case CHECKBOX_ALWAYS_SHOW:
+					alwaysShowState[0] = !alwaysShowState[0];
+					BootMenuDataManager.setBootMenuFlags(BootMenuMain.win, (bootFlags & ~1) | (alwaysShowState[0] ? 1 : 0));
+					item.element.setInnerText((alwaysShowState[0] ? "[X]" : "[ ]") + " Always show boot menu on launch");
+					break;
+				case SUBMENU_BOOT_ORDER:
+					BootMenuMain.changeState(new MenuStateEditBootOrder(MenuStateEnterSetup.this, bootableClients) {
+
+						@Override
+						protected void handleSave(List<EaglercraftUUID> reorderedList) {
+							BootMenuMain.bootMenuDataManager.launchOrderList.clear();
+							BootMenuMain.bootMenuDataManager.launchOrderList.addAll(reorderedList);
+							BootableClientEntry.applyClientOrdering(BootMenuMain.bootMenuDataManager.launchOrderList, bootableClients);
+							BootMenuMain.bootMenuDataManager.writeManifest();
+							BootMenuMain.changeState(MenuStateEnterSetup.this);
+						}
+
+						@Override
+						protected void handleCancel() {
+							BootMenuMain.changeState(MenuStateEnterSetup.this);
+						}
+
+					});
+					break;
+				case SUBMENU_DELETE_ITEM:
+					List<BootableClientEntry> deletableClients = new ArrayList<>(bootableClients.size() - 1);
+					for(int i = 0, l = bootableClients.size(); i < l; ++i) {
+						BootableClientEntry etr = bootableClients.get(i);
+						if(etr.dataType == BootableClientEntry.EnumDataType.LOCAL_STORAGE) {
+							deletableClients.add(etr);
+						}
+					}
+					if(!deletableClients.isEmpty()) {
+						BootMenuMain.changeState(new MenuStateClientMultiSelect(MenuStateEnterSetup.this, deletableClients) {
+							@Override
+							protected void onDone(List<BootableClientEntry> entries) {
+								if(entries != null && !entries.isEmpty()) {
+									for(int i = 0, l = entries.size(); i < l; ++i) {
+										EaglercraftUUID toDelete = entries.get(i).bootAdapter.getLaunchConfigEntry().uuid;
+										BootMenuMain.bootMenuDataManager.deleteLaunchConfig(toDelete);
+									}
+									List<BootableClientEntry> newEnum = BootableClientEntry.enumerateBootableClients();
+									if(BootableClientEntry.applyClientOrdering(BootMenuMain.bootMenuDataManager.launchOrderList, newEnum)) {
+										BootMenuMain.bootMenuDataManager.writeManifest();
+									}
+									BootMenuMain.changeState(new MenuStateEnterSetup(newEnum));
+								}else {
+									BootMenuMain.changeState(MenuStateEnterSetup.this);
+								}
+							}
+						});
+					}else {
+						changePopupState(new MenuPopupStateConfirmation<String>(
+								"Error: No deletable clients!",
+								Arrays.asList("OK")) {
+							@Override
+							protected void selectCallback(String enumValue) {
+								MenuStateEnterSetup.this.changePopupState(null);
+							}
+						});
+					}
+					break;
+				case AUTOMATIC_BOOT_TIMEOUT:
+					MenuStateEnterSetup.this.changePopupState(new MenuPopupStateEditInteger("Enter the number of seconds, or 0 to disable:", BootMenuMain.bootMenuDataManager.confBootTimeout) {
+
+						@Override
+						protected void onSave(int i) {
+							if(i < 0) i = 0;
+							if(i != BootMenuMain.bootMenuDataManager.confBootTimeout) {
+								BootMenuMain.bootMenuDataManager.confBootTimeout = i;
+								BootMenuMain.bootMenuDataManager.saveAdditionalConf();
+								item.element.setInnerText("Automatic Boot Timeout: " + (i == 0 ? "Disabled" : i));
+							}
+							MenuStateEnterSetup.this.changePopupState(null);
+						}
+
+						@Override
+						protected void onCancel() {
+							MenuStateEnterSetup.this.changePopupState(null);
+						}
+
+					});
+					break;
+				case SUBMENU_CHANGE_TITLE:
+					MenuStateEnterSetup.this.changePopupState(new MenuPopupStateEditString(
+							"Enter the title to display on the menu:", BootMenuMain.bootMenuDataManager.confMenuTitle) {
+
+						@Override
+						protected void onSave(String str) {
+							str = str.trim();
+							if(!StringUtils.isEmpty(str) && !str.equals(BootMenuMain.bootMenuDataManager.confMenuTitle)) {
+								BootMenuMain.bootMenuDataManager.confMenuTitle = str;
+								BootMenuMain.bootMenuDataManager.saveAdditionalConf();
+								BootMenuMain.bootMenuDOM.header_title.setInnerText(str);
+							}
+							MenuStateEnterSetup.this.changePopupState(null);
+						}
+
+						@Override
+						protected void onCancel() {
+							MenuStateEnterSetup.this.changePopupState(null);
+						}
+
+					});
+					break;
+				case DONE:
+					BootMenuMain.changeState(new MenuStateBoot(false));
+					break;
+				default:
+					break;
+				}
+			}
+			@Override
+			protected void itemSelected(MenuItem item) {
+			}
+		};
+	}
+
+	@Override
+	protected void enterState() {
+		selectionController.setup();
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.content_view_selection);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.footer_text_menu_select);
+	}
+
+	@Override
+	protected void exitState() {
+		selectionController.destroy();
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.content_view_selection);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.footer_text_menu_select);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		selectionController.setCursorEventsSuspended(true);
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		selectionController.setCursorEventsSuspended(false);
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ESCAPE) {
+			BootMenuMain.changeState(new MenuStateBoot(false));
+		}else {
+			selectionController.handleKeyDown(keyCode);
+		}
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		selectionController.handleKeyRepeat(keyCode);
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateImportMultiSelect.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateImportMultiSelect.java
new file mode 100755
index 0000000..56e8837
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateImportMultiSelect.java
@@ -0,0 +1,144 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+import com.google.common.collect.Collections2;
+
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.OfflineDownloadParser.ParsedOfflineAdapter;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class MenuStateImportMultiSelect extends MenuState {
+
+	protected static class BootItem implements SelectionListController.ListItem {
+
+		protected final ParsedOfflineAdapter parsedClient;
+
+		public BootItem(ParsedOfflineAdapter parsedClient) {
+			this.parsedClient = parsedClient;
+		}
+
+		@Override
+		public String getName() {
+			return parsedClient.launchData.displayName;
+		}
+
+		@Override
+		public boolean getAlwaysSelected() {
+			return false;
+		}
+
+	}
+
+	protected MenuState parentState;
+	protected CheckboxListController<BootItem> selectionController;
+
+	public MenuStateImportMultiSelect(MenuState parentState, List<ParsedOfflineAdapter> parsedClients) {
+		this.parentState = parentState;
+		List<BootItem> list = new ArrayList<>(Collections2.transform(parsedClients, BootItem::new));
+		selectionController = new CheckboxListController<BootItem>(BootMenuMain.bootMenuDOM.content_selection, list) {
+
+			@Override
+			protected void cancelSelected() {
+				BootMenuMain.changeState(MenuStateImportMultiSelect.this.parentState);
+			}
+
+			@Override
+			protected void doneSelected(List<BootItem> selectedItems) {
+				if(selectedItems.isEmpty()) {
+					cancelSelected();
+					return;
+				}
+				MenuPopupStateLoading loadingScreen = new MenuPopupStateLoading("Importing clients...");
+				MenuStateImportMultiSelect.this.changePopupState(loadingScreen);
+				for(int i = 0, l = selectedItems.size(); i < l; ++i) {
+					loadingScreen.updateMessage("Importing (" + (i + 1) + " / " + l + ")...");
+					ParsedOfflineAdapter cl = selectedItems.get(i).parsedClient;
+					BootMenuMain.bootMenuDataManager.installNewClientData(cl.launchData, cl.clientData, cl.blobs, true);
+				}
+				BootMenuMain.changeState(new MenuStateBoot(false));
+			}
+
+		};
+	}
+
+	@Override
+	protected void enterState() {
+		selectionController.setup();
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.content_view_selection);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.footer_text_menu_select);
+	}
+
+	@Override
+	protected void exitState() {
+		selectionController.destroy();
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.content_view_selection);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.footer_text_menu_select);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		selectionController.setCursorEventsSuspended(true);
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		selectionController.setCursorEventsSuspended(false);
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ESCAPE) {
+			BootMenuMain.changeState(MenuStateImportMultiSelect.this.parentState);
+		}else {
+			selectionController.handleKeyDown(keyCode);
+		}
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		selectionController.handleKeyRepeat(keyCode);
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateSelectExportClients.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateSelectExportClients.java
new file mode 100755
index 0000000..97f38a7
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateSelectExportClients.java
@@ -0,0 +1,151 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class MenuStateSelectExportClients extends MenuState {
+
+	private static final Logger logger = LogManager.getLogger("MenuStateSelectExportClients");
+
+	private static class BootItem implements SelectionListController.ListItem {
+
+		private final BootableClientEntry bootEntry;
+		private final Consumer<BootableClientEntry> onSelected;
+
+		public BootItem(BootableClientEntry bootEntry, Consumer<BootableClientEntry> onSelected) {
+			this.bootEntry = bootEntry;
+			this.onSelected = onSelected;
+		}
+
+		@Override
+		public String getName() {
+			return bootEntry.bootAdapter.getDisplayName();
+		}
+
+	}
+
+	protected final boolean exportEPK;
+	protected final MenuState parentState;
+	protected SelectionListController<BootItem> selectionController;
+
+	public MenuStateSelectExportClients(boolean exportEPK, MenuStateBoot parentState, List<BootableClientEntry> filteredList) {
+		this.exportEPK = exportEPK;
+		this.parentState = parentState;
+		List<BootItem> lst = new ArrayList<>(filteredList.size());
+		for(int i = 0, l = filteredList.size(); i < l; ++i) {
+			lst.add(new BootItem(filteredList.get(i), (etr) -> {
+				MenuPopupStateLoading popupState = new MenuPopupStateLoading("Downloading: '" + etr.bootAdapter.getDisplayName() + "'...");
+				MenuStateSelectExportClients.this.changePopupState(popupState);
+				BootMenuMain.runLaterMS(() -> {
+					try {
+						if(exportEPK) {
+							etr.bootAdapter.downloadEPK(popupState);
+						}else {
+							etr.bootAdapter.downloadOffline(popupState);
+						}
+					}catch(Throwable t) {
+						logger.error("Failed to download client!");
+						logger.error(t);
+						changePopupState(new MenuPopupStateConfirmation<String>("Error: Failed to download client!\n\n" + t.toString(),
+								Arrays.asList("OK")) {
+							@Override
+							protected void selectCallback(String enumValue) {
+								BootMenuMain.changeState(parentState);
+							}
+						});
+						return;
+					}
+					BootMenuMain.changeState(parentState);
+				}, 250);
+			}));
+		}
+		selectionController = new SelectionListController<BootItem>(BootMenuMain.bootMenuDOM.content_selection, lst) {
+			@Override
+			protected void itemSelected(BootItem item) {
+				item.onSelected.accept(item.bootEntry);
+			}
+		};
+	}
+
+	@Override
+	protected void enterState() {
+		selectionController.setup();
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.content_view_selection);
+		BootMenuDOM.show(BootMenuMain.bootMenuDOM.footer_text_menu_select);
+	}
+
+	@Override
+	protected void exitState() {
+		selectionController.destroy();
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.content_view_selection);
+		BootMenuDOM.hide(BootMenuMain.bootMenuDOM.footer_text_menu_select);
+	}
+
+	@Override
+	protected void enterPopupBlockingState() {
+		selectionController.setCursorEventsSuspended(true);
+	}
+
+	@Override
+	protected void exitPopupBlockingState() {
+		selectionController.setCursorEventsSuspended(false);
+	}
+
+	@Override
+	protected void handleKeyDown(int keyCode) {
+		selectionController.handleKeyDown(keyCode);
+	}
+
+	@Override
+	protected void handleKeyUp(int keyCode) {
+		
+	}
+
+	@Override
+	protected void handleKeyRepeat(int keyCode) {
+		selectionController.handleKeyRepeat(keyCode);
+	}
+
+	@Override
+	protected void handleOnChanged(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnClick(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void handleOnMouseOver(HTMLElement htmlElement) {
+		
+	}
+
+	@Override
+	protected void update() {
+		
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/OfflineDownloadFactory.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/OfflineDownloadFactory.java
new file mode 100755
index 0000000..32f8626
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/OfflineDownloadFactory.java
@@ -0,0 +1,613 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import com.google.common.html.HtmlEscapers;
+
+import net.lax1dude.eaglercraft.v1_8.Base64;
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.update.CertificateInvalidException;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateCertificate;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class OfflineDownloadFactory {
+
+	private static final Logger logger = LogManager.getLogger("OfflineDownloadFactory");
+
+	public static void downloadOffline(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			Map<EaglercraftUUID, Supplier<byte[]>> loaders, IProgressMsgCallback cb) {
+		EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCache = new EaglerLoadingCache<EaglercraftUUID, byte[]>((uuid) -> {
+			Supplier<byte[]> sup = loaders.get(uuid);
+			return sup != null ? sup.get() : null;
+		});
+		switch(launchConf.type) {
+		case STANDARD_OFFLINE_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				downloadClientStandardOffline(launchConf, clientData, loadingCache, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for STANDARD_OFFLINE_V1!");
+			}
+			break;
+		case EAGLERX_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				downloadClientEaglerX18(launchConf, clientData, loadingCache, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for EAGLERX_V1!");
+			}
+			break;
+		case EAGLERX_SIGNED_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_SIGNED_OFFLINE) {
+				downloadClientEaglerX18Signed(launchConf, clientData, loadingCache, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for EAGLERX_SIGNED_V1!");
+			}
+			break;
+		case EAGLER_1_5_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				downloadClientEagler15Old(launchConf, clientData, loadingCache, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for EAGLER_1_5_V1!");
+			}
+			break;
+		case EAGLER_1_5_V2:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_1_5_OFFLINE) {
+				downloadClientEagler15New(launchConf, clientData, loadingCache, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for EAGLER_1_5_V2!");
+			}
+			break;
+		case EAGLER_BETA_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				downloadClientEaglerB13(launchConf, clientData, loadingCache, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for EAGLER_1_5_V2!");
+			}
+			break;
+		case PEYTON_V1:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				downloadClientPeytonIndev(launchConf, clientData, loadingCache, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for PEYTON_V1!");
+			}
+			break;
+		case PEYTON_V2:
+			if(clientData.type == EnumClientFormatType.EAGLER_STANDARD_OFFLINE) {
+				downloadClientPeytonAlphaBeta(launchConf, clientData, loadingCache, cb);
+			}else {
+				throw new UnsupportedOperationException("Wrong client data type " + clientData.type + " for PEYTON_V2!");
+			}
+			break;
+		}
+	}
+
+	static String loadTemplate(String name) {
+		name = "/assets/eagler/boot_menu/" + name;
+		String template = BootMenuAssets.loadResourceString(name);
+		if(template == null) {
+			throw new NullPointerException("Could not locate offline download template: " + name);
+		}
+		return template;
+	}
+
+	private static void doUpdateMessage(IProgressMsgCallback cb, String str) {
+		logger.info(str);
+		cb.updateMessage(str);
+	}
+
+	private static void downloadClientEaglerX18(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCache, IProgressMsgCallback cb) {
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		byte[] classesJSBytes = loadingCache.get(clientData.mainPayload);
+		if(classesJSBytes == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		String assetsEPKVal;
+		int epkNum = clientData.epkFiles.size();
+		if(epkNum > 1 || !StringUtils.isEmpty(clientData.epkFiles.get(0).extractTo)) {
+			StringBuilder assetsEPKBuilder = new StringBuilder("[ ");
+			for(int i = 0; i < epkNum; ++i) {
+				EPKDataEntry epk = clientData.epkFiles.get(i);
+				doUpdateMessage(cb, "Resolving assets.epk (" + epk.dataUUID + ", path: /" + epk.extractTo + ")");
+				byte[] epkData = loadingCache.get(epk.dataUUID);
+				if(epkData == null) {
+					String msg = "Could not resolve assets.epk! (" + epk.dataUUID + ", path: /" + epk.extractTo + ")";
+					logger.error(msg);
+					throw new NullPointerException(msg);
+				}
+				if(i > 0) {
+					assetsEPKBuilder.append(", ");
+				}
+				assetsEPKBuilder.append("{ url: \"data:application/octet-stream;base64,");
+				assetsEPKBuilder.append(Base64.encodeBase64String(epkData));
+				assetsEPKBuilder.append("\", path: \"");
+				assetsEPKBuilder.append(stupidJSONEscape(epk.extractTo));
+				assetsEPKBuilder.append("\" }");
+			}
+			assetsEPKBuilder.append(" ]");
+			assetsEPKVal = assetsEPKBuilder.toString();
+		}else {
+			EPKDataEntry epk = clientData.epkFiles.get(0);
+			doUpdateMessage(cb, "Resolving assets.epk (" + epk.dataUUID + ", path: /)");
+			byte[] epkData = loadingCache.get(epk.dataUUID);
+			if(epkData == null) {
+				String msg = "Could not resolve assets.epk! (" + epk.dataUUID + ", path: /)";
+				logger.error(msg);
+				throw new NullPointerException(msg);
+			}
+			assetsEPKVal = "\"data:application/octet-stream;base64," + Base64.encodeBase64String(epkData) + "\"";
+		}
+		doUpdateMessage(cb, "Loading offline_template_eaglercraftX_1_8.html");
+		String template = loadTemplate("offline_template_eaglercraftX_1_8.html");
+		template = template.replace("${client_name}", HtmlEscapers.htmlEscaper().escape(launchConf.displayName));
+		template = template.replace("${date}", (new SimpleDateFormat("MM/dd/yyyy")).format(new Date()));
+		int relayIdCount = RelayRandomizeHelper.countRelayMacro(launchConf.launchOpts);
+		template = template.replace("${relayId_max}", Integer.toString(relayIdCount));
+		String launchOptsFormatted;
+		try {
+			launchOptsFormatted = (new JSONObject(launchConf.launchOpts)).toString(4);
+		}catch(JSONException ex) {
+			throw new IllegalArgumentException("Launch options JSON is invalid! " + ex.toString());
+		}
+		if(relayIdCount > 0) {
+			launchOptsFormatted = RelayRandomizeHelper.replaceRelayMacroWithEqRelayId(launchOptsFormatted);
+		}
+		template = template.replace("${launch_opts}", launchOptsFormatted);
+		JSONObject launchConfJSON = new JSONObject();
+		launchConf.writeJSON(launchConfJSON);
+		template = template.replace("${launch_conf_json}", launchConfJSON.toString());
+		template = template.replace(StringUtils.reverse("}kpe_stessa{$"), assetsEPKVal);
+		template = template.replace(StringUtils.reverse("}sj_sessalc{$"), new String(removeUseStrict(classesJSBytes), StandardCharsets.UTF_8));
+		doUpdateMessage(cb, "Downloading file...");
+		EagRuntime.downloadFileWithName(launchConf.displayName.replaceAll("[^a-zA-Z0-9\\-_\\.]", "_") + ".html", template.getBytes(StandardCharsets.UTF_8));
+	}
+
+	private static void downloadClientEaglerX18Signed(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCache, IProgressMsgCallback cb) {
+		doUpdateMessage(cb, "Resolving client signature (" + clientData.clientSignature + ")");
+		byte[] clientSignature = loadingCache.get(clientData.clientSignature);
+		if(clientSignature == null) {
+			String msg = "Could not resolve client signature! (" + clientData.clientSignature + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Resolving client payload (" + clientData.mainPayload + ")");
+		byte[] clientPayload = loadingCache.get(clientData.mainPayload);
+		if(clientPayload == null) {
+			String msg = "Could not resolve client payload! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Checking signature validity");
+		UpdateCertificate cert = null;
+		try {
+			cert = UpdateCertificate.parseAndVerifyCertificate(clientSignature);
+		}catch(CertificateInvalidException | IOException e) {
+			logger.error("Signature invalid or not recognized!");
+			logger.error(e);
+			logger.info("The client will be exported anyway. RIP");
+		}
+		if(cert != null) {
+			if(!cert.isBundleDataValid(clientPayload)) {
+				logger.error("Client payload checksum does not match the certificate!");
+				cert = null;
+			}
+		}else {
+			logger.info("Signature is valid: {} - {}", cert.bundleDisplayName, cert.bundleDisplayVersion);
+		}
+		doUpdateMessage(cb, "Loading offline_template_eaglercraftX_1_8_signed.html");
+		String template = loadTemplate("offline_template_eaglercraftX_1_8_signed.html");
+		template = template.replace("${client_name}", HtmlEscapers.htmlEscaper().escape(cert != null ? (cert.bundleDisplayName + " " + cert.bundleDisplayVersion) : launchConf.displayName));
+		SimpleDateFormat df = new SimpleDateFormat("MM/dd/yyyy");
+		template = template.replace("${date}", df.format(new Date()));
+		int relayIdCount = RelayRandomizeHelper.countRelayMacro(launchConf.launchOpts);
+		template = template.replace("${relayId_max}", Integer.toString(relayIdCount));
+		String launchOptsFormatted;
+		try {
+			launchOptsFormatted = (new JSONObject(launchConf.launchOpts)).toString(4);
+		}catch(JSONException ex) {
+			throw new IllegalArgumentException("Launch options JSON is invalid! " + ex.toString());
+		}
+		if(relayIdCount > 0) {
+			launchOptsFormatted = RelayRandomizeHelper.replaceRelayMacroWithEqRelayId(launchOptsFormatted);
+		}
+		template = template.replace("${launch_opts}", launchOptsFormatted);
+		JSONObject launchConfJSON = new JSONObject();
+		launchConf.writeJSON(launchConfJSON);
+		template = template.replace("${launch_conf_json}", launchConfJSON.toString());
+		String fileName;
+		if(cert != null) {
+			String d8 = df.format(new Date(cert.sigTimestamp));
+			template = template.replace("${signature_details}", cert.bundleDisplayName + " " + cert.bundleDisplayVersion
+					+ " (" + cert.bundleVersionInteger + ") " + d8 + ", Author: " + cert.bundleAuthorName);
+			template = template.replace("${client_name_or_origin_date}", "This file is from <span style=\"color:#AA0000;\">" + d8 + "</span>");
+			fileName = cert.bundleDisplayName + "_" + cert.bundleDisplayVersion + "_Offline_Signed";
+		}else {
+			template = template.replace("${signature_details}", "INVALID! (Or just from a 3rd party client)");
+			template = template.replace("${client_name_or_origin_date}", HtmlEscapers.htmlEscaper().escape(launchConf.displayName));
+			fileName = launchConf.displayName;
+		}
+		template = template.replace("${client_signature}", Base64.encodeBase64String(clientSignature));
+		template = template.replace("${client_bundle}", Base64.encodeBase64String(clientPayload));
+		doUpdateMessage(cb, "Downloading file...");
+		EagRuntime.downloadFileWithName(fileName.replaceAll("[^a-zA-Z0-9\\-_\\.]", "_") + ".html", template.getBytes(StandardCharsets.UTF_8));
+	}
+
+	private static void downloadClientEagler15New(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCache, IProgressMsgCallback cb) {
+		if(clientData.epkFiles.size() != 1) {
+			throw new UnsupportedOperationException("Wrong number of EPK files: " + clientData.epkFiles.size());
+		}
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		byte[] classesJSBytes = loadingCache.get(clientData.mainPayload);
+		if(classesJSBytes == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Resolving classes_server.js (" + clientData.integratedServer + ")");
+		byte[] classesServerJSBytes = loadingCache.get(clientData.integratedServer);
+		if(classesServerJSBytes == null) {
+			String msg = "Could not resolve classes_server.js! (" + clientData.integratedServer + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Resolving assets.epk (" + clientData.epkFiles.get(0).dataUUID + ")");
+		byte[] assetsEPKBytes = loadingCache.get(clientData.epkFiles.get(0).dataUUID);
+		if(assetsEPKBytes == null) {
+			String msg = "Could not resolve assets.epk! (" + clientData.epkFiles.get(0).dataUUID + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Loading offline_template_eaglercraft_1_5.html");
+		String template = loadTemplate("offline_template_eaglercraft_1_5.html");
+		template = template.replace("${client_name}", HtmlEscapers.htmlEscaper().escape(launchConf.displayName));
+		template = template.replace("${date}", (new SimpleDateFormat("MM/dd/yyyy")).format(new Date()));
+		int relayIdCount = RelayRandomizeHelper.countRelayMacro(launchConf.launchOpts);
+		template = template.replace("${relayId_max}", Integer.toString(relayIdCount));
+		String launchOptsFormatted;
+		try {
+			launchOptsFormatted = (new JSONObject(launchConf.launchOpts)).toString(4);
+		}catch(JSONException ex) {
+			throw new IllegalArgumentException("Launch options JSON is invalid! " + ex.toString());
+		}
+		if(relayIdCount > 0) {
+			launchOptsFormatted = RelayRandomizeHelper.replaceRelayMacroWithEqRelayId(launchOptsFormatted);
+		}
+		template = template.replace("${launch_opts}", launchOptsFormatted);
+		JSONObject launchConfJSON = new JSONObject();
+		launchConf.writeJSON(launchConfJSON);
+		template = template.replace("${launch_conf_json}", launchConfJSON.toString());
+		template = template.replace(StringUtils.reverse("}kpe_stessa{$"), Base64.encodeBase64String(assetsEPKBytes));
+		template = template.replace(StringUtils.reverse("}sj_sessalc{$"), new String(removeUseStrict(classesJSBytes), StandardCharsets.UTF_8));
+		template = template.replace("${classes_server_js}", new String(removeUseStrict(classesServerJSBytes), StandardCharsets.UTF_8));
+		doUpdateMessage(cb, "Downloading file...");
+		EagRuntime.downloadFileWithName(launchConf.displayName.replaceAll("[^a-zA-Z0-9\\-_\\.]", "_") + ".html", template.getBytes(StandardCharsets.UTF_8));
+	}
+
+	private static void downloadClientEagler15Old(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCache, IProgressMsgCallback cb) {
+		if(clientData.epkFiles.size() != 1) {
+			throw new UnsupportedOperationException("Wrong number of EPK files: " + clientData.epkFiles.size());
+		}
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		byte[] classesJSBytes = loadingCache.get(clientData.mainPayload);
+		if(classesJSBytes == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Resolving assets.epk (" + clientData.epkFiles.get(0).dataUUID + ")");
+		byte[] assetsEPKBytes = loadingCache.get(clientData.epkFiles.get(0).dataUUID);
+		if(assetsEPKBytes == null) {
+			String msg = "Could not resolve assets.epk! (" + clientData.epkFiles.get(0).dataUUID + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Loading offline_template_eaglercraft_1_5_legacy.html");
+		String template = loadTemplate("offline_template_eaglercraft_1_5_legacy.html");
+		template = template.replace("${client_name}", HtmlEscapers.htmlEscaper().escape(launchConf.displayName));
+		template = template.replace("${date}", (new SimpleDateFormat("MM/dd/yyyy")).format(new Date()));
+		JSONObject launchConfJSON = new JSONObject();
+		launchConf.writeJSON(launchConfJSON);
+		template = template.replace("${launch_conf_json}", launchConfJSON.toString());
+		template = template.replace("${launch_opts}", ClientBootFactory.translateNBTOpts(launchConf.launchOpts));
+		template = template.replace(StringUtils.reverse("}kpe_stessa{$"), Base64.encodeBase64String(assetsEPKBytes));
+		template = template.replace(StringUtils.reverse("}sj_sessalc{$"), new String(removeUseStrict(classesJSBytes), StandardCharsets.UTF_8));
+		doUpdateMessage(cb, "Downloading file...");
+		EagRuntime.downloadFileWithName(launchConf.displayName.replaceAll("[^a-zA-Z0-9\\-_\\.]", "_") + ".html", template.getBytes(StandardCharsets.UTF_8));
+	}
+
+	private static void downloadClientEaglerB13(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCache, IProgressMsgCallback cb) {
+		if(clientData.epkFiles.size() != 1) {
+			throw new UnsupportedOperationException("Wrong number of EPK files: " + clientData.epkFiles.size());
+		}
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		byte[] classesJSBytes = loadingCache.get(clientData.mainPayload);
+		if(classesJSBytes == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Resolving assets.epk (" + clientData.epkFiles.get(0).dataUUID + ")");
+		byte[] assetsEPKBytes = loadingCache.get(clientData.epkFiles.get(0).dataUUID);
+		if(assetsEPKBytes == null) {
+			String msg = "Could not resolve assets.epk! (" + clientData.epkFiles.get(0).dataUUID + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Loading offline_template_eaglercraft_b1_3.html");
+		String template = loadTemplate("offline_template_eaglercraft_b1_3.html");
+		template = template.replace("${client_name}", HtmlEscapers.htmlEscaper().escape(launchConf.displayName));
+		template = template.replace("${date}", (new SimpleDateFormat("MM/dd/yyyy")).format(new Date()));
+		JSONObject launchConfJSON = new JSONObject();
+		launchConf.writeJSON(launchConfJSON);
+		template = template.replace("${launch_conf_json}", launchConfJSON.toString());
+		template = template.replace(StringUtils.reverse("}kpe_stessa{$"), Base64.encodeBase64String(assetsEPKBytes));
+		template = template.replace(StringUtils.reverse("}sj_sessalc{$"), new String(removeUseStrict(classesJSBytes), StandardCharsets.UTF_8));
+		doUpdateMessage(cb, "Downloading file...");
+		EagRuntime.downloadFileWithName(launchConf.displayName.replaceAll("[^a-zA-Z0-9\\-_\\.]", "_") + ".html", template.getBytes(StandardCharsets.UTF_8));
+	}
+
+	private static void downloadClientPeytonAlphaBeta(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCache, IProgressMsgCallback cb) {
+		if(clientData.epkFiles.size() != 1) {
+			throw new UnsupportedOperationException("Wrong number of EPK files: " + clientData.epkFiles.size());
+		}
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		byte[] classesJSBytes = loadingCache.get(clientData.mainPayload);
+		if(classesJSBytes == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Resolving assets.epk (" + clientData.epkFiles.get(0).dataUUID + ")");
+		byte[] assetsEPKBytes = loadingCache.get(clientData.epkFiles.get(0).dataUUID);
+		if(assetsEPKBytes == null) {
+			String msg = "Could not resolve assets.epk! (" + clientData.epkFiles.get(0).dataUUID + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Loading offline_template_peytonplayz585_a_b.html");
+		String template = loadTemplate("offline_template_peytonplayz585_a_b.html");
+		template = template.replace("${client_name}", HtmlEscapers.htmlEscaper().escape(launchConf.displayName));
+		template = template.replace("${date}", (new SimpleDateFormat("MM/dd/yyyy")).format(new Date()));
+		String launchOptsFormatted;
+		try {
+			launchOptsFormatted = (new JSONObject(launchConf.launchOpts)).toString(4);
+		}catch(JSONException ex) {
+			throw new IllegalArgumentException("Launch options JSON is invalid! " + ex.toString());
+		}
+		template = template.replace("${launch_opts}", launchOptsFormatted);
+		JSONObject launchConfJSON = new JSONObject();
+		launchConf.writeJSON(launchConfJSON);
+		template = template.replace("${launch_conf_json}", launchConfJSON.toString());
+		template = template.replace(StringUtils.reverse("}kpe_stessa{$"), Base64.encodeBase64String(assetsEPKBytes));
+		template = template.replace(StringUtils.reverse("}sj_sessalc{$"), new String(removeUseStrict(classesJSBytes), StandardCharsets.UTF_8));
+		doUpdateMessage(cb, "Downloading file...");
+		EagRuntime.downloadFileWithName(launchConf.displayName.replaceAll("[^a-zA-Z0-9\\-_\\.]", "_") + ".html", template.getBytes(StandardCharsets.UTF_8));
+	}
+
+	private static void downloadClientPeytonIndev(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCache, IProgressMsgCallback cb) {
+		if(clientData.epkFiles.size() != 1) {
+			throw new UnsupportedOperationException("Wrong number of EPK files: " + clientData.epkFiles.size());
+		}
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		byte[] classesJSBytes = loadingCache.get(clientData.mainPayload);
+		if(classesJSBytes == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Resolving assets.epk (" + clientData.epkFiles.get(0).dataUUID + ")");
+		byte[] assetsEPKBytes = loadingCache.get(clientData.epkFiles.get(0).dataUUID);
+		if(assetsEPKBytes == null) {
+			String msg = "Could not resolve assets.epk! (" + clientData.epkFiles.get(0).dataUUID + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		doUpdateMessage(cb, "Loading offline_template_peytonplayz585_indev.html");
+		String template = loadTemplate("offline_template_peytonplayz585_indev.html");
+		template = template.replace("${client_name}", HtmlEscapers.htmlEscaper().escape(launchConf.displayName));
+		template = template.replace("${date}", (new SimpleDateFormat("MM/dd/yyyy")).format(new Date()));
+		JSONObject launchConfJSON = new JSONObject();
+		launchConf.writeJSON(launchConfJSON);
+		template = template.replace("${launch_conf_json}", launchConfJSON.toString());
+		template = template.replace(StringUtils.reverse("}kpe_stessa{$"), Base64.encodeBase64String(assetsEPKBytes));
+		template = template.replace(StringUtils.reverse("}sj_sessalc{$"), new String(removeUseStrict(classesJSBytes), StandardCharsets.UTF_8));
+		doUpdateMessage(cb, "Downloading file...");
+		EagRuntime.downloadFileWithName(launchConf.displayName.replaceAll("[^a-zA-Z0-9\\-_\\.]", "_") + ".html", template.getBytes(StandardCharsets.UTF_8));
+	}
+
+	static String stupidJSONEscape(String str) {
+		str = (new JSONArray().put(str)).toString();
+		return str.substring(2, str.length() - 2);
+	}
+
+	private static void downloadClientStandardOffline(LaunchConfigEntry launchConf, ClientDataEntry clientData,
+			EaglerLoadingCache<EaglercraftUUID, byte[]> loadingCache, IProgressMsgCallback cb) {
+		doUpdateMessage(cb, "Resolving classes.js (" + clientData.mainPayload + ")");
+		byte[] classesJSBytes = loadingCache.get(clientData.mainPayload);
+		if(classesJSBytes == null) {
+			String msg = "Could not resolve classes.js! (" + clientData.mainPayload + ")";
+			logger.error(msg);
+			throw new NullPointerException(msg);
+		}
+		JSONArray assetsEPKs = new JSONArray();
+		for(EPKDataEntry epk : clientData.epkFiles) {
+			doUpdateMessage(cb, "Resolving assets.epk (" + epk.dataUUID + ", path: /" + epk.extractTo + ")");
+			byte[] epkData = loadingCache.get(epk.dataUUID);
+			if(epkData == null) {
+				String msg = "Could not resolve assets.epk! (" + epk.dataUUID + ", path: /" + epk.extractTo + ")";
+				logger.error(msg);
+				throw new NullPointerException(msg);
+			}
+			JSONObject obj = new JSONObject();
+			obj.put("url", "data:application/octet-stream;base64," + Base64.encodeBase64String(epkData));
+			obj.put("path", epk.extractTo);
+			assetsEPKs.put(obj);
+		}
+		doUpdateMessage(cb, "Loading offline_template_eaglercraftX_1_8.html");
+		String template = loadTemplate("offline_template_eaglercraftX_1_8.html");
+		template = template.replace("${client_name}", HtmlEscapers.htmlEscaper().escape(launchConf.displayName));
+		template = template.replace("${date}", (new SimpleDateFormat("MM/dd/yyyy")).format(new Date()));
+		template = template.replace("${launch_opts_var_name}", stupidJSONEscape(launchConf.launchOptsVar));
+		template = template.replace("${launch_opts_var_container_name}", stupidJSONEscape(launchConf.launchOptsContainerVar));
+		template = template.replace("${launch_opts_var_assetsURI_name}", stupidJSONEscape(launchConf.launchOptsAssetsURIVar));
+		template = template.replace("${main_function_name}", stupidJSONEscape(launchConf.mainFunction));
+		int relayIdCount = RelayRandomizeHelper.countRelayMacro(launchConf.launchOpts);
+		template = template.replace("${relayId_max}", Integer.toString(relayIdCount));
+		String launchOptsFormatted;
+		try {
+			launchOptsFormatted = (new JSONObject(launchConf.launchOpts)).toString(4);
+		}catch(JSONException ex) {
+			throw new IllegalArgumentException("Launch options JSON is invalid! " + ex.toString());
+		}
+		if(relayIdCount > 0) {
+			launchOptsFormatted = RelayRandomizeHelper.replaceRelayMacroWithEqRelayId(launchOptsFormatted);
+		}
+		template = template.replace("${launch_opts}", launchOptsFormatted);
+		JSONObject launchConfJSON = new JSONObject();
+		launchConf.writeJSON(launchConfJSON);
+		template = template.replace("${launch_conf_json}", launchConfJSON.toString());
+		template = template.replace(StringUtils.reverse("}kpe_stessa{$"), assetsEPKs.toString());
+		template = template.replace(StringUtils.reverse("}sj_sessalc{$"), new String(removeUseStrict(classesJSBytes), StandardCharsets.UTF_8));
+		doUpdateMessage(cb, "Downloading file...");
+		EagRuntime.downloadFileWithName(launchConf.displayName.replaceAll("[^a-zA-Z0-9\\-_\\.]", "_") + ".html", template.getBytes(StandardCharsets.UTF_8));
+	}
+
+	public static byte[] removeClientScriptElement(byte[] input, boolean addUseStrict) {
+		byte[] str = "\"use strict\";\r\nif(typeof window !== \"undefined\") window.eaglercraftXClientScriptElement = document.currentScript;".getBytes(StandardCharsets.UTF_8);
+		if(input.length < str.length + 2) {
+			return input;
+		}
+		if(Arrays.equals(str, 0, str.length, input, 0, str.length)) {
+			return doUseStrict(input, str.length, addUseStrict);
+		}
+		if(Arrays.equals(str, 0, str.length, input, 1, str.length + 1)) {
+			return doUseStrict(input, str.length + 1, addUseStrict);
+		}
+		if(Arrays.equals(str, 0, str.length, input, 2, str.length + 2)) {
+			return doUseStrict(input, str.length + 2, addUseStrict);
+		}
+		str = "\"use strict\";\nif(typeof window !== \"undefined\") window.eaglercraftXClientScriptElement = document.currentScript;".getBytes(StandardCharsets.UTF_8);
+		if(input.length < str.length) {
+			return input;
+		}
+		if(Arrays.equals(str, 0, str.length, input, 0, str.length)) {
+			return doUseStrict(input, str.length, addUseStrict);
+		}
+		if(Arrays.equals(str, 0, str.length, input, 1, str.length + 1)) {
+			return doUseStrict(input, str.length + 1, addUseStrict);
+		}
+		if(Arrays.equals(str, 0, str.length, input, 2, str.length + 2)) {
+			return doUseStrict(input, str.length + 2, addUseStrict);
+		}
+		if(addUseStrict) {
+			str = new byte[] {(byte)34, (byte)117, (byte)115, (byte)101, (byte)32, (byte)115, (byte)116, (byte)114, (byte)105, (byte)99, (byte)116, (byte)34, (byte)59};
+			if(Arrays.equals(str, 0, str.length, input, 0, str.length)) {
+				return input;
+			}
+			if(Arrays.equals(str, 0, str.length, input, 1, str.length + 1)) {
+				return input;
+			}
+			if(Arrays.equals(str, 0, str.length, input, 2, str.length + 2)) {
+				return input;
+			}
+			return doUseStrict(input, 0, addUseStrict);
+		}else {
+			return input;
+		}
+	}
+
+	private static byte[] doUseStrict(byte[] input, int removeLength, boolean addUseStrict) {
+		if(addUseStrict) {
+			byte[] useStrict = new byte[] {(byte)34, (byte)117, (byte)115, (byte)101, (byte)32, (byte)115, (byte)116, (byte)114, (byte)105, (byte)99, (byte)116, (byte)34, (byte)59, (byte)10};
+			while(removeLength < input.length && (input[removeLength] == '\n' || input[removeLength] == '\r')) {
+				++removeLength;
+			}
+			int endRemoveLength = input.length;
+			while(endRemoveLength > removeLength + 1 && (input[endRemoveLength - 1] == '\n' || input[endRemoveLength - 1] == '\r')) {
+				--endRemoveLength;
+			}
+			byte[] ret = new byte[endRemoveLength - removeLength + useStrict.length];
+			System.arraycopy(useStrict, 0, ret, 0, useStrict.length);
+			System.arraycopy(input, removeLength, ret, useStrict.length, endRemoveLength - removeLength);
+			return ret;
+		}else {
+			int endRemoveLength = input.length;
+			while(endRemoveLength > removeLength + 1 && (input[endRemoveLength - 1] == '\n' || input[endRemoveLength - 1] == '\r')) {
+				--endRemoveLength;
+			}
+			if(removeLength > 0 || endRemoveLength != input.length) {
+				return Arrays.copyOfRange(input, removeLength, endRemoveLength);
+			}else {
+				return input;
+			}
+		}
+	}
+
+	public static byte[] removeUseStrict(byte[] input) {
+		byte[] str = new byte[] {(byte)34, (byte)117, (byte)115, (byte)101, (byte)32, (byte)115, (byte)116, (byte)114, (byte)105, (byte)99, (byte)116, (byte)34, (byte)59};
+		if(input.length < str.length + 2) {
+			return input;
+		}
+		int i = 0;
+		if (Arrays.equals(str, 0, str.length, input, 0, str.length)
+				|| Arrays.equals(str, 0, str.length, input, ++i, str.length + i)
+				|| Arrays.equals(str, 0, str.length, input, ++i, str.length + i)) {
+			int removeLength = str.length + i;
+			while(removeLength < input.length && (input[removeLength] == '\n' || input[removeLength] == '\r')) {
+				++removeLength;
+			}
+			int endRemoveLength = input.length;
+			while(endRemoveLength > removeLength + 1 && (input[endRemoveLength - 1] == '\n' || input[endRemoveLength - 1] == '\r')) {
+				--endRemoveLength;
+			}
+			return Arrays.copyOfRange(input, removeLength, endRemoveLength);
+		}else {
+			int endRemoveLength = input.length;
+			while(endRemoveLength > 1 && (input[endRemoveLength - 1] == '\n' || input[endRemoveLength - 1] == '\r')) {
+				--endRemoveLength;
+			}
+			if(endRemoveLength != input.length) {
+				return Arrays.copyOfRange(input, 0, endRemoveLength);
+			}else {
+				return input;
+			}
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/OfflineDownloadParser.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/OfflineDownloadParser.java
new file mode 100755
index 0000000..19c4efd
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/OfflineDownloadParser.java
@@ -0,0 +1,990 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import com.google.common.collect.Lists;
+
+import net.lax1dude.eaglercraft.v1_8.Base64;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class OfflineDownloadParser {
+
+	private static final Logger logger = LogManager.getLogger("OfflineDownloadParser");
+
+	public static EnumOfflineParseType detectOfflineType(String offlineDownloadData) {
+		int hintIndex = offlineDownloadData.indexOf(StringUtils.reverse(">\"tniHesraPenilffOtfarcrelgae\"=epyt elyts<"));
+		if(hintIndex != -1) {
+			hintIndex += 42;
+			int closeTagIndex = offlineDownloadData.indexOf(StringUtils.reverse(">elyts/<"), hintIndex);
+			if(closeTagIndex != -1) {
+				try {
+					JSONObject parseHint = new JSONObject(offlineDownloadData.substring(hintIndex, closeTagIndex));
+					return EnumOfflineParseType.valueOf(parseHint.getString("type"));
+				}catch(JSONException | IllegalArgumentException ex) {
+					logger.error("This offline download has a parse hint section, but the JSON is corrupt!");
+					logger.error(ex);
+				}
+			}
+		}
+		if(offlineDownloadData.startsWith("EAGPKG$$")) {
+			logger.info("Detected format: EAGLERCRAFT_EPK_FILE");
+			return EnumOfflineParseType.EAGLERCRAFT_EPK_FILE;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad>\"erutangiStneilCXtfarcrelgae\"=di \"tfarcrelgae\"=epyt elyts<")), 32, 2048)) {
+			logger.info("Detected format: EAGLERCRAFTX_1_8_SIGNED (post u24)");
+			return EnumOfflineParseType.EAGLERCRAFTX_1_8_SIGNED;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" = erutangiStneilCXtfarcrelgae.wodniw")), 32, 2048)) {
+			logger.info("Detected format: EAGLERCRAFTX_1_8_SIGNED (pre u24)");
+			return EnumOfflineParseType.EAGLERCRAFTX_1_8_SIGNED;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" = IRUstessa.stpOXtfarcrelgae.wodniw")), 8388608, offlineDownloadData.length() - 1048576)) {
+			logger.info("Detected format: EAGLERCRAFTX_1_8_OFFLINE (en_US)");
+			return EnumOfflineParseType.EAGLERCRAFTX_1_8_OFFLINE;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" :lru { [ = IRUstessa.stpOXtfarcrelgae.wodniw")), 8388608, offlineDownloadData.length() - 1048576)) {
+			logger.info("Detected format: EAGLERCRAFTX_1_8_OFFLINE (International)");
+			return EnumOfflineParseType.EAGLERCRAFTX_1_8_OFFLINE;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse("{ = stpOtfarcrelgae.wodniw")), 32, 2048) && foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(">\"rekrow_ps\"=di \"rekrowrelgae/txet\"=epyt tpircs<")), 4194304, offlineDownloadData.length() - 1048576)) {
+			logger.info("Detected format: EAGLERCRAFTX_1_5_NEW_OFFLINE");
+			return EnumOfflineParseType.EAGLERCRAFT_1_5_NEW_OFFLINE;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(",\"emarf_emag\"\t\t\n[ = stpOtfarcenim.wodniw")), 32, 2048) || foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(",\"emarf_emag\"        \n[ = stpOtfarcenim.wodniw")), 32, 2048)) {
+			if(foundWithin(offlineDownloadData.indexOf("\"eaglercraft.minecraft = \\\"b1.3\\\"\\n\""), 524288, offlineDownloadData.length() - 1048576)) {
+				logger.info("Detected format: EAGLERCRAFT_BETA_B1_3_OFFLINE");
+				return EnumOfflineParseType.EAGLERCRAFT_BETA_B1_3_OFFLINE;
+			}else if(foundWithin(offlineDownloadData.indexOf("\"eaglercraft.minecraft = \\\"1.5.2\\\"\\n\""), 2097152, offlineDownloadData.length() - 2097152)) {
+				logger.info("Detected format: EAGLERCRAFTX_1_5_OLD_OFFLINE");
+				return EnumOfflineParseType.EAGLERCRAFT_1_5_OLD_OFFLINE;
+			}
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse("{ = gifnoc.wodniw")), 32, 512)) {
+			logger.info("Detected format: PEYTONPLAYZ585_ALPHA_BETA");
+			return EnumOfflineParseType.PEYTONPLAYZ585_ALPHA_BETA;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(",\"emarf_emag\"\t\t\n[ = gifnoCcissalc.wodniw")), 32, 512) || foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(",\"emarf_emag\"    \n[ = gifnoCcissalc.wodniw")), 32, 512)) {
+			logger.info("Detected format: PEYTONPLAYZ585_INDEV");
+			return EnumOfflineParseType.PEYTONPLAYZ585_INDEV;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(">eltit/<evirD elgooG - evirD yM>eltit<\n>/ \"8-FTU\"=tesrahc atem<\n>daeh<")), 32, 2048)) {
+			logger.info("Detected format: EAGLERCRAFTX_1_5_NEW_OFFLINE (maybe)");
+			return EnumOfflineParseType.EAGLERCRAFT_1_5_NEW_OFFLINE;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(">eltit/<lacol tfarcrelgae>eltit<\n>daeh<")), 32, 2048)) {
+			if(foundWithin(offlineDownloadData.indexOf("\"eaglercraft.minecraft = \\\"b1.3\\\"\\n\""), 524288, offlineDownloadData.length() - 1048576)) {
+				logger.info("Detected format: EAGLERCRAFT_BETA_B1_3_OFFLINE");
+				return EnumOfflineParseType.EAGLERCRAFT_BETA_B1_3_OFFLINE;
+			}else if(foundWithin(offlineDownloadData.indexOf("\"eaglercraft.minecraft = \\\"1.5.2\\\"\\n\""), 2097152, offlineDownloadData.length() - 2097152)) {
+				logger.info("Detected format: EAGLERCRAFTX_1_5_OLD_OFFLINE");
+				return EnumOfflineParseType.EAGLERCRAFT_1_5_OLD_OFFLINE;
+			}
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(">eltit/<8.1 XtfarcrelgaE>eltit<\n>/ \"8.8.1 ,8.1 ,tfarcenim ,xtfarcrelgae ,tfarcrelgae\"=tnetnoc \"sdrowyek\"=eman atem<\n>/ \"enilffO 8.1 XtfarcrelgaE\"=tnetnoc \"noitpircsed\"=eman atem<")), 32, 2048)) {
+			logger.info("Detected format: EAGLERCRAFTX_1_8_OFFLINE (maybe)");
+			return EnumOfflineParseType.EAGLERCRAFTX_1_8_OFFLINE;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(">eltit/<3.7.1 ateB>eltit<")), 8, 512)) {
+			logger.info("Detected format: PEYTONPLAYZ585_ALPHA_BETA (maybe)");
+			return EnumOfflineParseType.PEYTONPLAYZ585_ALPHA_BETA;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(">eltit/<6.2.1v ahplA>eltit<")), 8, 512)) {
+			logger.info("Detected format: PEYTONPLAYZ585_ALPHA_BETA (maybe)");
+			return EnumOfflineParseType.PEYTONPLAYZ585_ALPHA_BETA;
+		}
+		if(foundWithin(offlineDownloadData.indexOf(StringUtils.reverse(">eltit/<vednI tfarceniM>eltit<")), 8, 512)) {
+			logger.info("Detected format: PEYTONPLAYZ585_INDEV (maybe)");
+			return EnumOfflineParseType.PEYTONPLAYZ585_INDEV;
+		}
+		return null;
+	}
+
+	private static boolean foundWithin(int idx, int min, int max) {
+		return idx >= min && idx < max;
+	}
+
+	public static class ParsedOfflineAdapter {
+
+		public final EnumOfflineParseType parseType;
+		public final LaunchConfigEntry launchData;
+		public final ClientDataEntry clientData;
+		public final Map<EaglercraftUUID, byte[]> blobs;
+
+		public ParsedOfflineAdapter(EnumOfflineParseType parseType, ClientDataEntry clientData,
+				Map<EaglercraftUUID, byte[]> blobs) {
+			this.parseType = parseType;
+			this.launchData = null;
+			this.clientData = clientData;
+			this.blobs = blobs;
+		}
+
+		public ParsedOfflineAdapter(LaunchConfigEntry launchData, ClientDataEntry clientData,
+				Map<EaglercraftUUID, byte[]> blobs) {
+			this.parseType = EnumOfflineParseType.inferFromClientFormat(launchData.type);
+			this.launchData = launchData;
+			this.clientData = clientData;
+			this.blobs = blobs;
+		}
+
+	}
+
+	public static List<ParsedOfflineAdapter> parseOffline(EnumOfflineParseType parseType, String offlineDownloadData) {
+		if(parseType == null) {
+			parseType = detectOfflineType(offlineDownloadData);
+			if(parseType == null) {
+				throw new IllegalArgumentException("Could not automatically detect offline download type!");
+			}
+		}
+		switch(parseType) {
+		case EAGLERCRAFTX_1_8_OFFLINE:
+			return parseOfflineEaglerX18(offlineDownloadData);
+		case EAGLERCRAFTX_1_8_SIGNED:
+			return parseOfflineEaglerX18Signed(offlineDownloadData);
+		case EAGLERCRAFTX_1_8_FAT_OFFLINE:
+			return parseOfflineEaglerX18Fat(offlineDownloadData);
+		case EAGLERCRAFTX_1_8_FAT_SIGNED:
+			return parseOfflineEaglerX18FatSigned(offlineDownloadData);
+		case EAGLERCRAFT_1_5_NEW_OFFLINE:
+			return parseOfflineEagler15New(offlineDownloadData);
+		case EAGLERCRAFT_1_5_OLD_OFFLINE:
+			return parseOfflineEagler15Old(offlineDownloadData);
+		case EAGLERCRAFT_BETA_B1_3_OFFLINE:
+			return parseOfflineEaglerB13(offlineDownloadData);
+		case PEYTONPLAYZ585_ALPHA_BETA:
+			return parseOfflinePeytonAlphaBeta(offlineDownloadData);
+		case PEYTONPLAYZ585_INDEV:
+			return parseOfflinePeytonIndev(offlineDownloadData);
+		case EXPORTED_STANDARD_OFFLINE:
+			return parseStandardOffline(offlineDownloadData);
+		default:
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	public static class TagIsolator {
+
+		protected final String openTag;
+		protected final String closeTag;
+		protected final String str;
+		protected int currentIndex = 0;
+		
+		public TagIsolator(String openTag, String closeTag, String str) {
+			this.openTag = openTag;
+			this.closeTag = closeTag;
+			this.str = str;
+		}
+		
+		public String nextScript() {
+			if(currentIndex != -1) {
+				currentIndex = str.indexOf(openTag, currentIndex);
+				if(currentIndex == -1) {
+					return null;
+				}
+				currentIndex += openTag.length();
+				int i2 = str.indexOf(closeTag, currentIndex);
+				if(i2 == -1) {
+					currentIndex = -1;
+					return null;
+				}
+				String ret = str.substring(currentIndex, i2);
+				currentIndex = i2 + closeTag.length();
+				return ret;
+			}else {
+				return null;
+			}
+		}
+		
+		public List<String> getAllTags() {
+			List<String> ret = new ArrayList<>();
+			String str;
+			while((str = nextScript()) != null) {
+				ret.add(str);
+			}
+			return ret;
+		}
+		
+	}
+
+	private static LaunchConfigEntry tryReadParseHint(EnumOfflineParseType expectedType, String offlineDownloadData) {
+		int hintIndex = offlineDownloadData.indexOf(StringUtils.reverse(">\"tniHesraPenilffOtfarcrelgae\"=epyt elyts<"));
+		if(hintIndex != -1) {
+			hintIndex += 42;
+			int closeTagIndex = offlineDownloadData.indexOf(StringUtils.reverse(">elyts/<"), hintIndex);
+			if(closeTagIndex != -1) {
+				try {
+					JSONObject parseHint = new JSONObject(offlineDownloadData.substring(hintIndex, closeTagIndex));
+					EnumOfflineParseType realType = EnumOfflineParseType.valueOf(parseHint.getString("type"));
+					if(realType != expectedType) {
+						throw new IllegalStateException("The offline download type is not \"" + expectedType + "\", metadata says it is \"" + realType + "\"!");
+					}
+					JSONObject launchConf = parseHint.getJSONObject("launchConf");
+					EaglercraftUUID theUUID = EaglercraftUUID.fromString(launchConf.getString("uuid"));
+					return new LaunchConfigEntry(theUUID, launchConf);
+				}catch(JSONException | IllegalArgumentException ex) {
+					logger.error("This offline download has a parse hint section, but the JSON is corrupt!");
+					logger.error(ex);
+				}
+			}
+		}
+		return null;
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEaglerX18(String offlineDownloadData) {
+		logger.info("Attempting to parse as: EAGLERCRAFTX_1_8_OFFLINE");
+		return parseOfflineEaglerX18(EnumOfflineParseType.EAGLERCRAFTX_1_8_OFFLINE, offlineDownloadData);
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEaglerX18(EnumOfflineParseType expectedType, String offlineDownloadData) {
+		LaunchConfigEntry launchConf = null;
+		try {
+			launchConf = tryReadParseHint(expectedType, offlineDownloadData);
+		}catch(IllegalStateException ex) {
+			logger.error(ex.getMessage());
+			return null;
+		}
+		List<String> scripts = (new TagIsolator(StringUtils.reverse(">\"tpircsavaj/txet\"=epyt tpircs<"), StringUtils.reverse(">tpircs/<"), offlineDownloadData)).getAllTags();
+		if(scripts.size() == 1) {
+			logger.info("Detected a single script tag, must be u19 or earlier");
+			return parseOfflineEaglerX18PreU20(launchConf, scripts.get(0));
+		}
+		byte[] classesJSSrc = null;
+		int classesTagIndex = -1;
+		for(int i = 0, l = scripts.size(); i < l; ++i) {
+			String script = scripts.get(i);
+			int j;
+			if(foundWithin(j = script.indexOf(StringUtils.reverse("\n;tpircStnerruc.tnemucod = tnemelEtpircStneilCXtfarcrelgae.wodniw )\"denifednu\" ==! wodniw foepyt(fi")), 0, 32)) {
+				classesJSSrc = ("\"use strict\";\n" + script.substring(j + 99).trim()).getBytes(StandardCharsets.UTF_8);
+				classesTagIndex = i;
+				break;
+			}
+		}
+		if(classesJSSrc == null) {
+			logger.error("Could not find script tag for classes.js!");
+			return null;
+		}
+		EaglercraftUUID classesJSUUID = EaglercraftUUID.nameUUIDFromBytes(classesJSSrc);
+		Map<EaglercraftUUID, byte[]> blobs = new HashMap<>();
+		List<EPKDataEntry> epks = new ArrayList<>(2);
+		blobs.put(classesJSUUID, classesJSSrc);
+		for(int i = 0, l = scripts.size(); i < l; ++i) {
+			if(i == classesTagIndex) {
+				continue;
+			}
+			String script = scripts.get(i);
+			int j;
+			if(foundWithin(j = script.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" :lru { [ = IRUstessa.stpOXtfarcrelgae.wodniw")), 0, 512)) {
+				int assetsEPKStart = j + 36;
+				int assetsEPKEnd = script.indexOf("];", assetsEPKStart);
+				if(assetsEPKEnd == -1) {
+					logger.error("Could not find where assets.epk ends!");
+					return null;
+				}
+				assetsEPKEnd += 1;
+				String assetsEPKs = script.substring(assetsEPKStart, assetsEPKEnd);
+				assetsEPKs = assetsEPKs.replace("url:", "\"url\":");
+				assetsEPKs = assetsEPKs.replace("path:", "\"path\":");
+				try {
+					JSONArray epksJSON = new JSONArray(assetsEPKs);
+					for(int ii = 0, ll = epksJSON.length(); ii < ll; ++ii) {
+						JSONObject obj = epksJSON.getJSONObject(ii);
+						String path = obj.optString("path", "");
+						String url = obj.getString("url");
+						if(!url.startsWith("data:application/octet-stream;base64,")) {
+							logger.error("assetsURI is not base64!");
+							return null;
+						}
+						byte[] binary = Base64.decodeBase64(url.substring(37));
+						EaglercraftUUID assetsEPKUUID = EaglercraftUUID.nameUUIDFromBytes(binary);
+						blobs.put(assetsEPKUUID, binary);
+						epks.add(new EPKDataEntry(path, assetsEPKUUID));
+					}
+				}catch(JSONException | IllegalStateException | IllegalArgumentException ex) {
+					logger.error("assetsURI is not valid json!");
+					return null;
+				}
+			}else if(foundWithin(j = script.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" = IRUstessa.stpOXtfarcrelgae.wodniw")), 0, 512)) {
+				int assetsEPKStart = j + 74;
+				int assetsEPKEnd = script.indexOf("\";", assetsEPKStart);
+				if(assetsEPKEnd == -1) {
+					logger.error("Could not find where assets.epk ends!");
+					return null;
+				}
+				byte[] assetsEPK;
+				try {
+					assetsEPK = Base64.decodeBase64(script.substring(assetsEPKStart, assetsEPKEnd));
+				}catch(IllegalArgumentException | IllegalStateException ex) {
+					logger.error("assets.epk is not valid base64!");
+					return null;
+				}
+				EaglercraftUUID assetsEPKUUID = EaglercraftUUID.nameUUIDFromBytes(assetsEPK);
+				blobs.put(assetsEPKUUID, assetsEPK);
+				epks.add(new EPKDataEntry("", assetsEPKUUID));
+			}
+		}
+		logger.info("Successfully loaded classes.js {} and assets.epk {}", classesJSUUID, String.join(", ", Lists.transform(epks, (e) -> e.dataUUID.toString())));
+		if(launchConf == null) {
+			return Arrays.asList(new ParsedOfflineAdapter(EnumOfflineParseType.EAGLERCRAFTX_1_8_OFFLINE,
+					new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_OFFLINE, EaglercraftUUID.randomUUID(),
+							classesJSUUID, null, null, epks), blobs));
+		}else {
+			return Arrays.asList(new ParsedOfflineAdapter(launchConf,
+					new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_OFFLINE, EaglercraftUUID.randomUUID(),
+							classesJSUUID, null, null, epks), blobs));
+		}
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEaglerX18PreU20(LaunchConfigEntry launchConf, String script) {
+		int classesJSStart = script.indexOf(StringUtils.reverse(";dees_tr$=x rav{)(dItxen_tr$ noitcnuf;2424353642=dees_tr$ rav\n{)(noitcnuf(;niam rav"));
+		if(classesJSStart == -1 || classesJSStart > 32767) {
+			logger.error("Could not find where classes.js begins!");
+			return null;
+		}
+		boolean isInternational = false;
+		int classesJSEnd = script.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" = IRUstessa.stpOXtfarcrelgae.wodniw"));
+		if(classesJSEnd == -1) {
+			classesJSEnd = script.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" :lru { [ = IRUstessa.stpOXtfarcrelgae.wodniw"));
+			if(classesJSEnd == -1) {
+				logger.error("Could not find where classes.js ends!");
+				return null;
+			}else {
+				isInternational = true;
+			}
+		}
+		byte[] classesJSSrc = script.substring(classesJSStart, classesJSEnd).trim().getBytes(StandardCharsets.UTF_8);
+		EaglercraftUUID classesJSUUID = EaglercraftUUID.nameUUIDFromBytes(classesJSSrc);
+		Map<EaglercraftUUID, byte[]> blobs = new HashMap<>();
+		List<EPKDataEntry> epks = new ArrayList<>(2);
+		blobs.put(classesJSUUID, classesJSSrc);
+		if(isInternational) {
+			int assetsEPKStart = classesJSEnd + 36;
+			int assetsEPKEnd = script.indexOf("];", assetsEPKStart);
+			if(assetsEPKEnd == -1) {
+				logger.error("Could not find where assets.epk ends!");
+				return null;
+			}
+			assetsEPKEnd += 1;
+			String assetsEPKs = script.substring(assetsEPKStart, assetsEPKEnd);
+			assetsEPKs = assetsEPKs.replace("url:", "\"url\":");
+			assetsEPKs = assetsEPKs.replace("path:", "\"path\":");
+			try {
+				JSONArray epksJSON = new JSONArray(assetsEPKs);
+				for(int i = 0, l = epksJSON.length(); i < l; ++i) {
+					JSONObject obj = epksJSON.getJSONObject(i);
+					String path = obj.optString("path", "");
+					String url = obj.getString("url");
+					if(!url.startsWith("data:application/octet-stream;base64,")) {
+						logger.error("assetsURI is not base64!");
+						return null;
+					}
+					byte[] binary = Base64.decodeBase64(url.substring(37));
+					EaglercraftUUID assetsEPKUUID = EaglercraftUUID.nameUUIDFromBytes(binary);
+					blobs.put(assetsEPKUUID, binary);
+					epks.add(new EPKDataEntry(path, assetsEPKUUID));
+				}
+			}catch(JSONException | IllegalStateException | IllegalArgumentException ex) {
+				logger.error("assetsURI is not valid json!");
+				return null;
+			}
+		}else {
+			int assetsEPKStart = classesJSEnd + 74;
+			int assetsEPKEnd = script.indexOf("\";", assetsEPKStart);
+			if(assetsEPKEnd == -1) {
+				logger.error("Could not find where assets.epk ends!");
+				return null;
+			}
+			byte[] assetsEPK;
+			try {
+				assetsEPK = Base64.decodeBase64(script.substring(assetsEPKStart, assetsEPKEnd));
+			}catch(IllegalArgumentException | IllegalStateException ex) {
+				logger.error("assets.epk is not valid base64!");
+				return null;
+			}
+			EaglercraftUUID assetsEPKUUID = EaglercraftUUID.nameUUIDFromBytes(assetsEPK);
+			blobs.put(assetsEPKUUID, assetsEPK);
+			epks.add(new EPKDataEntry("", assetsEPKUUID));
+		}
+		logger.info("Successfully loaded classes.js {} and assets.epk {}", classesJSUUID, String.join(", ", Lists.transform(epks, (e) -> e.dataUUID.toString())));
+		if(launchConf == null) {
+			return Arrays.asList(new ParsedOfflineAdapter(EnumOfflineParseType.EAGLERCRAFTX_1_8_OFFLINE,
+					new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_OFFLINE, EaglercraftUUID.randomUUID(),
+							classesJSUUID, null, null, epks), blobs));
+		}else {
+			return Arrays.asList(new ParsedOfflineAdapter(launchConf,
+					new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_OFFLINE, EaglercraftUUID.randomUUID(),
+							classesJSUUID, null, null, epks), blobs));
+		}
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEaglerX18Signed(String offlineDownloadData) {
+		logger.info("Attempting to parse as: EAGLERCRAFTX_1_8_SIGNED");
+		return parseOfflineEaglerX18Signed(EnumOfflineParseType.EAGLERCRAFTX_1_8_SIGNED, offlineDownloadData);
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEaglerX18Signed(EnumOfflineParseType expectType, String offlineDownloadData) {
+		LaunchConfigEntry launchConf = null;
+		try {
+			launchConf = tryReadParseHint(expectType, offlineDownloadData);
+		}catch(IllegalStateException ex) {
+			logger.error(ex.getMessage());
+			return null;
+		}
+		int signatureStart = offlineDownloadData.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad>\"erutangiStneilCXtfarcrelgae\"=di \"tfarcrelgae\"=epyt elyts<"));
+		boolean isPreU24 = false;
+		if(signatureStart == -1) {
+			signatureStart = offlineDownloadData.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" = erutangiStneilCXtfarcrelgae.wodniw"));
+			if(signatureStart == -1) {
+				logger.error("Could not find client signature!");
+				return null;
+			}
+			isPreU24 = true;
+			signatureStart += 75;
+			logger.info("Client is a pre-u24 signed offline");
+		}else {
+			signatureStart += 96;
+		}
+		Map<EaglercraftUUID, byte[]> blobs = new HashMap<>();
+		EaglercraftUUID signatureUUID;
+		EaglercraftUUID payloadUUID;
+		if(!isPreU24) {
+			int signatureEnd = offlineDownloadData.indexOf(StringUtils.reverse(">elyts/<"), signatureStart);
+			if(signatureEnd == -1) {
+				logger.error("Could not find end of client signature!");
+				return null;
+			}
+			byte[] signature;
+			try {
+				signature = Base64.decodeBase64(offlineDownloadData.substring(signatureStart, signatureEnd));
+			}catch(IllegalArgumentException | IllegalStateException ex) {
+				logger.error("Client signature is not valid base64!");
+				return null;
+			}
+			int bundleStart = offlineDownloadData.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad>\"eldnuBtneilCXtfarcrelgae\"=di \"tfarcrelgae\"=epyt elyts<"), signatureStart);
+			if(bundleStart == -1) {
+				logger.error("Could not find client payload!");
+				return null;
+			}
+			bundleStart += 93;
+			int bundleEnd = offlineDownloadData.indexOf(StringUtils.reverse(">elyts/<"), bundleStart);
+			if(bundleEnd == -1) {
+				logger.error("Could not find end of client payload!");
+				return null;
+			}
+			byte[] payload;
+			try {
+				payload = Base64.decodeBase64(offlineDownloadData.substring(bundleStart, bundleEnd));
+			}catch(IllegalArgumentException | IllegalStateException ex) {
+				logger.error("Client payload is not valid base64!");
+				return null;
+			}
+			signatureUUID = EaglercraftUUID.nameUUIDFromBytes(signature);
+			blobs.put(signatureUUID, signature);
+			payloadUUID = EaglercraftUUID.nameUUIDFromBytes(payload);
+			blobs.put(payloadUUID, payload);
+		}else {
+			int signatureEnd = offlineDownloadData.indexOf(StringUtils.reverse(";\""), signatureStart);
+			if(signatureEnd == -1) {
+				logger.error("Could not find end of client signature!");
+				return null;
+			}
+			byte[] signature;
+			try {
+				signature = Base64.decodeBase64(offlineDownloadData.substring(signatureStart, signatureEnd));
+			}catch(IllegalArgumentException | IllegalStateException ex) {
+				logger.error("Client signature is not valid base64!");
+				return null;
+			}
+			int bundleStart = offlineDownloadData.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" = eldnuBtneilCXtfarcrelgae.wodniw"), signatureStart);
+			if(bundleStart == -1) {
+				logger.error("Could not find client payload!");
+				return null;
+			}
+			bundleStart += 72;
+			int bundleEnd = offlineDownloadData.indexOf(StringUtils.reverse(";\""), bundleStart);
+			if(bundleEnd == -1) {
+				logger.error("Could not find end of client payload!");
+				return null;
+			}
+			byte[] payload;
+			try {
+				payload = Base64.decodeBase64(offlineDownloadData.substring(bundleStart, bundleEnd));
+			}catch(IllegalArgumentException | IllegalStateException ex) {
+				logger.error("Client payload is not valid base64!");
+				return null;
+			}
+			signatureUUID = EaglercraftUUID.nameUUIDFromBytes(signature);
+			blobs.put(signatureUUID, signature);
+			payloadUUID = EaglercraftUUID.nameUUIDFromBytes(payload);
+			blobs.put(payloadUUID, payload);
+		}
+		logger.info("Successfully loaded signature {} and payload {}", signatureUUID, payloadUUID);
+		if(launchConf == null) {
+			return Arrays.asList(new ParsedOfflineAdapter(EnumOfflineParseType.EAGLERCRAFTX_1_8_SIGNED,
+					new ClientDataEntry(EnumClientFormatType.EAGLER_SIGNED_OFFLINE, EaglercraftUUID.randomUUID(),
+							payloadUUID, null, signatureUUID, null), blobs));
+		}else {
+			return Arrays.asList(new ParsedOfflineAdapter(launchConf,
+					new ClientDataEntry(EnumClientFormatType.EAGLER_SIGNED_OFFLINE, EaglercraftUUID.randomUUID(),
+							payloadUUID, null, signatureUUID, null), blobs));
+		}
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEaglerX18Fat(String offlineDownloadData) {
+		logger.info("Attempting to parse as: EAGLERCRAFTX_1_8_FAT_OFFLINE");
+		List<ParsedOfflineAdapter> lst = parseOfflineEaglerX18(EnumOfflineParseType.EAGLERCRAFTX_1_8_FAT_OFFLINE, offlineDownloadData);
+		if(lst == null || lst.size() != 1) {
+			logger.error("Fat client type is not EAGLERCRAFTX_1_8_FAT_OFFLINE");
+			return null;
+		}
+		List<ParsedOfflineAdapter> lst2 = parseOfflineEaglerX18FatEmbeddedClients(lst.get(0), offlineDownloadData);
+		if(lst2 == null) {
+			logger.error("Could not parse embedded clients!");
+			return null;
+		}
+		return lst2;
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEaglerX18FatSigned(String offlineDownloadData) {
+		logger.info("Attempting to parse as: EAGLERCRAFTX_1_8_FAT_SIGNED");
+		List<ParsedOfflineAdapter> lst = parseOfflineEaglerX18Signed(EnumOfflineParseType.EAGLERCRAFTX_1_8_FAT_SIGNED, offlineDownloadData);
+		if(lst == null || lst.size() != 1) {
+			logger.error("Fat client type is not EAGLERCRAFTX_1_8_FAT_OFFLINE");
+			return null;
+		}
+		List<ParsedOfflineAdapter> lst2 = parseOfflineEaglerX18FatEmbeddedClients(lst.get(0), offlineDownloadData);
+		if(lst2 == null) {
+			logger.error("Could not parse embedded clients!");
+			return null;
+		}
+		return lst2;
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEaglerX18FatEmbeddedClients(ParsedOfflineAdapter parentClient, String offlineDownloadData) {
+		logger.info("Attempting to parse embedded clients");
+		String magicStart = StringUtils.reverse("_enilffOtaFrelgae_\"=di \"tfarcrelgae\"=epyt elyts<");
+		String magicEnd = StringUtils.reverse("\n>elyts/<");
+		Map<String,String> fatClientData = new HashMap<>();
+		int i = 0, j, k, l;
+		for(;;) {
+			if((i = offlineDownloadData.indexOf(magicStart, i)) == -1) {
+				break;
+			}
+			i += 48;
+			if((j = offlineDownloadData.indexOf("\">", i)) == -1 && j - i < 64) {
+				break;
+			}
+			String name = offlineDownloadData.substring(i, j);
+			if((k = offlineDownloadData.indexOf(magicEnd, j + 2)) == -1) {
+				break;
+			}
+			fatClientData.put(name, offlineDownloadData.substring(j + 2, k));
+		}
+		String manifest = fatClientData.get("manifest_v1");
+		if(manifest == null) {
+			logger.error("Could not find manifest tag!");
+		}
+		Map<EaglercraftUUID,ClientDataEntry> clientDatas;
+		List<LaunchConfigEntry> launchDatas;
+		try {
+			JSONObject obj = new JSONObject(manifest);
+			JSONArray manifestClientDatas = obj.getJSONArray("clientData");
+			int n = manifestClientDatas.length();
+			clientDatas = new HashMap<>(n + 1);
+			clientDatas.put(BootMenuConstants.UUID_CLIENT_DATA_ORIGIN, parentClient.clientData.rotateUUID(BootMenuConstants.UUID_CLIENT_DATA_ORIGIN));
+			for(l = 0; l < n; ++l) {
+				JSONObject obj2 = manifestClientDatas.getJSONObject(l);
+				EaglercraftUUID theUUID = EaglercraftUUID.fromString(obj2.getString("uuid"));
+				clientDatas.put(theUUID, new ClientDataEntry(theUUID, obj2));
+			}
+			JSONArray manifestLaunchDatas = obj.getJSONArray("launchData");
+			n = manifestLaunchDatas.length();
+			launchDatas = new ArrayList<>(n + 1);
+			launchDatas.add(parentClient.launchData.rotateUUIDs(BootMenuConstants.UUID_CLIENT_LAUNCH_ORIGIN, BootMenuConstants.UUID_CLIENT_DATA_ORIGIN));
+			for(l = 0; l < n; ++l) {
+				JSONObject obj2 = manifestLaunchDatas.getJSONObject(l);
+				EaglercraftUUID theUUID = EaglercraftUUID.fromString(obj2.getString("uuid"));
+				launchDatas.add(new LaunchConfigEntry(theUUID, obj2));
+			}
+			
+		}catch(JSONException ex) {
+			logger.error("The manifest JSON is corrupt!");
+			logger.error(ex);
+			return null;
+		}
+		Map<EaglercraftUUID, byte[]> blobs = new HashMap<>();
+		Iterator<ClientDataEntry> itr = clientDatas.values().iterator();
+		loadClientDatas: while(itr.hasNext()) {
+			ClientDataEntry etr = itr.next();
+			for(EaglercraftUUID uuid : etr.getReferencedBlobs()) {
+				if(!blobs.containsKey(uuid)) {
+					String str = fatClientData.get(uuid.toString());
+					if(str == null) {
+						logger.error("Blob UUID {} for client data {} is missing!", uuid, etr.uuid);
+						itr.remove();
+						continue loadClientDatas;
+					}
+					byte[] blobBytes;
+					try {
+						blobBytes = Base64.decodeBase64(str);
+					}catch(IllegalArgumentException | IllegalStateException ex) {
+						logger.error("Blob UUID {} for client data {} is invalid base64!", uuid, etr.uuid);
+						itr.remove();
+						continue loadClientDatas;
+					}
+					if(!EaglercraftUUID.nameUUIDFromBytes(blobBytes).equals(uuid)) {
+						logger.error("Blob UUID {} for client data {} has an invalid checksum!", uuid, etr.uuid);
+						itr.remove();
+						continue loadClientDatas;
+					}
+					blobs.put(uuid, blobBytes);
+				}
+			}
+		}
+		List<ParsedOfflineAdapter> list = new ArrayList<>(launchDatas.size());
+		for(LaunchConfigEntry etr : launchDatas) {
+			EaglercraftUUID clientDataUUID = etr.clientDataUUID;
+			if(clientDataUUID.equals(BootMenuConstants.UUID_CLIENT_DATA_ORIGIN)) {
+				list.add(new ParsedOfflineAdapter(etr, parentClient.clientData, parentClient.blobs));
+			}else {
+				ClientDataEntry clientData = clientDatas.get(clientDataUUID);
+				if(clientData == null) {
+					logger.error("Client data UUID {} for launch data {} is missing!", clientDataUUID, etr.uuid);
+					continue;
+				}
+				Map<EaglercraftUUID, byte[]> entryBlob = new HashMap<>();
+				for(EaglercraftUUID uuid : clientData.getReferencedBlobs()) {
+					entryBlob.put(uuid, blobs.get(uuid));
+				}
+				list.add(new ParsedOfflineAdapter(etr, clientData, entryBlob));
+			}
+		}
+		logger.info("Loaded {} blobs from fat offline", blobs.size());
+		logger.info("Loaded {} client configurations from fat offline", clientDatas.size());
+		logger.info("Loaded {} launch configurations from fat offline", launchDatas.size());
+		return list;
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEagler15New(String offlineDownloadData) {
+		logger.info("Attempting to parse as: EAGLERCRAFTX_1_5_NEW_OFFLINE");
+		LaunchConfigEntry launchConf = null;
+		try {
+			launchConf = tryReadParseHint(EnumOfflineParseType.EAGLERCRAFT_1_5_NEW_OFFLINE, offlineDownloadData);
+		}catch(IllegalStateException ex) {
+			logger.error(ex.getMessage());
+			return null;
+		}
+		byte[] assetsEPK = null;
+		byte[] classesJS = null;
+		List<String> scripts = (new TagIsolator(StringUtils.reverse(">\"tpircsavaj/txet\"=epyt tpircs<"), StringUtils.reverse(">tpircs/<"), offlineDownloadData)).getAllTags();
+		for(String str : scripts) {
+			if(str.length() > 262144) {
+				int i = -1;
+				int j = -1;
+				i = str.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" nruter\t\n{ )(IRUstessAteg noitcnuf"));
+				if(i == -1 || i >= 1024) {
+					i = str.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" nruter\n{ )(IRUstessAteg noitcnuf"));
+					if(i != -1 && i < 1024) {
+						i += 71;
+					}else {
+						i = -1;
+					}
+				}else {
+					i += 72;
+				}
+				if(i != -1) {
+					j = str.indexOf("\";", i);
+					if(j != -1) {
+						if(assetsEPK == null) {
+							try {
+								assetsEPK = Base64.decodeBase64(str.substring(i, j));
+							}catch(IllegalStateException | IllegalArgumentException ex) {
+							}
+						}
+						if(assetsEPK != null) {
+							continue;
+						}
+					}else {
+						j = -1;
+					}
+				}
+				i = -1;
+				j = -1;
+				if(foundWithin(str.indexOf(StringUtils.reverse("{ )le(IRUrekroWetaerc noitcnuf")), 0, 512)) {
+					continue;
+				}
+				if(foundWithin(str.indexOf(StringUtils.reverse(";)0001 ,} ;\")4 ni hcnual lliw emaG(\" = txeTrenni.c {)(noitcnuf(tuoemiTtes")), 0, 512)) {
+					continue;
+				}
+				if(foundWithin(str.indexOf(StringUtils.reverse("{ )(noitcnuf ,\"daol\"(renetsiLtnevEdda.wodniw")), 0, 512)) {
+					continue;
+				}
+				if(classesJS == null) {
+					classesJS = str.trim().getBytes(StandardCharsets.UTF_8);
+				}
+				if(assetsEPK != null && classesJS != null) {
+					break;
+				}
+			}
+		}
+		if(classesJS == null) {
+			logger.error("Could not find classes.js!");
+			return null;
+		}
+		if(assetsEPK == null) {
+			logger.error("Could not find assets.epk!");
+			return null;
+		}
+		int workerIdx = offlineDownloadData.indexOf(StringUtils.reverse(">\"rekrow_ps\"=di \"rekrowrelgae/txet\"=epyt tpircs<"));
+		if(workerIdx == -1) {
+			logger.error("Could not find start of integrated server!");
+			return null;
+		}else {
+			workerIdx += 48;
+		}
+		int workerIdxEnd = offlineDownloadData.indexOf(StringUtils.reverse(">tpircs/<"), workerIdx);
+		if(workerIdxEnd == -1) {
+			logger.error("Could not find end of integrated server!");
+			return null;
+		}
+		byte[] classesServerJS = offlineDownloadData.substring(workerIdx, workerIdxEnd).trim().getBytes(StandardCharsets.UTF_8);
+		Map<EaglercraftUUID, byte[]> blobs = new HashMap<>();
+		EaglercraftUUID classesJSUUID = EaglercraftUUID.nameUUIDFromBytes(classesJS);
+		blobs.put(classesJSUUID, classesJS);
+		EaglercraftUUID assetsEPKUUID = EaglercraftUUID.nameUUIDFromBytes(assetsEPK);
+		blobs.put(assetsEPKUUID, assetsEPK);
+		EaglercraftUUID classesServerJSUUID = EaglercraftUUID.nameUUIDFromBytes(classesServerJS);
+		blobs.put(classesServerJSUUID, classesServerJS);
+		logger.info("Successfully loaded classes.js {}, classes_server.js {}, and assets.epk {}", classesJSUUID, classesServerJS, assetsEPKUUID);
+		if(launchConf == null) {
+			return Arrays.asList(new ParsedOfflineAdapter(EnumOfflineParseType.EAGLERCRAFT_1_5_NEW_OFFLINE,
+					new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_1_5_OFFLINE, EaglercraftUUID.randomUUID(),
+							classesJSUUID, classesServerJSUUID, null, Arrays.asList(new EPKDataEntry("", assetsEPKUUID))), blobs));
+		}else {
+			return Arrays.asList(new ParsedOfflineAdapter(launchConf,
+					new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_1_5_OFFLINE, EaglercraftUUID.randomUUID(),
+							classesJSUUID, classesServerJSUUID, null, Arrays.asList(new EPKDataEntry("", assetsEPKUUID))), blobs));
+		}
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEagler15Old(String offlineDownloadData) {
+		logger.info("Attempting to parse as: EAGLERCRAFTX_1_5_OLD_OFFLINE");
+		return parseOfflineEagler15OldImpl(EnumOfflineParseType.EAGLERCRAFT_1_5_OLD_OFFLINE, offlineDownloadData);
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEagler15OldImpl(EnumOfflineParseType parseType, String offlineDownloadData) {
+		LaunchConfigEntry launchConf = null;
+		try {
+			launchConf = tryReadParseHint(parseType, offlineDownloadData);
+		}catch(IllegalStateException ex) {
+			logger.error(ex.getMessage());
+			return null;
+		}
+		byte[] assetsEPK = null;
+		byte[] classesJS = null;
+		List<String> scripts = (new TagIsolator(StringUtils.reverse(">\"tpircsavaj/txet\"=epyt tpircs<"), StringUtils.reverse(">tpircs/<"), offlineDownloadData)).getAllTags();
+		for(String str : scripts) {
+			if(str.length() > 262144) {
+				if(foundWithin(str.indexOf(StringUtils.reverse("{ )le(IRUtessAetaerc noitcnuf")), 0, 512)) {
+					continue;
+				}
+				if(foundWithin(str.indexOf(StringUtils.reverse(";)0001 ,} ;\")4 ni hcnual lliw emaG(\" = txeTrenni.c {)(noitcnuf(tuoemiTtes")), 0, 512)) {
+					continue;
+				}
+				if(foundWithin(str.indexOf(StringUtils.reverse("{ )(noitcnuf ,\"daol\"(renetsiLtnevEdda.wodniw")), 0, 512)) {
+					continue;
+				}
+				if(assetsEPK == null) {
+					int i = str.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" nruter\t\n{ )(IRUstessAteg noitcnuf"));
+					if(i == -1 || i >= 1024) {
+						i = str.indexOf(StringUtils.reverse(",46esab;maerts-tetco/noitacilppa:atad\" nruter\n{ )(IRUstessAteg noitcnuf"));
+						if(i != -1 && i < 1024) {
+							i += 71;
+						}else {
+							i = -1;
+						}
+					}else {
+						i += 72;
+					}
+					if(i != -1) {
+						int j = str.indexOf("\";", i);
+						if(j != -1) {
+							if(assetsEPK == null) {
+								try {
+									assetsEPK = Base64.decodeBase64(str.substring(i, j));
+								}catch(IllegalStateException | IllegalArgumentException ex) {
+								}
+							}
+							if(assetsEPK != null) {
+								continue;
+							}
+						}
+					}
+				}
+				if(classesJS == null) {
+					classesJS = str.trim().getBytes(StandardCharsets.UTF_8);
+				}
+				if(assetsEPK != null && classesJS != null) {
+					break;
+				}
+			}
+		}
+		if(classesJS == null) {
+			logger.error("Could not find classes.js!");
+			return null;
+		}
+		if(assetsEPK == null) {
+			int epkIdx = offlineDownloadData.indexOf(StringUtils.reverse(">\"stessa\"=di \";enon:yalpsid\"=elyts vid<"));
+			if(epkIdx == -1) {
+				logger.error("Could not find start of assets.epk!");
+				return null;
+			}else {
+				epkIdx += 39;
+			}
+			int epkIdxEnd = offlineDownloadData.indexOf(StringUtils.reverse(">vid/<"), epkIdx);
+			if(epkIdxEnd == -1) {
+				logger.error("Could not find end of assets.epk!");
+				return null;
+			}
+			try {
+				assetsEPK = Base64.decodeBase64(offlineDownloadData.substring(epkIdx, epkIdxEnd).trim());
+			}catch(IllegalStateException | IllegalArgumentException ex) {
+				logger.error("Could not base64 decode assets.epk!");
+				return null;
+			}
+		}
+		Map<EaglercraftUUID, byte[]> blobs = new HashMap<>();
+		EaglercraftUUID classesJSUUID = EaglercraftUUID.nameUUIDFromBytes(classesJS);
+		blobs.put(classesJSUUID, classesJS);
+		EaglercraftUUID assetsEPKUUID = EaglercraftUUID.nameUUIDFromBytes(assetsEPK);
+		blobs.put(assetsEPKUUID, assetsEPK);
+		logger.info("Successfully loaded classes.js {}, and assets.epk {}", classesJSUUID, assetsEPKUUID);
+		if(launchConf == null) {
+			return Arrays.asList(new ParsedOfflineAdapter(parseType,
+					new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_OFFLINE, EaglercraftUUID.randomUUID(),
+							classesJSUUID, null, null, Arrays.asList(new EPKDataEntry("", assetsEPKUUID))), blobs));
+		}else {
+			return Arrays.asList(new ParsedOfflineAdapter(launchConf,
+					new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_OFFLINE, EaglercraftUUID.randomUUID(),
+							classesJSUUID, null, null, Arrays.asList(new EPKDataEntry("", assetsEPKUUID))), blobs));
+		}
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflineEaglerB13(String offlineDownloadData) {
+		logger.info("Attempting to parse as: EAGLERCRAFT_BETA_B1_3_OFFLINE");
+		return parseOfflineEagler15OldImpl(EnumOfflineParseType.EAGLERCRAFT_BETA_B1_3_OFFLINE, offlineDownloadData);
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflinePeytonAlphaBeta(String offlineDownloadData) {
+		logger.info("Attempting to parse as: PEYTONPLAYZ585_ALPHA_BETA");
+		return parseOfflineEagler15OldImpl(EnumOfflineParseType.PEYTONPLAYZ585_ALPHA_BETA, offlineDownloadData);
+	}
+
+	private static List<ParsedOfflineAdapter> parseOfflinePeytonIndev(String offlineDownloadData) {
+		logger.info("Attempting to parse as: PEYTONPLAYZ585_INDEV");
+		return parseOfflineEagler15OldImpl(EnumOfflineParseType.PEYTONPLAYZ585_INDEV, offlineDownloadData);
+	}
+
+	private static List<ParsedOfflineAdapter> parseStandardOffline(String offlineDownloadData) {
+		LaunchConfigEntry launchConf;
+		int hintIndex = offlineDownloadData.indexOf(StringUtils.reverse(">\"tniHesraPenilffOtfarcrelgae\"=epyt elyts<"));
+		if(hintIndex != -1) {
+			hintIndex += 42;
+			int closeTagIndex = offlineDownloadData.indexOf(StringUtils.reverse(">elyts/<"), hintIndex);
+			if(closeTagIndex != -1) {
+				try {
+					JSONObject parseHint = new JSONObject(offlineDownloadData.substring(hintIndex, closeTagIndex));
+					EnumOfflineParseType typeEnum = EnumOfflineParseType.valueOf(parseHint.getString("type"));
+					if(typeEnum != EnumOfflineParseType.EXPORTED_STANDARD_OFFLINE) {
+						logger.error("This is not a \"EXPORTED_STANDARD_OFFLINE\" type offline!");
+						return null;
+					}
+					JSONObject launchConfJSON = parseHint.getJSONObject("launchConf");
+					EaglercraftUUID theUUID = EaglercraftUUID.fromString(launchConfJSON.getString("uuid"));
+					launchConf = new LaunchConfigEntry(theUUID, launchConfJSON);
+				}catch(JSONException | IllegalArgumentException ex) {
+					logger.error("This offline download has a parse hint section, but the JSON is corrupt!");
+					logger.error(ex);
+					return null;
+				}
+			}else {
+				logger.error("Could not find parse hint section!");
+				return null;
+			}
+		}else {
+			logger.error("Could not find parse hint section!");
+			return null;
+		}
+		List<String> scripts = (new TagIsolator(StringUtils.reverse(">\"tpircsavaj/txet\"=epyt tpircs<"), StringUtils.reverse(">tpircs/<"), offlineDownloadData)).getAllTags();
+		if(scripts.size() != 3) {
+			logger.error("Wrong number of script tags!");
+			return null;
+		}
+		byte[] classesJSSrc = OfflineDownloadFactory.removeClientScriptElement(scripts.get(1).getBytes(StandardCharsets.UTF_8), true);
+		EaglercraftUUID classesJSUUID = EaglercraftUUID.nameUUIDFromBytes(classesJSSrc);
+		Map<EaglercraftUUID, byte[]> blobs = new HashMap<>();
+		List<EPKDataEntry> epks = new ArrayList<>(2);
+		blobs.put(classesJSUUID, classesJSSrc);
+		String script = scripts.get(2);
+		int j;
+		if(foundWithin(j = script.indexOf(StringUtils.reverse("/*}:KPE_STESSA_NIGEB:{*/")), 0, 512)) {
+			int assetsEPKStart = j + 24;
+			int assetsEPKEnd = script.indexOf(StringUtils.reverse("/*}:KPE_STESSA_DNE:{*/"), assetsEPKStart);
+			if(assetsEPKEnd == -1) {
+				logger.error("Could not find where assets.epk ends!");
+				return null;
+			}
+			String assetsEPKs = script.substring(assetsEPKStart, assetsEPKEnd);
+			try {
+				JSONArray epksJSON = new JSONArray(assetsEPKs);
+				for(int ii = 0, ll = epksJSON.length(); ii < ll; ++ii) {
+					JSONObject obj = epksJSON.getJSONObject(ii);
+					String path = obj.optString("path", "");
+					String url = obj.getString("url");
+					if(!url.startsWith("data:application/octet-stream;base64,")) {
+						logger.error("assetsURI is not base64!");
+						return null;
+					}
+					byte[] binary = Base64.decodeBase64(url.substring(37));
+					EaglercraftUUID assetsEPKUUID = EaglercraftUUID.nameUUIDFromBytes(binary);
+					blobs.put(assetsEPKUUID, binary);
+					epks.add(new EPKDataEntry(path, assetsEPKUUID));
+				}
+			}catch(JSONException | IllegalStateException | IllegalArgumentException ex) {
+				logger.error("assetsURI is not valid json!");
+				return null;
+			}
+		}
+		logger.info("Successfully loaded classes.js {} and assets.epk {}", classesJSUUID, String.join(", ", Lists.transform(epks, (e) -> e.dataUUID.toString())));
+		return Arrays.asList(new ParsedOfflineAdapter(launchConf,
+				new ClientDataEntry(EnumClientFormatType.EAGLER_STANDARD_OFFLINE, EaglercraftUUID.randomUUID(),
+						classesJSUUID, null, null, epks), blobs));
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/RelayRandomizeHelper.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/RelayRandomizeHelper.java
new file mode 100755
index 0000000..e053026
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/RelayRandomizeHelper.java
@@ -0,0 +1,71 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class RelayRandomizeHelper {
+
+	public static int countRelayMacro(String launchOpts) {
+		int i = 0;
+		while(launchOpts.contains("\"$random_relay_primary_" + i + "\"")) {
+			++i;
+		}
+		return i;
+	}
+
+	public static String replaceRelayMacroWithConstant(String launchOpts) {
+		int i = countRelayMacro(launchOpts);
+		if(i == 0) {
+			return launchOpts;
+		}
+		int randomRelay = ThreadLocalRandom.current().nextInt(i);
+		for(int j = 0; j < i; ++j) {
+			launchOpts = launchOpts.replace("\"$random_relay_primary_" + j + "\"", randomRelay == j ? "true" : "false");
+		}
+		return launchOpts;
+	}
+
+	public static String replaceRelayMacroWithEqRelayId(String launchOpts) {
+		int i = countRelayMacro(launchOpts);
+		if(i == 0) {
+			return launchOpts;
+		}
+		for(int j = 0; j < i; ++j) {
+			launchOpts = launchOpts.replace("\"$random_relay_primary_" + j + "\"", "relayId === " + j);
+		}
+		return launchOpts;
+	}
+
+	public static void makeOptsJSONHaveMacroHack(JSONObject optsDump) {
+		int i = 0;
+		JSONArray arr = optsDump.optJSONArray("relays");
+		if(arr != null) {
+			for(int j = 0, l = arr.length(); j < l; ++j) {
+				JSONObject relay = arr.optJSONObject(j);
+				if(relay != null) {
+					if(relay.has("primary")) {
+						relay.put("primary", "$random_relay_primary_" + i++);
+					}
+				}
+			}
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/SelectionListController.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/SelectionListController.java
new file mode 100755
index 0000000..0c42f4f
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/SelectionListController.java
@@ -0,0 +1,240 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.teavm.jso.dom.html.HTMLElement;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class SelectionListController<T extends SelectionListController.ListItem> {
+
+	public static interface ListItem {
+		
+		String getName();
+		
+		default boolean getEnabled() {
+			return true;
+		}
+		
+		default boolean getAlwaysSelected() {
+			return true;
+		}
+		
+	}
+
+	public static class ListItemEnum<E> implements ListItem {
+
+		protected final String displayName;
+		protected final boolean enabled;
+		protected final E itemEnum;
+
+		public ListItemEnum(String displayName, boolean enabled, E itemEnum) {
+			this.displayName = displayName;
+			this.enabled = enabled;
+			this.itemEnum = itemEnum;
+		}
+
+		public ListItemEnum(String displayName, E itemEnum) {
+			this.displayName = displayName;
+			this.enabled = true;
+			this.itemEnum = itemEnum;
+		}
+
+		@Override
+		public String getName() {
+			return displayName;
+		}
+
+		@Override
+		public boolean getEnabled() {
+			return enabled;
+		}
+
+		public E getEnum() {
+			return itemEnum;
+		}
+
+	}
+
+	protected static class ListItemInstance<E extends SelectionListController.ListItem> {
+		
+		protected final E listItem;
+		protected final HTMLElement element;
+		protected int index;
+		protected boolean userVal = false;
+		
+		protected ListItemInstance(E listItem, HTMLElement element, int index) {
+			this.listItem = listItem;
+			this.element = element;
+			this.index = index;
+		}
+		
+	}
+
+	protected final HTMLElement parent;
+	protected final List<T> selectionList;
+	protected final List<ListItemInstance<T>> selectionEnableList;
+	protected int currentSelected = -1;
+	protected boolean cursorEventsSuspended = false;
+
+	public SelectionListController(HTMLElement parent, List<T> selectionList) {
+		this.parent = parent;
+		this.selectionList = selectionList;
+		this.selectionEnableList = new ArrayList<>(selectionList.size());
+	}
+
+	public void setup() {
+		selectionEnableList.clear();
+		parent.setInnerHTML("");
+		currentSelected = -1;
+		for(int i = 0, l = selectionList.size(); i < l; ++i) {
+			T itm = selectionList.get(i);
+			HTMLElement el = BootMenuMain.doc.createElement("p");
+			el.setInnerText(itm.getName());
+			el.getClassList().add(BootMenuConstants.cssClassPrefixBootMenu + "content_item");
+			if(itm.getEnabled()) {
+				if(currentSelected == -1) {
+					currentSelected = 0;
+					el.getClassList().add(BootMenuConstants.cssClassPrefixBootMenu + "content_item_selected");
+				}
+				final int ii = selectionEnableList.size();
+				final ListItemInstance<T> newInstance = new ListItemInstance<T>(itm, el, ii);
+				el.addEventListener("mouseover", (evt) -> {
+					BootMenuMain.runLater(() -> {
+						if(!cursorEventsSuspended) {
+							setSelected(newInstance.index);
+						}
+					});
+				});
+				el.addEventListener("click", (evt) -> {
+					BootMenuMain.runLater(() -> {
+						if(!cursorEventsSuspended) {
+							itemSelectedLow(newInstance);
+						}
+					});
+				});
+				selectionEnableList.add(newInstance);
+			}else {
+				el.getClassList().add(BootMenuConstants.cssClassPrefixBootMenu + "content_item_disabled");
+			}
+			parent.appendChild(el);
+		}
+	}
+
+	public void destroy() {
+		parent.setInnerHTML("");
+		currentSelected = -1;
+		selectionEnableList.clear();
+	}
+
+	public void setSelected(int idx) {
+		int listLen = selectionEnableList.size();
+		if(listLen == 0) {
+			idx = -1;
+		}else if(idx >= listLen) {
+			idx = listLen - 1;
+		}else if(idx < 0) {
+			idx = 0;
+		}
+		if(idx == currentSelected) {
+			return;
+		}
+		if(currentSelected >= 0 && currentSelected < selectionEnableList.size()) {
+			selectionEnableList.get(currentSelected).element.getClassList().remove(BootMenuConstants.cssClassPrefixBootMenu + "content_item_selected");
+		}
+		currentSelected = idx;
+		if(idx != -1) {
+			selectionEnableList.get(idx).element.getClassList().add(BootMenuConstants.cssClassPrefixBootMenu + "content_item_selected");
+		}
+	}
+
+	public T getSelected() {
+		if(currentSelected >= 0 && currentSelected < selectionEnableList.size()) {
+			return selectionEnableList.get(currentSelected).listItem;
+		}else {
+			return null;
+		}
+	}
+
+	public void moveEntryUp(int index) {
+		if(index < 1 || index >= selectionEnableList.size()) return;
+		if(currentSelected == index) {
+			--currentSelected;
+		}
+		ListItemInstance<T> etr = selectionEnableList.get(index);
+		ListItemInstance<T> etr2 = selectionEnableList.get(index - 1);
+		Collections.swap(selectionEnableList, index, index - 1);
+		etr.index--;
+		etr2.index++;
+		parent.removeChild(etr.element);
+		parent.insertBefore(etr.element, etr2.element);
+	}
+
+	public void moveEntryDown(int index) {
+		if(index < 0 || index >= selectionEnableList.size() - 1) return;
+		if(currentSelected == index) {
+			++currentSelected;
+		}
+		ListItemInstance<T> etr = selectionEnableList.get(index);
+		Collections.swap(selectionEnableList, index, index + 1);
+		etr.index++;
+		selectionEnableList.get(index + 1).index--;
+		parent.removeChild(etr.element);
+		if(index >= selectionEnableList.size() - 2) {
+			parent.appendChild(etr.element);
+		}else {
+			ListItemInstance<T> etr2 = selectionEnableList.get(index + 2);
+			parent.insertBefore(etr.element, etr2.element);
+		}
+	}
+
+	public void handleKeyDown(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ARROW_UP) {
+			setSelected(currentSelected - 1);
+		}else if(keyCode == KeyCodes.DOM_KEY_ARROW_DOWN) {
+			setSelected(currentSelected + 1);
+		}else if(keyCode == KeyCodes.DOM_KEY_ENTER) {
+			fireSelect();
+		}
+	}
+
+	protected void fireSelect() {
+		if(currentSelected >= 0 && currentSelected < selectionEnableList.size()) {
+			itemSelectedLow(selectionEnableList.get(currentSelected));
+		}
+	}
+
+	public void handleKeyRepeat(int keyCode) {
+		if(keyCode == KeyCodes.DOM_KEY_ARROW_UP) {
+			setSelected(currentSelected - 1);
+		}else if(keyCode == KeyCodes.DOM_KEY_ARROW_DOWN) {
+			setSelected(currentSelected + 1);
+		}
+	}
+
+	public void setCursorEventsSuspended(boolean sus) {
+		cursorEventsSuspended = sus;
+	}
+
+	protected void itemSelectedLow(ListItemInstance<T> item) {
+		itemSelected(item.listItem);
+	}
+
+	protected abstract void itemSelected(T item);
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/SignatureCheckHelper.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/SignatureCheckHelper.java
new file mode 100755
index 0000000..0b09519
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/SignatureCheckHelper.java
@@ -0,0 +1,48 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.update.CertificateInvalidException;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateCertificate;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SignatureCheckHelper {
+
+	private static final Logger logger = LogManager.getLogger("SignatureCheckHelper");
+
+	public static boolean checkSignatureValid(byte[] signatureBytes, byte[] payloadBytes) {
+		UpdateCertificate cert;
+		try {
+			cert = UpdateCertificate.parseAndVerifyCertificate(signatureBytes);
+		} catch (CertificateInvalidException | IOException e) {
+			logger.error("The client's signature is invalid because the update certificate is bad");
+			logger.error(e);
+			return false;
+		}
+		if(!cert.isBundleDataValid(payloadBytes)) {
+			logger.error("The client's signature is invalid because the payload checksum does not match the expected checksum in the update certificate");
+			logger.error("(Update certificate client name and version: {} - {})", cert.bundleDisplayName, cert.bundleDisplayVersion);
+			return false;
+		}else {
+			logger.info("Signature is valid: {} - {}", cert.bundleDisplayName, cert.bundleDisplayVersion);
+			return true;
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/SignedClientInstaller.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/SignedClientInstaller.java
new file mode 100755
index 0000000..3b16785
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/SignedClientInstaller.java
@@ -0,0 +1,77 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.json.JSONObject;
+import org.teavm.jso.browser.Window;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SignedClientInstaller {
+
+	private static final Logger logger = LogManager.getLogger("SignedClientInstaller");
+
+	public static void installSignedClientAtRuntime(String displayName, Window win, byte[] clientCert,
+			byte[] clientPayload, boolean setDefault, boolean setTimeout) {
+		logger.info("Enabling boot menu...");
+		int f = BootMenuDataManager.getBootMenuFlags(win);
+		if(f == -1) f = 0;
+		f |= 1;
+		BootMenuDataManager.setBootMenuFlags(win, f);
+		logger.info("Loading datastore...");
+		BootMenuDatastore dstore = BootMenuDatastore.openDatastore();
+		try {
+			logger.info("Loading manifest...");
+			BootMenuDataManager dmgr = new BootMenuDataManager(dstore);
+			logger.info("Generating client data...");
+			EaglercraftUUID certUUID = EaglercraftUUID.nameUUIDFromBytes(clientCert);
+			EaglercraftUUID payloadUUID = EaglercraftUUID.nameUUIDFromBytes(clientPayload);
+			Map<EaglercraftUUID, byte[]> blobs = new HashMap<>(2);
+			blobs.put(certUUID, clientCert);
+			blobs.put(payloadUUID, clientPayload);
+			ClientDataEntry clientData = new ClientDataEntry(EnumClientFormatType.EAGLER_SIGNED_OFFLINE,
+					EaglercraftUUID.randomUUID(), payloadUUID, null, certUUID, null);
+			JSONObject launchOptsJSON = BootMenuEntryPoint.getOriginLaunchOptsJSON();
+			launchOptsJSON.put("bootMenuBlocksUnsignedClients", false);
+			RelayRandomizeHelper.makeOptsJSONHaveMacroHack(launchOptsJSON);
+			String launchOpts = launchOptsJSON.toString(4);
+			LaunchConfigEntry launchData = new LaunchConfigEntry(EaglercraftUUID.randomUUID(), clientData.uuid, displayName,
+					EnumClientLaunchType.EAGLERX_SIGNED_V1, null, null, null, null, null, launchOpts, false);
+			logger.info("Installing client data...");
+			dmgr.installNewClientData(launchData, clientData, blobs, false);
+			if(setDefault) {
+				logger.info("Setting boot order...");
+				while(dmgr.launchOrderList.remove(launchData.uuid));
+				dmgr.launchOrderList.add(0, launchData.uuid);
+				dmgr.writeManifest();
+				if(setTimeout) {
+					logger.info("Setting boot timeout...");
+					dmgr.confBootTimeout = 5;
+					dmgr.saveAdditionalConf();
+				}
+			}
+		}finally {
+			logger.info("Cleaning up...");
+			dstore.closeDatastore();
+		}
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/TemplateLoader.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/TemplateLoader.java
new file mode 100755
index 0000000..1c806ce
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/TemplateLoader.java
@@ -0,0 +1,77 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TemplateLoader {
+
+	public static final Map<String, String> baseGlobals;
+	
+	static {
+		baseGlobals = new HashMap<>();
+		baseGlobals.put("client_name", BootMenuConstants.client_projectForkName);
+		baseGlobals.put("client_vendor", BootMenuConstants.client_projectForkVendor);
+		baseGlobals.put("client_version", BootMenuConstants.client_projectForkVersion);
+		baseGlobals.put("game_version", BootMenuConstants.client_projectOriginRevision);
+		baseGlobals.put("client_fork_name", BootMenuConstants.client_projectForkName);
+		baseGlobals.put("client_fork_vendor", BootMenuConstants.client_projectForkVendor);
+		baseGlobals.put("client_fork_version", BootMenuConstants.client_projectForkVersion);
+		baseGlobals.put("client_origin_name", BootMenuConstants.client_projectOriginName);
+		baseGlobals.put("client_origin_vendor", BootMenuConstants.client_projectOriginAuthor);
+		baseGlobals.put("client_origin_version", BootMenuConstants.client_projectOriginVersion);
+		baseGlobals.put("client_origin_revision", BootMenuConstants.client_projectOriginRevision);
+		EaglercraftRandom randomCharGenerator = new EaglercraftRandom();
+		char[] vigg = new char[16];
+		String charSel = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+		for(int i = 0; i < vigg.length; ++i) {
+			vigg[i] = charSel.charAt(randomCharGenerator.nextInt(charSel.length()));
+		}
+		baseGlobals.put("root_class_gen", BootMenuConstants.cssClassPrefix + (new String(vigg)));
+	}
+
+	public static String loadTemplate(String path) throws IOException {
+		return loadTemplate(path, null);
+	}
+
+	public static String loadTemplate(String path, Map<String, String> globals) throws IOException {
+		String basePath;
+		int i = path.lastIndexOf('/');
+		if(i != -1) {
+			basePath = path.substring(0, i);
+		}else {
+			basePath = "";
+		}
+		if(globals != null) {
+			Map<String, String> newGlobals = new HashMap<>();
+			newGlobals.putAll(baseGlobals);
+			newGlobals.putAll(globals);
+			globals = newGlobals;
+		}else {
+			globals = baseGlobals;
+		}
+		String templateContent = BootMenuAssets.loadResourceString(path);
+		if(templateContent == null) {
+			throw new IOException("Could not load template: \"" + path + "\"");
+		}
+		return TemplateParser.loadTemplate(templateContent, basePath, true, globals);
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/TemplateParser.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/TemplateParser.java
new file mode 100755
index 0000000..5738f28
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/TemplateParser.java
@@ -0,0 +1,260 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.commons.lang3.text.StrTokenizer;
+import org.json.JSONObject;
+
+import com.google.common.html.HtmlEscapers;
+
+import net.lax1dude.eaglercraft.v1_8.Base64;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TemplateParser {
+
+	private static class State {
+		private boolean evalAllowed;
+		private String baseDir;
+		private Map<String, String> globals;
+		private boolean htmlEscape;
+		private boolean strEscape;
+		private boolean disableMacros;
+		private boolean enableEval;
+		private State(String baseDir, boolean evalAllowed, Map<String, String> globals) {
+			this.baseDir = baseDir;
+			this.evalAllowed = evalAllowed;
+			this.globals = globals;
+		}
+		private State push() {
+			return new State(baseDir, evalAllowed, globals);
+		}
+	}
+
+	public static String loadTemplate(String content, String baseDir, boolean evalAllowed, Map<String, String> globals) throws IOException {
+		return loadTemplate(content, new State(baseDir, evalAllowed, globals));
+	}
+
+	private static String loadTemplate(String content, State state) throws IOException {
+		StringBuilder ret = new StringBuilder();
+		int i = 0, j = 0;
+		while((i = content.indexOf("{%", j)) != -1) {
+			ret.append(content, j, i);
+			j = i;
+			i = content.indexOf("%}", j + 2);
+			if(i != -1) {
+				ret.append(processMacro(content.substring(j + 2, i), state));
+				j = i + 2;
+			}else {
+				break;
+			}
+		}
+		ret.append(content, j, content.length());
+		return ret.toString();
+	}
+
+	public static class InvalidMacroException extends RuntimeException {
+
+		public InvalidMacroException(String message, Throwable cause) {
+			super(message, cause);
+		}
+
+		public InvalidMacroException(String message) {
+			super(message);
+		}
+
+	}
+
+	private static String processMacro(String content, State state) throws IOException {
+		String trimmed = content.trim();
+		try {
+			String[] strs = (new StrTokenizer(trimmed, ' ', '`')).getTokenArray();
+			if(strs.length < 1) {
+				return "{%" + content + "%}";
+			}
+			if(strs[0].equals("disablemacros") && strs.length == 2) {
+				switch(strs[1]) {
+				case "on":
+					if(state.disableMacros) {
+						return "{%" + content + "%}";
+					}else {
+						state.disableMacros = true;
+						return "";
+					}
+				case "off":
+					state.disableMacros = false;
+					return "";
+				default:
+					if(state.disableMacros) {
+						return "{%" + content + "%}";
+					}else {
+						throw new InvalidMacroException("Unknown disablemacros mode: " + strs[1] + " (Expected: on, off)");
+					}
+				}
+			}else if(!state.disableMacros) {
+				switch(strs[0]) {
+				case "embed":
+					argCheck(3, strs.length);
+					switch(strs[1]) {
+					case "base64":
+						return Base64.encodeBase64String(loadResourceBytes(state.baseDir + "/" + strs[2]));
+					case "text":
+						return escapeMacroResult(loadResourceString(state.baseDir + "/" + strs[2]), state);
+					case "eval":
+						if(state.evalAllowed) {
+							return escapeMacroResult(loadTemplate(loadResourceString(state.baseDir + "/" + strs[2]), state.push()), state);
+						}else {
+							throw new InvalidMacroException("Template tried to eval file \"" + strs[2] + "\"! (eval is disabled)");
+						}
+					default:
+						throw new InvalidMacroException("Unknown embed mode: " + strs[1] + " (Expected: base64, text, eval)");
+					}
+				case "htmlescape":
+					argCheck(2, strs.length);
+					switch(strs[1]) {
+					case "on":
+						state.htmlEscape = true;
+						return "";
+					case "off":
+						state.htmlEscape = false;
+						return "";
+					default:
+						throw new InvalidMacroException("Unknown htmlescape mode: " + strs[1] + " (Expected: on, off)");
+					}
+				case "strescape":
+					argCheck(2, strs.length);
+					switch(strs[1]) {
+					case "on":
+						state.strEscape = true;
+						return "";
+					case "off":
+						state.strEscape = false;
+						return "";
+					default:
+						throw new InvalidMacroException("Unknown strescape mode: " + strs[1] + " (Expected: on, off)");
+					}
+				case "eval":
+					argCheck(2, strs.length);
+					switch(strs[1]) {
+					case "on":
+						if(!state.evalAllowed) {
+							throw new InvalidMacroException("Template tried to enable eval! (eval is disabled)");
+						}
+						state.enableEval = true;
+						return "";
+					case "off":
+						state.enableEval = false;
+						return "";
+					default:
+						throw new InvalidMacroException("Unknown eval mode: " + strs[1] + " (Expected: on, off)");
+					}
+				case "global":
+					argCheck(2, 3, strs.length);
+					String ret = state.globals.get(strs[1]);
+					if(ret == null) {
+						if(strs.length == 3) {
+							ret = strs[2];
+						}else {
+							throw new InvalidMacroException("Unknown global \"" + strs[1] + "\"! (Available: " + String.join(", ", state.globals.keySet()) + ")");
+						}
+					}
+					return escapeMacroResult(ret, state);
+				case "property":
+					argCheck(2, 3, strs.length);
+					ret = System.getProperty(strs[1]);
+					if(ret == null) {
+						if(strs.length == 3) {
+							ret = strs[2];
+						}else {
+							throw new InvalidMacroException("Unknown system property \"" + strs[1] + "\"!");
+						}
+					}
+					return escapeMacroResult(ret, state);
+				case "text":
+					argCheck(2, strs.length);
+					return escapeMacroResult(strs[1], state);
+//				case "translate":
+//					argCheckMin(2, strs.length);
+//					String[] additionalArgs = new String[strs.length - 2];
+//					System.arraycopy(strs, 2, additionalArgs, 0, additionalArgs.length);
+//					return escapeMacroResult(BungeeCord.getInstance().getTranslation(strs[1], (Object[])additionalArgs), state);
+				default:
+					return "{%" + content + "%}";
+				}
+			}else {
+				return "{%" + content + "%}";
+			}
+		}catch(InvalidMacroException ex) {
+			throw new IOException("Invalid macro: {% " + trimmed + " %}, message: " + ex.getMessage(), ex);
+		}catch(Throwable th) {
+			throw new IOException("Error processing: {% " + trimmed + " %}, raised: " + th.toString(), th);
+		}
+	}
+
+	private static String escapeMacroResult(String str, State state) throws IOException {
+		if(str.length() > 0) {
+			if(state.evalAllowed && state.enableEval) {
+				str = loadTemplate(str, state.push());
+			}
+			if(state.strEscape) {
+				str = (new JSONObject()).put("e", str).toString(); //rip
+				if(str.length() >= 8) {
+					str = str.substring(6, str.length() - 2);
+				}
+			}
+			if(state.htmlEscape) {
+				str = HtmlEscapers.htmlEscaper().escape(str);
+			}
+		}
+		return str;
+	}
+
+	private static void argCheck(int expect, int actual) {
+		if(expect != actual) {
+			throw new InvalidMacroException("Wrong number of arguments (" + actual + ", expected " + expect + ")");
+		}
+	}
+
+	private static void argCheck(int expectMin, int expectMax, int actual) {
+		if(expectMin > actual || expectMax < actual) {
+			throw new InvalidMacroException("Wrong number of arguments (" + actual + ", expected " + expectMin + " to " + expectMax + ")");
+		}
+	}
+
+	private static void argCheckMin(int expectMin, int actual) {
+		if(expectMin > actual) {
+			throw new InvalidMacroException("Wrong number of arguments (expected " + expectMin + " or more, got " + actual + ")");
+		}
+	}
+
+	private static byte[] loadResourceBytes(String path) {
+		byte[] res = BootMenuAssets.loadResourceBytes(path);
+		if(res == null) {
+			throw new InvalidMacroException("Unknown file: " + path);
+		}
+		return res;
+	}
+
+	private static String loadResourceString(String path) {
+		String res = BootMenuAssets.loadResourceString(path);
+		if(res == null) {
+			throw new InvalidMacroException("Unknown file: " + path);
+		}
+		return res;
+	}
+
+}
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/UnsignedBootException.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/UnsignedBootException.java
new file mode 100755
index 0000000..1c39eac
--- /dev/null
+++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/UnsignedBootException.java
@@ -0,0 +1,23 @@
+package net.lax1dude.eaglercraft.v1_8.boot_menu.teavm;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class UnsignedBootException extends RuntimeException {
+
+	public UnsignedBootException() {
+	}
+
+}
diff --git a/src/teavm/java/com/jcraft/jogg/Buffer.java b/src/teavm/java/com/jcraft/jogg/Buffer.java
new file mode 100755
index 0000000..dde9158
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jogg/Buffer.java
@@ -0,0 +1,293 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jogg;
+
+public class Buffer {
+	private static final int BUFFER_INCREMENT = 256;
+
+	private static final int[] mask = { 0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f, 0x0000001f,
+			0x0000003f, 0x0000007f, 0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff,
+			0x00007fff, 0x0000ffff, 0x0001ffff, 0x0003ffff, 0x0007ffff, 0x000fffff, 0x001fffff, 0x003fffff, 0x007fffff,
+			0x00ffffff, 0x01ffffff, 0x03ffffff, 0x07ffffff, 0x0fffffff, 0x1fffffff, 0x3fffffff, 0x7fffffff,
+			0xffffffff };
+
+	int ptr = 0;
+	byte[] buffer = null;
+	int endbit = 0;
+	int endbyte = 0;
+	int storage = 0;
+
+	public void writeinit() {
+		buffer = new byte[BUFFER_INCREMENT];
+		ptr = 0;
+		buffer[0] = (byte) '\0';
+		storage = BUFFER_INCREMENT;
+	}
+
+	public void write(byte[] s) {
+		for (int i = 0; i < s.length; i++) {
+			if (s[i] == 0)
+				break;
+			write(s[i], 8);
+		}
+	}
+
+	public void read(byte[] s, int bytes) {
+		int i = 0;
+		while (bytes-- != 0) {
+			s[i++] = (byte) (read(8));
+		}
+	}
+
+	void reset() {
+		ptr = 0;
+		buffer[0] = (byte) '\0';
+		endbit = endbyte = 0;
+	}
+
+	public void writeclear() {
+		buffer = null;
+	}
+
+	public void readinit(byte[] buf, int bytes) {
+		readinit(buf, 0, bytes);
+	}
+
+	public void readinit(byte[] buf, int start, int bytes) {
+		ptr = start;
+		buffer = buf;
+		endbit = endbyte = 0;
+		storage = bytes;
+	}
+
+	public void write(int value, int bits) {
+		if (endbyte + 4 >= storage) {
+			byte[] foo = new byte[storage + BUFFER_INCREMENT];
+			System.arraycopy(buffer, 0, foo, 0, storage);
+			buffer = foo;
+			storage += BUFFER_INCREMENT;
+		}
+
+		value &= mask[bits];
+		bits += endbit;
+		buffer[ptr] |= (byte) (value << endbit);
+
+		if (bits >= 8) {
+			buffer[ptr + 1] = (byte) (value >>> (8 - endbit));
+			if (bits >= 16) {
+				buffer[ptr + 2] = (byte) (value >>> (16 - endbit));
+				if (bits >= 24) {
+					buffer[ptr + 3] = (byte) (value >>> (24 - endbit));
+					if (bits >= 32) {
+						if (endbit > 0)
+							buffer[ptr + 4] = (byte) (value >>> (32 - endbit));
+						else
+							buffer[ptr + 4] = 0;
+					}
+				}
+			}
+		}
+
+		endbyte += bits / 8;
+		ptr += bits / 8;
+		endbit = bits & 7;
+	}
+
+	public int look(int bits) {
+		int ret;
+		int m = mask[bits];
+
+		bits += endbit;
+
+		if (endbyte + 4 >= storage) {
+			if (endbyte + (bits - 1) / 8 >= storage)
+				return (-1);
+		}
+
+		ret = ((buffer[ptr]) & 0xff) >>> endbit;
+		if (bits > 8) {
+			ret |= ((buffer[ptr + 1]) & 0xff) << (8 - endbit);
+			if (bits > 16) {
+				ret |= ((buffer[ptr + 2]) & 0xff) << (16 - endbit);
+				if (bits > 24) {
+					ret |= ((buffer[ptr + 3]) & 0xff) << (24 - endbit);
+					if (bits > 32 && endbit != 0) {
+						ret |= ((buffer[ptr + 4]) & 0xff) << (32 - endbit);
+					}
+				}
+			}
+		}
+		return (m & ret);
+	}
+
+	public int look1() {
+		if (endbyte >= storage)
+			return (-1);
+		return ((buffer[ptr] >> endbit) & 1);
+	}
+
+	public void adv(int bits) {
+		bits += endbit;
+		ptr += bits / 8;
+		endbyte += bits / 8;
+		endbit = bits & 7;
+	}
+
+	public void adv1() {
+		++endbit;
+		if (endbit > 7) {
+			endbit = 0;
+			ptr++;
+			endbyte++;
+		}
+	}
+
+	public int read(int bits) {
+		int ret;
+		int m = mask[bits];
+
+		bits += endbit;
+
+		if (endbyte + 4 >= storage) {
+			ret = -1;
+			if (endbyte + (bits - 1) / 8 >= storage) {
+				ptr += bits / 8;
+				endbyte += bits / 8;
+				endbit = bits & 7;
+				return (ret);
+			}
+		}
+
+		ret = ((buffer[ptr]) & 0xff) >>> endbit;
+		if (bits > 8) {
+			ret |= ((buffer[ptr + 1]) & 0xff) << (8 - endbit);
+			if (bits > 16) {
+				ret |= ((buffer[ptr + 2]) & 0xff) << (16 - endbit);
+				if (bits > 24) {
+					ret |= ((buffer[ptr + 3]) & 0xff) << (24 - endbit);
+					if (bits > 32 && endbit != 0) {
+						ret |= ((buffer[ptr + 4]) & 0xff) << (32 - endbit);
+					}
+				}
+			}
+		}
+
+		ret &= m;
+
+		ptr += bits / 8;
+		endbyte += bits / 8;
+		endbit = bits & 7;
+		return (ret);
+	}
+
+	public int readB(int bits) {
+		int ret;
+		int m = 32 - bits;
+
+		bits += endbit;
+
+		if (endbyte + 4 >= storage) {
+			/* not the main path */
+			ret = -1;
+			if (endbyte * 8 + bits > storage * 8) {
+				ptr += bits / 8;
+				endbyte += bits / 8;
+				endbit = bits & 7;
+				return (ret);
+			}
+		}
+
+		ret = (buffer[ptr] & 0xff) << (24 + endbit);
+		if (bits > 8) {
+			ret |= (buffer[ptr + 1] & 0xff) << (16 + endbit);
+			if (bits > 16) {
+				ret |= (buffer[ptr + 2] & 0xff) << (8 + endbit);
+				if (bits > 24) {
+					ret |= (buffer[ptr + 3] & 0xff) << (endbit);
+					if (bits > 32 && (endbit != 0))
+						ret |= (buffer[ptr + 4] & 0xff) >> (8 - endbit);
+				}
+			}
+		}
+		ret = (ret >>> (m >> 1)) >>> ((m + 1) >> 1);
+
+		ptr += bits / 8;
+		endbyte += bits / 8;
+		endbit = bits & 7;
+		return (ret);
+	}
+
+	public int read1() {
+		int ret;
+		if (endbyte >= storage) {
+			ret = -1;
+			endbit++;
+			if (endbit > 7) {
+				endbit = 0;
+				ptr++;
+				endbyte++;
+			}
+			return (ret);
+		}
+
+		ret = (buffer[ptr] >> endbit) & 1;
+
+		endbit++;
+		if (endbit > 7) {
+			endbit = 0;
+			ptr++;
+			endbyte++;
+		}
+		return (ret);
+	}
+
+	public int bytes() {
+		return (endbyte + (endbit + 7) / 8);
+	}
+
+	public int bits() {
+		return (endbyte * 8 + endbit);
+	}
+
+	public byte[] buffer() {
+		return (buffer);
+	}
+
+	public static int ilog(int v) {
+		int ret = 0;
+		while (v > 0) {
+			ret++;
+			v >>>= 1;
+		}
+		return (ret);
+	}
+
+	public static void report(String in) {
+		System.err.println(in);
+		System.exit(1);
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jogg/Packet.java b/src/teavm/java/com/jcraft/jogg/Packet.java
new file mode 100755
index 0000000..d78e6f5
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jogg/Packet.java
@@ -0,0 +1,45 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jogg;
+
+public class Packet {
+	public byte[] packet_base;
+	public int packet;
+	public int bytes;
+	public int b_o_s;
+	public int e_o_s;
+
+	public long granulepos;
+
+	/**
+	 * sequence number for decode; the framing knows where there's a hole in the
+	 * data, but we need coupling so that the codec (which is in a seperate
+	 * abstraction layer) also knows about the gap
+	 */
+	public long packetno;
+
+}
diff --git a/src/teavm/java/com/jcraft/jogg/Page.java b/src/teavm/java/com/jcraft/jogg/Page.java
new file mode 100755
index 0000000..f9d29fe
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jogg/Page.java
@@ -0,0 +1,130 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jogg;
+
+public class Page {
+	private static int[] crc_lookup = new int[256];
+	static {
+		for (int i = 0; i < crc_lookup.length; i++) {
+			crc_lookup[i] = crc_entry(i);
+		}
+	}
+
+	private static int crc_entry(int index) {
+		int r = index << 24;
+		for (int i = 0; i < 8; i++) {
+			if ((r & 0x80000000) != 0) {
+				r = (r << 1) ^ 0x04c11db7; /*
+											 * The same as the ethernet generator polynomial, although we use an
+											 * unreflected alg and an init/final of 0, not 0xffffffff
+											 */
+			} else {
+				r <<= 1;
+			}
+		}
+		return (r & 0xffffffff);
+	}
+
+	public byte[] header_base;
+	public int header;
+	public int header_len;
+	public byte[] body_base;
+	public int body;
+	public int body_len;
+
+	int version() {
+		return header_base[header + 4] & 0xff;
+	}
+
+	int continued() {
+		return (header_base[header + 5] & 0x01);
+	}
+
+	public int bos() {
+		return (header_base[header + 5] & 0x02);
+	}
+
+	public int eos() {
+		return (header_base[header + 5] & 0x04);
+	}
+
+	public long granulepos() {
+		long foo = header_base[header + 13] & 0xff;
+		foo = (foo << 8) | (header_base[header + 12] & 0xff);
+		foo = (foo << 8) | (header_base[header + 11] & 0xff);
+		foo = (foo << 8) | (header_base[header + 10] & 0xff);
+		foo = (foo << 8) | (header_base[header + 9] & 0xff);
+		foo = (foo << 8) | (header_base[header + 8] & 0xff);
+		foo = (foo << 8) | (header_base[header + 7] & 0xff);
+		foo = (foo << 8) | (header_base[header + 6] & 0xff);
+		return (foo);
+	}
+
+	public int serialno() {
+		return (header_base[header + 14] & 0xff) | ((header_base[header + 15] & 0xff) << 8)
+				| ((header_base[header + 16] & 0xff) << 16) | ((header_base[header + 17] & 0xff) << 24);
+	}
+
+	int pageno() {
+		return (header_base[header + 18] & 0xff) | ((header_base[header + 19] & 0xff) << 8)
+				| ((header_base[header + 20] & 0xff) << 16) | ((header_base[header + 21] & 0xff) << 24);
+	}
+
+	void checksum() {
+		int crc_reg = 0;
+
+		for (int i = 0; i < header_len; i++) {
+			crc_reg = (crc_reg << 8) ^ crc_lookup[((crc_reg >>> 24) & 0xff) ^ (header_base[header + i] & 0xff)];
+		}
+		for (int i = 0; i < body_len; i++) {
+			crc_reg = (crc_reg << 8) ^ crc_lookup[((crc_reg >>> 24) & 0xff) ^ (body_base[body + i] & 0xff)];
+		}
+		header_base[header + 22] = (byte) crc_reg;
+		header_base[header + 23] = (byte) (crc_reg >>> 8);
+		header_base[header + 24] = (byte) (crc_reg >>> 16);
+		header_base[header + 25] = (byte) (crc_reg >>> 24);
+	}
+
+	public Page copy() {
+		return copy(new Page());
+	}
+
+	public Page copy(Page p) {
+		byte[] tmp = new byte[header_len];
+		System.arraycopy(header_base, header, tmp, 0, header_len);
+		p.header_len = header_len;
+		p.header_base = tmp;
+		p.header = 0;
+		tmp = new byte[body_len];
+		System.arraycopy(body_base, body, tmp, 0, body_len);
+		p.body_len = body_len;
+		p.body_base = tmp;
+		p.body = 0;
+		return p;
+	}
+
+}
diff --git a/src/teavm/java/com/jcraft/jogg/StreamState.java b/src/teavm/java/com/jcraft/jogg/StreamState.java
new file mode 100755
index 0000000..e9c3663
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jogg/StreamState.java
@@ -0,0 +1,538 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jogg;
+
+public class StreamState {
+	byte[] body_data; /* bytes from packet bodies */
+	int body_storage; /* storage elements allocated */
+	int body_fill; /* elements stored; fill mark */
+	private int body_returned; /* elements of fill returned */
+
+	int[] lacing_vals; /* The values that will go to the segment table */
+	long[] granule_vals; /*
+							 * pcm_pos values for headers. Not compact this way, but it is simple coupled to
+							 * the lacing fifo
+							 */
+	int lacing_storage;
+	int lacing_fill;
+	int lacing_packet;
+	int lacing_returned;
+
+	byte[] header = new byte[282]; /* working space for header encode */
+	int header_fill;
+
+	public int e_o_s; /*
+						 * set when we have buffered the last packet in the logical bitstream
+						 */
+	int b_o_s; /*
+				 * set after we've written the initial page of a logical bitstream
+				 */
+	int serialno;
+	int pageno;
+	long packetno; /*
+					 * sequence number for decode; the framing knows where there's a hole in the
+					 * data, but we need coupling so that the codec (which is in a seperate
+					 * abstraction layer) also knows about the gap
+					 */
+	long granulepos;
+
+	public StreamState() {
+		init();
+	}
+
+	StreamState(int serialno) {
+		this();
+		init(serialno);
+	}
+
+	void init() {
+		body_storage = 16 * 1024;
+		body_data = new byte[body_storage];
+		lacing_storage = 1024;
+		lacing_vals = new int[lacing_storage];
+		granule_vals = new long[lacing_storage];
+	}
+
+	public void init(int serialno) {
+		if (body_data == null) {
+			init();
+		} else {
+			for (int i = 0; i < body_data.length; i++)
+				body_data[i] = 0;
+			for (int i = 0; i < lacing_vals.length; i++)
+				lacing_vals[i] = 0;
+			for (int i = 0; i < granule_vals.length; i++)
+				granule_vals[i] = 0;
+		}
+		this.serialno = serialno;
+	}
+
+	public void clear() {
+		body_data = null;
+		lacing_vals = null;
+		granule_vals = null;
+	}
+
+	void destroy() {
+		clear();
+	}
+
+	void body_expand(int needed) {
+		if (body_storage <= body_fill + needed) {
+			body_storage += (needed + 1024);
+			byte[] foo = new byte[body_storage];
+			System.arraycopy(body_data, 0, foo, 0, body_data.length);
+			body_data = foo;
+		}
+	}
+
+	void lacing_expand(int needed) {
+		if (lacing_storage <= lacing_fill + needed) {
+			lacing_storage += (needed + 32);
+			int[] foo = new int[lacing_storage];
+			System.arraycopy(lacing_vals, 0, foo, 0, lacing_vals.length);
+			lacing_vals = foo;
+
+			long[] bar = new long[lacing_storage];
+			System.arraycopy(granule_vals, 0, bar, 0, granule_vals.length);
+			granule_vals = bar;
+		}
+	}
+
+	/* submit data to the internal buffer of the framing engine */
+	public int packetin(Packet op) {
+		int lacing_val = op.bytes / 255 + 1;
+
+		if (body_returned != 0) {
+			/*
+			 * advance packet data according to the body_returned pointer. We had to keep it
+			 * around to return a pointer into the buffer last call
+			 */
+
+			body_fill -= body_returned;
+			if (body_fill != 0) {
+				System.arraycopy(body_data, body_returned, body_data, 0, body_fill);
+			}
+			body_returned = 0;
+		}
+
+		/* make sure we have the buffer storage */
+		body_expand(op.bytes);
+		lacing_expand(lacing_val);
+
+		/*
+		 * Copy in the submitted packet. Yes, the copy is a waste; this is the liability
+		 * of overly clean abstraction for the time being. It will actually be fairly
+		 * easy to eliminate the extra copy in the future
+		 */
+
+		System.arraycopy(op.packet_base, op.packet, body_data, body_fill, op.bytes);
+		body_fill += op.bytes;
+
+		/* Store lacing vals for this packet */
+		int j;
+		for (j = 0; j < lacing_val - 1; j++) {
+			lacing_vals[lacing_fill + j] = 255;
+			granule_vals[lacing_fill + j] = granulepos;
+		}
+		lacing_vals[lacing_fill + j] = (op.bytes) % 255;
+		granulepos = granule_vals[lacing_fill + j] = op.granulepos;
+
+		/* flag the first segment as the beginning of the packet */
+		lacing_vals[lacing_fill] |= 0x100;
+
+		lacing_fill += lacing_val;
+
+		/* for the sake of completeness */
+		packetno++;
+
+		if (op.e_o_s != 0)
+			e_o_s = 1;
+		return (0);
+	}
+
+	public int packetout(Packet op) {
+
+		/*
+		 * The last part of decode. We have the stream broken into packet segments. Now
+		 * we need to group them into packets (or return the out of sync markers)
+		 */
+
+		int ptr = lacing_returned;
+
+		if (lacing_packet <= ptr) {
+			return (0);
+		}
+
+		if ((lacing_vals[ptr] & 0x400) != 0) {
+			/* We lost sync here; let the app know */
+			lacing_returned++;
+
+			/*
+			 * we need to tell the codec there's a gap; it might need to handle previous
+			 * packet dependencies.
+			 */
+			packetno++;
+			return (-1);
+		}
+
+		/* Gather the whole packet. We'll have no holes or a partial packet */
+		{
+			int size = lacing_vals[ptr] & 0xff;
+			int bytes = 0;
+
+			op.packet_base = body_data;
+			op.packet = body_returned;
+			op.e_o_s = lacing_vals[ptr] & 0x200; /* last packet of the stream? */
+			op.b_o_s = lacing_vals[ptr] & 0x100; /* first packet of the stream? */
+			bytes += size;
+
+			while (size == 255) {
+				int val = lacing_vals[++ptr];
+				size = val & 0xff;
+				if ((val & 0x200) != 0)
+					op.e_o_s = 0x200;
+				bytes += size;
+			}
+
+			op.packetno = packetno;
+			op.granulepos = granule_vals[ptr];
+			op.bytes = bytes;
+
+			body_returned += bytes;
+
+			lacing_returned = ptr + 1;
+		}
+		packetno++;
+		return (1);
+	}
+
+	// add the incoming page to the stream state; we decompose the page
+	// into packet segments here as well.
+
+	public int pagein(Page og) {
+		byte[] header_base = og.header_base;
+		int header = og.header;
+		byte[] body_base = og.body_base;
+		int body = og.body;
+		int bodysize = og.body_len;
+		int segptr = 0;
+
+		int version = og.version();
+		int continued = og.continued();
+		int bos = og.bos();
+		int eos = og.eos();
+		long granulepos = og.granulepos();
+		int _serialno = og.serialno();
+		int _pageno = og.pageno();
+		int segments = header_base[header + 26] & 0xff;
+
+		// clean up 'returned data'
+		{
+			int lr = lacing_returned;
+			int br = body_returned;
+
+			// body data
+			if (br != 0) {
+				body_fill -= br;
+				if (body_fill != 0) {
+					System.arraycopy(body_data, br, body_data, 0, body_fill);
+				}
+				body_returned = 0;
+			}
+
+			if (lr != 0) {
+				// segment table
+				if ((lacing_fill - lr) != 0) {
+					System.arraycopy(lacing_vals, lr, lacing_vals, 0, lacing_fill - lr);
+					System.arraycopy(granule_vals, lr, granule_vals, 0, lacing_fill - lr);
+				}
+				lacing_fill -= lr;
+				lacing_packet -= lr;
+				lacing_returned = 0;
+			}
+		}
+
+		// check the serial number
+		if (_serialno != serialno)
+			return (-1);
+		if (version > 0)
+			return (-1);
+
+		lacing_expand(segments + 1);
+
+		// are we in sequence?
+		if (_pageno != pageno) {
+			int i;
+
+			// unroll previous partial packet (if any)
+			for (i = lacing_packet; i < lacing_fill; i++) {
+				body_fill -= lacing_vals[i] & 0xff;
+				// System.out.println("??");
+			}
+			lacing_fill = lacing_packet;
+
+			// make a note of dropped data in segment table
+			if (pageno != -1) {
+				lacing_vals[lacing_fill++] = 0x400;
+				lacing_packet++;
+			}
+
+			// are we a 'continued packet' page? If so, we'll need to skip
+			// some segments
+			if (continued != 0) {
+				bos = 0;
+				for (; segptr < segments; segptr++) {
+					int val = (header_base[header + 27 + segptr] & 0xff);
+					body += val;
+					bodysize -= val;
+					if (val < 255) {
+						segptr++;
+						break;
+					}
+				}
+			}
+		}
+
+		if (bodysize != 0) {
+			body_expand(bodysize);
+			System.arraycopy(body_base, body, body_data, body_fill, bodysize);
+			body_fill += bodysize;
+		}
+
+		{
+			int saved = -1;
+			while (segptr < segments) {
+				int val = (header_base[header + 27 + segptr] & 0xff);
+				lacing_vals[lacing_fill] = val;
+				granule_vals[lacing_fill] = -1;
+
+				if (bos != 0) {
+					lacing_vals[lacing_fill] |= 0x100;
+					bos = 0;
+				}
+
+				if (val < 255)
+					saved = lacing_fill;
+
+				lacing_fill++;
+				segptr++;
+
+				if (val < 255)
+					lacing_packet = lacing_fill;
+			}
+
+			/* set the granulepos on the last pcmval of the last full packet */
+			if (saved != -1) {
+				granule_vals[saved] = granulepos;
+			}
+		}
+
+		if (eos != 0) {
+			e_o_s = 1;
+			if (lacing_fill > 0)
+				lacing_vals[lacing_fill - 1] |= 0x200;
+		}
+
+		pageno = _pageno + 1;
+		return (0);
+	}
+
+	/*
+	 * This will flush remaining packets into a page (returning nonzero), even if
+	 * there is not enough data to trigger a flush normally (undersized page). If
+	 * there are no packets or partial packets to flush, ogg_stream_flush returns 0.
+	 * Note that ogg_stream_flush will try to flush a normal sized page like
+	 * ogg_stream_pageout; a call to ogg_stream_flush does not gurantee that all
+	 * packets have flushed. Only a return value of 0 from ogg_stream_flush
+	 * indicates all packet data is flushed into pages.
+	 * 
+	 * ogg_stream_page will flush the last page in a stream even if it's undersized;
+	 * you almost certainly want to use ogg_stream_pageout (and *not*
+	 * ogg_stream_flush) unless you need to flush an undersized page in the middle
+	 * of a stream for some reason.
+	 */
+
+	public int flush(Page og) {
+
+		int i;
+		int vals = 0;
+		int maxvals = (lacing_fill > 255 ? 255 : lacing_fill);
+		int bytes = 0;
+		int acc = 0;
+		long granule_pos = granule_vals[0];
+
+		if (maxvals == 0)
+			return (0);
+
+		/* construct a page */
+		/* decide how many segments to include */
+
+		/*
+		 * If this is the initial header case, the first page must only include the
+		 * initial header packet
+		 */
+		if (b_o_s == 0) { /* 'initial header page' case */
+			granule_pos = 0;
+			for (vals = 0; vals < maxvals; vals++) {
+				if ((lacing_vals[vals] & 0x0ff) < 255) {
+					vals++;
+					break;
+				}
+			}
+		} else {
+			for (vals = 0; vals < maxvals; vals++) {
+				if (acc > 4096)
+					break;
+				acc += (lacing_vals[vals] & 0x0ff);
+				granule_pos = granule_vals[vals];
+			}
+		}
+
+		/* construct the header in temp storage */
+		System.arraycopy("OggS".getBytes(), 0, header, 0, 4);
+
+		/* stream structure version */
+		header[4] = 0x00;
+
+		/* continued packet flag? */
+		header[5] = 0x00;
+		if ((lacing_vals[0] & 0x100) == 0)
+			header[5] |= 0x01;
+		/* first page flag? */
+		if (b_o_s == 0)
+			header[5] |= 0x02;
+		/* last page flag? */
+		if (e_o_s != 0 && lacing_fill == vals)
+			header[5] |= 0x04;
+		b_o_s = 1;
+
+		/* 64 bits of PCM position */
+		for (i = 6; i < 14; i++) {
+			header[i] = (byte) granule_pos;
+			granule_pos >>>= 8;
+		}
+
+		/* 32 bits of stream serial number */
+		{
+			int _serialno = serialno;
+			for (i = 14; i < 18; i++) {
+				header[i] = (byte) _serialno;
+				_serialno >>>= 8;
+			}
+		}
+
+		/*
+		 * 32 bits of page counter (we have both counter and page header because this
+		 * val can roll over)
+		 */
+		if (pageno == -1)
+			pageno = 0; /*
+						 * because someone called stream_reset; this would be a strange thing to do in
+						 * an encode stream, but it has plausible uses
+						 */
+		{
+			int _pageno = pageno++;
+			for (i = 18; i < 22; i++) {
+				header[i] = (byte) _pageno;
+				_pageno >>>= 8;
+			}
+		}
+
+		/* zero for computation; filled in later */
+		header[22] = 0;
+		header[23] = 0;
+		header[24] = 0;
+		header[25] = 0;
+
+		/* segment table */
+		header[26] = (byte) vals;
+		for (i = 0; i < vals; i++) {
+			header[i + 27] = (byte) lacing_vals[i];
+			bytes += (header[i + 27] & 0xff);
+		}
+
+		/* set pointers in the ogg_page struct */
+		og.header_base = header;
+		og.header = 0;
+		og.header_len = header_fill = vals + 27;
+		og.body_base = body_data;
+		og.body = body_returned;
+		og.body_len = bytes;
+
+		/* advance the lacing data and set the body_returned pointer */
+
+		lacing_fill -= vals;
+		System.arraycopy(lacing_vals, vals, lacing_vals, 0, lacing_fill * 4);
+		System.arraycopy(granule_vals, vals, granule_vals, 0, lacing_fill * 8);
+		body_returned += bytes;
+
+		/* calculate the checksum */
+
+		og.checksum();
+
+		/* done */
+		return (1);
+	}
+
+	/*
+	 * This constructs pages from buffered packet segments. The pointers returned
+	 * are to static buffers; do not free. The returned buffers are good only until
+	 * the next call (using the same ogg_stream_state)
+	 */
+	public int pageout(Page og) {
+		if ((e_o_s != 0 && lacing_fill != 0) || /* 'were done, now flush' case */
+				body_fill - body_returned > 4096 || /* 'page nominal size' case */
+				lacing_fill >= 255 || /* 'segment table full' case */
+				(lacing_fill != 0 && b_o_s == 0)) { /* 'initial header page' case */
+			return flush(og);
+		}
+		return 0;
+	}
+
+	public int eof() {
+		return e_o_s;
+	}
+
+	public int reset() {
+		body_fill = 0;
+		body_returned = 0;
+
+		lacing_fill = 0;
+		lacing_packet = 0;
+		lacing_returned = 0;
+
+		header_fill = 0;
+
+		e_o_s = 0;
+		b_o_s = 0;
+		pageno = -1;
+		packetno = 0;
+		granulepos = 0;
+		return (0);
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jogg/SyncState.java b/src/teavm/java/com/jcraft/jogg/SyncState.java
new file mode 100755
index 0000000..a706c4f
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jogg/SyncState.java
@@ -0,0 +1,273 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jogg;
+
+// DECODING PRIMITIVES: packet streaming layer
+
+// This has two layers to place more of the multi-serialno and paging
+// control in the application's hands.  First, we expose a data buffer
+// using ogg_decode_buffer().  The app either copies into the
+// buffer, or passes it directly to read(), etc.  We then call
+// ogg_decode_wrote() to tell how many bytes we just added.
+//
+// Pages are returned (pointers into the buffer in ogg_sync_state)
+// by ogg_decode_stream().  The page is then submitted to
+// ogg_decode_page() along with the appropriate
+// ogg_stream_state* (ie, matching serialno).  We then get raw
+// packets out calling ogg_stream_packet() with a
+// ogg_stream_state.  See the 'frame-prog.txt' docs for details and
+// example code.
+
+public class SyncState {
+
+	public byte[] data;
+	int storage;
+	int fill;
+	int returned;
+
+	int unsynced;
+	int headerbytes;
+	int bodybytes;
+
+	public int clear() {
+		data = null;
+		return (0);
+	}
+
+	public int buffer(int size) {
+		// first, clear out any space that has been previously returned
+		if (returned != 0) {
+			fill -= returned;
+			if (fill > 0) {
+				System.arraycopy(data, returned, data, 0, fill);
+			}
+			returned = 0;
+		}
+
+		if (size > storage - fill) {
+			// We need to extend the internal buffer
+			int newsize = size + fill + 4096; // an extra page to be nice
+			if (data != null) {
+				byte[] foo = new byte[newsize];
+				System.arraycopy(data, 0, foo, 0, data.length);
+				data = foo;
+			} else {
+				data = new byte[newsize];
+			}
+			storage = newsize;
+		}
+
+		return (fill);
+	}
+
+	public int wrote(int bytes) {
+		if (fill + bytes > storage)
+			return (-1);
+		fill += bytes;
+		return (0);
+	}
+
+	// sync the stream. This is meant to be useful for finding page
+	// boundaries.
+	//
+	// return values for this:
+	// -n) skipped n bytes
+	// 0) page not ready; more data (no bytes skipped)
+	// n) page synced at current location; page length n bytes
+	private Page pageseek = new Page();
+	private byte[] chksum = new byte[4];
+
+	public int pageseek(Page og) {
+		int page = returned;
+		int next;
+		int bytes = fill - returned;
+
+		if (headerbytes == 0) {
+			int _headerbytes, i;
+			if (bytes < 27)
+				return (0); // not enough for a header
+
+			/* verify capture pattern */
+			if (data[page] != 'O' || data[page + 1] != 'g' || data[page + 2] != 'g' || data[page + 3] != 'S') {
+				headerbytes = 0;
+				bodybytes = 0;
+
+				// search for possible capture
+				next = 0;
+				for (int ii = 0; ii < bytes - 1; ii++) {
+					if (data[page + 1 + ii] == 'O') {
+						next = page + 1 + ii;
+						break;
+					}
+				}
+				// next=memchr(page+1,'O',bytes-1);
+				if (next == 0)
+					next = fill;
+
+				returned = next;
+				return (-(next - page));
+			}
+			_headerbytes = (data[page + 26] & 0xff) + 27;
+			if (bytes < _headerbytes)
+				return (0); // not enough for header + seg table
+
+			// count up body length in the segment table
+
+			for (i = 0; i < (data[page + 26] & 0xff); i++) {
+				bodybytes += (data[page + 27 + i] & 0xff);
+			}
+			headerbytes = _headerbytes;
+		}
+
+		if (bodybytes + headerbytes > bytes)
+			return (0);
+
+		// The whole test page is buffered. Verify the checksum
+		synchronized (chksum) {
+			// Grab the checksum bytes, set the header field to zero
+
+			System.arraycopy(data, page + 22, chksum, 0, 4);
+			data[page + 22] = 0;
+			data[page + 23] = 0;
+			data[page + 24] = 0;
+			data[page + 25] = 0;
+
+			// set up a temp page struct and recompute the checksum
+			Page log = pageseek;
+			log.header_base = data;
+			log.header = page;
+			log.header_len = headerbytes;
+
+			log.body_base = data;
+			log.body = page + headerbytes;
+			log.body_len = bodybytes;
+			log.checksum();
+
+			// Compare
+			if (chksum[0] != data[page + 22] || chksum[1] != data[page + 23] || chksum[2] != data[page + 24]
+					|| chksum[3] != data[page + 25]) {
+				// D'oh. Mismatch! Corrupt page (or miscapture and not a page at all)
+				// replace the computed checksum with the one actually read in
+				System.arraycopy(chksum, 0, data, page + 22, 4);
+				// Bad checksum. Lose sync */
+
+				headerbytes = 0;
+				bodybytes = 0;
+				// search for possible capture
+				next = 0;
+				for (int ii = 0; ii < bytes - 1; ii++) {
+					if (data[page + 1 + ii] == 'O') {
+						next = page + 1 + ii;
+						break;
+					}
+				}
+				// next=memchr(page+1,'O',bytes-1);
+				if (next == 0)
+					next = fill;
+				returned = next;
+				return (-(next - page));
+			}
+		}
+
+		// yes, have a whole page all ready to go
+		{
+			page = returned;
+
+			if (og != null) {
+				og.header_base = data;
+				og.header = page;
+				og.header_len = headerbytes;
+				og.body_base = data;
+				og.body = page + headerbytes;
+				og.body_len = bodybytes;
+			}
+
+			unsynced = 0;
+			returned += (bytes = headerbytes + bodybytes);
+			headerbytes = 0;
+			bodybytes = 0;
+			return (bytes);
+		}
+	}
+
+	// sync the stream and get a page. Keep trying until we find a page.
+	// Supress 'sync errors' after reporting the first.
+	//
+	// return values:
+	// -1) recapture (hole in data)
+	// 0) need more data
+	// 1) page returned
+	//
+	// Returns pointers into buffered data; invalidated by next call to
+	// _stream, _clear, _init, or _buffer
+
+	public int pageout(Page og) {
+		// all we need to do is verify a page at the head of the stream
+		// buffer. If it doesn't verify, we look for the next potential
+		// frame
+
+		while (true) {
+			int ret = pageseek(og);
+			if (ret > 0) {
+				// have a page
+				return (1);
+			}
+			if (ret == 0) {
+				// need more data
+				return (0);
+			}
+
+			// head did not start a synced page... skipped some bytes
+			if (unsynced == 0) {
+				unsynced = 1;
+				return (-1);
+			}
+			// loop. keep looking
+		}
+	}
+
+	// clear things to an initial state. Good to call, eg, before seeking
+	public int reset() {
+		fill = 0;
+		returned = 0;
+		unsynced = 0;
+		headerbytes = 0;
+		bodybytes = 0;
+		return (0);
+	}
+
+	public void init() {
+	}
+
+	public int getDataOffset() {
+		return returned;
+	}
+
+	public int getBufferOffset() {
+		return fill;
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Block.java b/src/teavm/java/com/jcraft/jorbis/Block.java
new file mode 100755
index 0000000..0a0e166
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Block.java
@@ -0,0 +1,126 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+public class Block {
+	/// necessary stream state for linking to the framing abstraction
+	float[][] pcm = new float[0][]; // this is a pointer into local storage
+	Buffer opb = new Buffer();
+
+	int lW;
+	int W;
+	int nW;
+	int pcmend;
+	int mode;
+
+	int eofflag;
+	long granulepos;
+	long sequence;
+	DspState vd; // For read-only access of configuration
+
+	// bitmetrics for the frame
+	int glue_bits;
+	int time_bits;
+	int floor_bits;
+	int res_bits;
+
+	public Block(DspState vd) {
+		this.vd = vd;
+		if (vd.analysisp != 0) {
+			opb.writeinit();
+		}
+	}
+
+	public void init(DspState vd) {
+		this.vd = vd;
+	}
+
+	public int clear() {
+		if (vd != null) {
+			if (vd.analysisp != 0) {
+				opb.writeclear();
+			}
+		}
+		return (0);
+	}
+
+	public int synthesis(Packet op) {
+		Info vi = vd.vi;
+
+		// first things first. Make sure decode is ready
+		opb.readinit(op.packet_base, op.packet, op.bytes);
+
+		// Check the packet type
+		if (opb.read(1) != 0) {
+			// Oops. This is not an audio data packet
+			return (-1);
+		}
+
+		// read our mode and pre/post windowsize
+		int _mode = opb.read(vd.modebits);
+		if (_mode == -1)
+			return (-1);
+
+		mode = _mode;
+		W = vi.mode_param[mode].blockflag;
+		if (W != 0) {
+			lW = opb.read(1);
+			nW = opb.read(1);
+			if (nW == -1)
+				return (-1);
+		} else {
+			lW = 0;
+			nW = 0;
+		}
+
+		// more setup
+		granulepos = op.granulepos;
+		sequence = op.packetno - 3; // first block is third packet
+		eofflag = op.e_o_s;
+
+		// alloc pcm passback storage
+		pcmend = vi.blocksizes[W];
+		if (pcm.length < vi.channels) {
+			pcm = new float[vi.channels][];
+		}
+		for (int i = 0; i < vi.channels; i++) {
+			if (pcm[i] == null || pcm[i].length < pcmend) {
+				pcm[i] = new float[pcmend];
+			} else {
+				for (int j = 0; j < pcmend; j++) {
+					pcm[i][j] = 0;
+				}
+			}
+		}
+
+		// unpack_header enforces range checking
+		int type = vi.map_type[vi.mode_param[mode].mapping];
+		return (FuncMapping.mapping_P[type].inverse(this, vd.mode[mode]));
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/CodeBook.java b/src/teavm/java/com/jcraft/jorbis/CodeBook.java
new file mode 100755
index 0000000..c6c7f9f
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/CodeBook.java
@@ -0,0 +1,471 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+class CodeBook {
+	int dim; // codebook dimensions (elements per vector)
+	int entries; // codebook entries
+	StaticCodeBook c = new StaticCodeBook();
+
+	float[] valuelist; // list of dim*entries actual entry values
+	int[] codelist; // list of bitstream codewords for each entry
+	DecodeAux decode_tree;
+
+	// returns the number of bits
+	int encode(int a, Buffer b) {
+		b.write(codelist[a], c.lengthlist[a]);
+		return (c.lengthlist[a]);
+	}
+
+	// One the encode side, our vector writers are each designed for a
+	// specific purpose, and the encoder is not flexible without modification:
+	//
+	// The LSP vector coder uses a single stage nearest-match with no
+	// interleave, so no step and no error return. This is specced by floor0
+	// and doesn't change.
+	//
+	// Residue0 encoding interleaves, uses multiple stages, and each stage
+	// peels of a specific amount of resolution from a lattice (thus we want
+	// to match by threshhold, not nearest match). Residue doesn't *have* to
+	// be encoded that way, but to change it, one will need to add more
+	// infrastructure on the encode side (decode side is specced and simpler)
+
+	// floor0 LSP (single stage, non interleaved, nearest match)
+	// returns entry number and *modifies a* to the quantization value
+	int errorv(float[] a) {
+		int best = best(a, 1);
+		for (int k = 0; k < dim; k++) {
+			a[k] = valuelist[best * dim + k];
+		}
+		return (best);
+	}
+
+	// returns the number of bits and *modifies a* to the quantization value
+	int encodev(int best, float[] a, Buffer b) {
+		for (int k = 0; k < dim; k++) {
+			a[k] = valuelist[best * dim + k];
+		}
+		return (encode(best, b));
+	}
+
+	// res0 (multistage, interleave, lattice)
+	// returns the number of bits and *modifies a* to the remainder value
+	int encodevs(float[] a, Buffer b, int step, int addmul) {
+		int best = besterror(a, step, addmul);
+		return (encode(best, b));
+	}
+
+	private int[] t = new int[15]; // decodevs_add is synchronized for re-using t.
+
+	synchronized int decodevs_add(float[] a, int offset, Buffer b, int n) {
+		int step = n / dim;
+		int entry;
+		int i, j, o;
+
+		if (t.length < step) {
+			t = new int[step];
+		}
+
+		for (i = 0; i < step; i++) {
+			entry = decode(b);
+			if (entry == -1)
+				return (-1);
+			t[i] = entry * dim;
+		}
+		for (i = 0, o = 0; i < dim; i++, o += step) {
+			for (j = 0; j < step; j++) {
+				a[offset + o + j] += valuelist[t[j] + i];
+			}
+		}
+
+		return (0);
+	}
+
+	int decodev_add(float[] a, int offset, Buffer b, int n) {
+		int i, j, entry;
+		int t;
+
+		if (dim > 8) {
+			for (i = 0; i < n;) {
+				entry = decode(b);
+				if (entry == -1)
+					return (-1);
+				t = entry * dim;
+				for (j = 0; j < dim;) {
+					a[offset + (i++)] += valuelist[t + (j++)];
+				}
+			}
+		} else {
+			for (i = 0; i < n;) {
+				entry = decode(b);
+				if (entry == -1)
+					return (-1);
+				t = entry * dim;
+				j = 0;
+				switch (dim) {
+				case 8:
+					a[offset + (i++)] += valuelist[t + (j++)];
+				case 7:
+					a[offset + (i++)] += valuelist[t + (j++)];
+				case 6:
+					a[offset + (i++)] += valuelist[t + (j++)];
+				case 5:
+					a[offset + (i++)] += valuelist[t + (j++)];
+				case 4:
+					a[offset + (i++)] += valuelist[t + (j++)];
+				case 3:
+					a[offset + (i++)] += valuelist[t + (j++)];
+				case 2:
+					a[offset + (i++)] += valuelist[t + (j++)];
+				case 1:
+					a[offset + (i++)] += valuelist[t + (j++)];
+				case 0:
+					break;
+				}
+			}
+		}
+		return (0);
+	}
+
+	int decodev_set(float[] a, int offset, Buffer b, int n) {
+		int i, j, entry;
+		int t;
+
+		for (i = 0; i < n;) {
+			entry = decode(b);
+			if (entry == -1)
+				return (-1);
+			t = entry * dim;
+			for (j = 0; j < dim;) {
+				a[offset + i++] = valuelist[t + (j++)];
+			}
+		}
+		return (0);
+	}
+
+	int decodevv_add(float[][] a, int offset, int ch, Buffer b, int n) {
+		int i, j, entry;
+		int chptr = 0;
+
+		for (i = offset / ch; i < (offset + n) / ch;) {
+			entry = decode(b);
+			if (entry == -1)
+				return (-1);
+
+			int t = entry * dim;
+			for (j = 0; j < dim; j++) {
+				a[chptr++][i] += valuelist[t + j];
+				if (chptr == ch) {
+					chptr = 0;
+					i++;
+				}
+			}
+		}
+		return (0);
+	}
+
+	// Decode side is specced and easier, because we don't need to find
+	// matches using different criteria; we simply read and map. There are
+	// two things we need to do 'depending':
+	//
+	// We may need to support interleave. We don't really, but it's
+	// convenient to do it here rather than rebuild the vector later.
+	//
+	// Cascades may be additive or multiplicitive; this is not inherent in
+	// the codebook, but set in the code using the codebook. Like
+	// interleaving, it's easiest to do it here.
+	// stage==0 -> declarative (set the value)
+	// stage==1 -> additive
+	// stage==2 -> multiplicitive
+
+	// returns the entry number or -1 on eof
+	int decode(Buffer b) {
+		int ptr = 0;
+		DecodeAux t = decode_tree;
+		int lok = b.look(t.tabn);
+
+		if (lok >= 0) {
+			ptr = t.tab[lok];
+			b.adv(t.tabl[lok]);
+			if (ptr <= 0) {
+				return -ptr;
+			}
+		}
+		do {
+			switch (b.read1()) {
+			case 0:
+				ptr = t.ptr0[ptr];
+				break;
+			case 1:
+				ptr = t.ptr1[ptr];
+				break;
+			case -1:
+			default:
+				return (-1);
+			}
+		} while (ptr > 0);
+		return (-ptr);
+	}
+
+	// returns the entry number or -1 on eof
+	int decodevs(float[] a, int index, Buffer b, int step, int addmul) {
+		int entry = decode(b);
+		if (entry == -1)
+			return (-1);
+		switch (addmul) {
+		case -1:
+			for (int i = 0, o = 0; i < dim; i++, o += step)
+				a[index + o] = valuelist[entry * dim + i];
+			break;
+		case 0:
+			for (int i = 0, o = 0; i < dim; i++, o += step)
+				a[index + o] += valuelist[entry * dim + i];
+			break;
+		case 1:
+			for (int i = 0, o = 0; i < dim; i++, o += step)
+				a[index + o] *= valuelist[entry * dim + i];
+			break;
+		default:
+			// System.err.println("CodeBook.decodeves: addmul="+addmul);
+		}
+		return (entry);
+	}
+
+	int best(float[] a, int step) {
+		// brute force it!
+		{
+			int besti = -1;
+			float best = 0.f;
+			int e = 0;
+			for (int i = 0; i < entries; i++) {
+				if (c.lengthlist[i] > 0) {
+					float _this = dist(dim, valuelist, e, a, step);
+					if (besti == -1 || _this < best) {
+						best = _this;
+						besti = i;
+					}
+				}
+				e += dim;
+			}
+			return (besti);
+		}
+	}
+
+	// returns the entry number and *modifies a* to the remainder value
+	int besterror(float[] a, int step, int addmul) {
+		int best = best(a, step);
+		switch (addmul) {
+		case 0:
+			for (int i = 0, o = 0; i < dim; i++, o += step)
+				a[o] -= valuelist[best * dim + i];
+			break;
+		case 1:
+			for (int i = 0, o = 0; i < dim; i++, o += step) {
+				float val = valuelist[best * dim + i];
+				if (val == 0) {
+					a[o] = 0;
+				} else {
+					a[o] /= val;
+				}
+			}
+			break;
+		}
+		return (best);
+	}
+
+	void clear() {
+	}
+
+	private static float dist(int el, float[] ref, int index, float[] b, int step) {
+		float acc = (float) 0.;
+		for (int i = 0; i < el; i++) {
+			float val = (ref[index + i] - b[i * step]);
+			acc += val * val;
+		}
+		return (acc);
+	}
+
+	int init_decode(StaticCodeBook s) {
+		c = s;
+		entries = s.entries;
+		dim = s.dim;
+		valuelist = s.unquantize();
+
+		decode_tree = make_decode_tree();
+		if (decode_tree == null) {
+			clear();
+			return (-1);
+		}
+		return (0);
+	}
+
+	// given a list of word lengths, generate a list of codewords. Works
+	// for length ordered or unordered, always assigns the lowest valued
+	// codewords first. Extended to handle unused entries (length 0)
+	static int[] make_words(int[] l, int n) {
+		int[] marker = new int[33];
+		int[] r = new int[n];
+
+		for (int i = 0; i < n; i++) {
+			int length = l[i];
+			if (length > 0) {
+				int entry = marker[length];
+
+				// when we claim a node for an entry, we also claim the nodes
+				// below it (pruning off the imagined tree that may have dangled
+				// from it) as well as blocking the use of any nodes directly
+				// above for leaves
+
+				// update ourself
+				if (length < 32 && (entry >>> length) != 0) {
+					// error condition; the lengths must specify an overpopulated tree
+					// free(r);
+					return (null);
+				}
+				r[i] = entry;
+
+				// Look to see if the next shorter marker points to the node
+				// above. if so, update it and repeat.
+				{
+					for (int j = length; j > 0; j--) {
+						if ((marker[j] & 1) != 0) {
+							// have to jump branches
+							if (j == 1)
+								marker[1]++;
+							else
+								marker[j] = marker[j - 1] << 1;
+							break; // invariant says next upper marker would already
+							// have been moved if it was on the same path
+						}
+						marker[j]++;
+					}
+				}
+
+				// prune the tree; the implicit invariant says all the longer
+				// markers were dangling from our just-taken node. Dangle them
+				// from our *new* node.
+				for (int j = length + 1; j < 33; j++) {
+					if ((marker[j] >>> 1) == entry) {
+						entry = marker[j];
+						marker[j] = marker[j - 1] << 1;
+					} else {
+						break;
+					}
+				}
+			}
+		}
+
+		// bitreverse the words because our bitwise packer/unpacker is LSb
+		// endian
+		for (int i = 0; i < n; i++) {
+			int temp = 0;
+			for (int j = 0; j < l[i]; j++) {
+				temp <<= 1;
+				temp |= (r[i] >>> j) & 1;
+			}
+			r[i] = temp;
+		}
+
+		return (r);
+	}
+
+	// build the decode helper tree from the codewords
+	DecodeAux make_decode_tree() {
+		int top = 0;
+		DecodeAux t = new DecodeAux();
+		int[] ptr0 = t.ptr0 = new int[entries * 2];
+		int[] ptr1 = t.ptr1 = new int[entries * 2];
+		int[] codelist = make_words(c.lengthlist, c.entries);
+
+		if (codelist == null)
+			return (null);
+		t.aux = entries * 2;
+
+		for (int i = 0; i < entries; i++) {
+			if (c.lengthlist[i] > 0) {
+				int ptr = 0;
+				int j;
+				for (j = 0; j < c.lengthlist[i] - 1; j++) {
+					int bit = (codelist[i] >>> j) & 1;
+					if (bit == 0) {
+						if (ptr0[ptr] == 0) {
+							ptr0[ptr] = ++top;
+						}
+						ptr = ptr0[ptr];
+					} else {
+						if (ptr1[ptr] == 0) {
+							ptr1[ptr] = ++top;
+						}
+						ptr = ptr1[ptr];
+					}
+				}
+
+				if (((codelist[i] >>> j) & 1) == 0) {
+					ptr0[ptr] = -i;
+				} else {
+					ptr1[ptr] = -i;
+				}
+
+			}
+		}
+
+		t.tabn = Util.ilog(entries) - 4;
+
+		if (t.tabn < 5)
+			t.tabn = 5;
+		int n = 1 << t.tabn;
+		t.tab = new int[n];
+		t.tabl = new int[n];
+		for (int i = 0; i < n; i++) {
+			int p = 0;
+			int j = 0;
+			for (j = 0; j < t.tabn && (p > 0 || j == 0); j++) {
+				if ((i & (1 << j)) != 0) {
+					p = ptr1[p];
+				} else {
+					p = ptr0[p];
+				}
+			}
+			t.tab[i] = p; // -code
+			t.tabl[i] = j; // length
+		}
+
+		return (t);
+	}
+
+	class DecodeAux {
+		int[] tab;
+		int[] tabl;
+		int tabn;
+
+		int[] ptr0;
+		int[] ptr1;
+		int aux; // number of tree entries
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Comment.java b/src/teavm/java/com/jcraft/jorbis/Comment.java
new file mode 100755
index 0000000..77f95db
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Comment.java
@@ -0,0 +1,240 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+// the comments are not part of vorbis_info so that vorbis_info can be
+// static storage
+public class Comment {
+	private static byte[] _vorbis = "vorbis".getBytes();
+	private static byte[] _vendor = "Xiphophorus libVorbis I 20000508".getBytes();
+
+	private static final int OV_EIMPL = -130;
+
+	// unlimited user comment fields.
+	public byte[][] user_comments;
+	public int[] comment_lengths;
+	public int comments;
+	public byte[] vendor;
+
+	public void init() {
+		user_comments = null;
+		comments = 0;
+		vendor = null;
+	}
+
+	public void add(String comment) {
+		add(comment.getBytes());
+	}
+
+	private void add(byte[] comment) {
+		byte[][] foo = new byte[comments + 2][];
+		if (user_comments != null) {
+			System.arraycopy(user_comments, 0, foo, 0, comments);
+		}
+		user_comments = foo;
+
+		int[] goo = new int[comments + 2];
+		if (comment_lengths != null) {
+			System.arraycopy(comment_lengths, 0, goo, 0, comments);
+		}
+		comment_lengths = goo;
+
+		byte[] bar = new byte[comment.length + 1];
+		System.arraycopy(comment, 0, bar, 0, comment.length);
+		user_comments[comments] = bar;
+		comment_lengths[comments] = comment.length;
+		comments++;
+		user_comments[comments] = null;
+	}
+
+	public void add_tag(String tag, String contents) {
+		if (contents == null)
+			contents = "";
+		add(tag + "=" + contents);
+	}
+
+	static boolean tagcompare(byte[] s1, byte[] s2, int n) {
+		int c = 0;
+		byte u1, u2;
+		while (c < n) {
+			u1 = s1[c];
+			u2 = s2[c];
+			if ('Z' >= u1 && u1 >= 'A')
+				u1 = (byte) (u1 - 'A' + 'a');
+			if ('Z' >= u2 && u2 >= 'A')
+				u2 = (byte) (u2 - 'A' + 'a');
+			if (u1 != u2) {
+				return false;
+			}
+			c++;
+		}
+		return true;
+	}
+
+	public String query(String tag) {
+		return query(tag, 0);
+	}
+
+	public String query(String tag, int count) {
+		int foo = query(tag.getBytes(), count);
+		if (foo == -1)
+			return null;
+		byte[] comment = user_comments[foo];
+		for (int i = 0; i < comment_lengths[foo]; i++) {
+			if (comment[i] == '=') {
+				return new String(comment, i + 1, comment_lengths[foo] - (i + 1));
+			}
+		}
+		return null;
+	}
+
+	private int query(byte[] tag, int count) {
+		int i = 0;
+		int found = 0;
+		int fulltaglen = tag.length + 1;
+		byte[] fulltag = new byte[fulltaglen];
+		System.arraycopy(tag, 0, fulltag, 0, tag.length);
+		fulltag[tag.length] = (byte) '=';
+
+		for (i = 0; i < comments; i++) {
+			if (tagcompare(user_comments[i], fulltag, fulltaglen)) {
+				if (count == found) {
+					// We return a pointer to the data, not a copy
+					// return user_comments[i] + taglen + 1;
+					return i;
+				} else {
+					found++;
+				}
+			}
+		}
+		return -1;
+	}
+
+	int unpack(Buffer opb) {
+		int vendorlen = opb.read(32);
+		if (vendorlen < 0) {
+			clear();
+			return (-1);
+		}
+		vendor = new byte[vendorlen + 1];
+		opb.read(vendor, vendorlen);
+		comments = opb.read(32);
+		if (comments < 0) {
+			clear();
+			return (-1);
+		}
+		user_comments = new byte[comments + 1][];
+		comment_lengths = new int[comments + 1];
+
+		for (int i = 0; i < comments; i++) {
+			int len = opb.read(32);
+			if (len < 0) {
+				clear();
+				return (-1);
+			}
+			comment_lengths[i] = len;
+			user_comments[i] = new byte[len + 1];
+			opb.read(user_comments[i], len);
+		}
+		if (opb.read(1) != 1) {
+			clear();
+			return (-1);
+
+		}
+		return (0);
+	}
+
+	int pack(Buffer opb) {
+		// preamble
+		opb.write(0x03, 8);
+		opb.write(_vorbis);
+
+		// vendor
+		opb.write(_vendor.length, 32);
+		opb.write(_vendor);
+
+		// comments
+		opb.write(comments, 32);
+		if (comments != 0) {
+			for (int i = 0; i < comments; i++) {
+				if (user_comments[i] != null) {
+					opb.write(comment_lengths[i], 32);
+					opb.write(user_comments[i]);
+				} else {
+					opb.write(0, 32);
+				}
+			}
+		}
+		opb.write(1, 1);
+		return (0);
+	}
+
+	public int header_out(Packet op) {
+		Buffer opb = new Buffer();
+		opb.writeinit();
+
+		if (pack(opb) != 0)
+			return OV_EIMPL;
+
+		op.packet_base = new byte[opb.bytes()];
+		op.packet = 0;
+		op.bytes = opb.bytes();
+		System.arraycopy(opb.buffer(), 0, op.packet_base, 0, op.bytes);
+		op.b_o_s = 0;
+		op.e_o_s = 0;
+		op.granulepos = 0;
+		return 0;
+	}
+
+	void clear() {
+		for (int i = 0; i < comments; i++)
+			user_comments[i] = null;
+		user_comments = null;
+		vendor = null;
+	}
+
+	public String getVendor() {
+		return new String(vendor, 0, vendor.length - 1);
+	}
+
+	public String getComment(int i) {
+		if (comments <= i)
+			return null;
+		return new String(user_comments[i], 0, user_comments[i].length - 1);
+	}
+
+	public String toString() {
+		String foo = "Vendor: " + new String(vendor, 0, vendor.length - 1);
+		for (int i = 0; i < comments; i++) {
+			foo = foo + "\nComment: " + new String(user_comments[i], 0, user_comments[i].length - 1);
+		}
+		foo = foo + "\n";
+		return foo;
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Drft.java b/src/teavm/java/com/jcraft/jorbis/Drft.java
new file mode 100755
index 0000000..de8aad4
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Drft.java
@@ -0,0 +1,1319 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+class Drft {
+	int n;
+	float[] trigcache;
+	int[] splitcache;
+
+	void backward(float[] data) {
+		if (n == 1)
+			return;
+		drftb1(n, data, trigcache, trigcache, n, splitcache);
+	}
+
+	void init(int n) {
+		this.n = n;
+		trigcache = new float[3 * n];
+		splitcache = new int[32];
+		fdrffti(n, trigcache, splitcache);
+	}
+
+	void clear() {
+		if (trigcache != null)
+			trigcache = null;
+		if (splitcache != null)
+			splitcache = null;
+	}
+
+	static int[] ntryh = { 4, 2, 3, 5 };
+	static float tpi = 6.28318530717958647692528676655900577f;
+	static float hsqt2 = .70710678118654752440084436210485f;
+	static float taui = .86602540378443864676372317075293618f;
+	static float taur = -.5f;
+	static float sqrt2 = 1.4142135623730950488016887242097f;
+
+	static void drfti1(int n, float[] wa, int index, int[] ifac) {
+		float arg, argh, argld, fi;
+		int ntry = 0, i, j = -1;
+		int k1, l1, l2, ib;
+		int ld, ii, ip, is, nq, nr;
+		int ido, ipm, nfm1;
+		int nl = n;
+		int nf = 0;
+
+		int state = 101;
+
+		loop: while (true) {
+			switch (state) {
+			case 101:
+				j++;
+				if (j < 4)
+					ntry = ntryh[j];
+				else
+					ntry += 2;
+			case 104:
+				nq = nl / ntry;
+				nr = nl - ntry * nq;
+				if (nr != 0) {
+					state = 101;
+					break;
+				}
+				nf++;
+				ifac[nf + 1] = ntry;
+				nl = nq;
+				if (ntry != 2) {
+					state = 107;
+					break;
+				}
+				if (nf == 1) {
+					state = 107;
+					break;
+				}
+
+				for (i = 1; i < nf; i++) {
+					ib = nf - i + 1;
+					ifac[ib + 1] = ifac[ib];
+				}
+				ifac[2] = 2;
+			case 107:
+				if (nl != 1) {
+					state = 104;
+					break;
+				}
+				ifac[0] = n;
+				ifac[1] = nf;
+				argh = tpi / n;
+				is = 0;
+				nfm1 = nf - 1;
+				l1 = 1;
+
+				if (nfm1 == 0)
+					return;
+
+				for (k1 = 0; k1 < nfm1; k1++) {
+					ip = ifac[k1 + 2];
+					ld = 0;
+					l2 = l1 * ip;
+					ido = n / l2;
+					ipm = ip - 1;
+
+					for (j = 0; j < ipm; j++) {
+						ld += l1;
+						i = is;
+						argld = (float) ld * argh;
+						fi = 0.f;
+						for (ii = 2; ii < ido; ii += 2) {
+							fi += 1.f;
+							arg = fi * argld;
+							wa[index + i++] = (float) Math.cos(arg);
+							wa[index + i++] = (float) Math.sin(arg);
+						}
+						is += ido;
+					}
+					l1 = l2;
+				}
+				break loop;
+			}
+		}
+	}
+
+	static void fdrffti(int n, float[] wsave, int[] ifac) {
+		if (n == 1)
+			return;
+		drfti1(n, wsave, n, ifac);
+	}
+
+	static void dradf2(int ido, int l1, float[] cc, float[] ch, float[] wa1, int index) {
+		int i, k;
+		float ti2, tr2;
+		int t0, t1, t2, t3, t4, t5, t6;
+
+		t1 = 0;
+		t0 = (t2 = l1 * ido);
+		t3 = ido << 1;
+		for (k = 0; k < l1; k++) {
+			ch[t1 << 1] = cc[t1] + cc[t2];
+			ch[(t1 << 1) + t3 - 1] = cc[t1] - cc[t2];
+			t1 += ido;
+			t2 += ido;
+		}
+
+		if (ido < 2)
+			return;
+
+		if (ido != 2) {
+			t1 = 0;
+			t2 = t0;
+			for (k = 0; k < l1; k++) {
+				t3 = t2;
+				t4 = (t1 << 1) + (ido << 1);
+				t5 = t1;
+				t6 = t1 + t1;
+				for (i = 2; i < ido; i += 2) {
+					t3 += 2;
+					t4 -= 2;
+					t5 += 2;
+					t6 += 2;
+					tr2 = wa1[index + i - 2] * cc[t3 - 1] + wa1[index + i - 1] * cc[t3];
+					ti2 = wa1[index + i - 2] * cc[t3] - wa1[index + i - 1] * cc[t3 - 1];
+					ch[t6] = cc[t5] + ti2;
+					ch[t4] = ti2 - cc[t5];
+					ch[t6 - 1] = cc[t5 - 1] + tr2;
+					ch[t4 - 1] = cc[t5 - 1] - tr2;
+				}
+				t1 += ido;
+				t2 += ido;
+			}
+			if (ido % 2 == 1)
+				return;
+		}
+
+		t3 = (t2 = (t1 = ido) - 1);
+		t2 += t0;
+		for (k = 0; k < l1; k++) {
+			ch[t1] = -cc[t2];
+			ch[t1 - 1] = cc[t3];
+			t1 += ido << 1;
+			t2 += ido;
+			t3 += ido;
+		}
+	}
+
+	static void dradf4(int ido, int l1, float[] cc, float[] ch, float[] wa1, int index1, float[] wa2, int index2,
+			float[] wa3, int index3) {
+		int i, k, t0, t1, t2, t3, t4, t5, t6;
+		float ci2, ci3, ci4, cr2, cr3, cr4, ti1, ti2, ti3, ti4, tr1, tr2, tr3, tr4;
+		t0 = l1 * ido;
+
+		t1 = t0;
+		t4 = t1 << 1;
+		t2 = t1 + (t1 << 1);
+		t3 = 0;
+
+		for (k = 0; k < l1; k++) {
+			tr1 = cc[t1] + cc[t2];
+			tr2 = cc[t3] + cc[t4];
+
+			ch[t5 = t3 << 2] = tr1 + tr2;
+			ch[(ido << 2) + t5 - 1] = tr2 - tr1;
+			ch[(t5 += (ido << 1)) - 1] = cc[t3] - cc[t4];
+			ch[t5] = cc[t2] - cc[t1];
+
+			t1 += ido;
+			t2 += ido;
+			t3 += ido;
+			t4 += ido;
+		}
+		if (ido < 2)
+			return;
+
+		if (ido != 2) {
+			t1 = 0;
+			for (k = 0; k < l1; k++) {
+				t2 = t1;
+				t4 = t1 << 2;
+				t5 = (t6 = ido << 1) + t4;
+				for (i = 2; i < ido; i += 2) {
+					t3 = (t2 += 2);
+					t4 += 2;
+					t5 -= 2;
+
+					t3 += t0;
+					cr2 = wa1[index1 + i - 2] * cc[t3 - 1] + wa1[index1 + i - 1] * cc[t3];
+					ci2 = wa1[index1 + i - 2] * cc[t3] - wa1[index1 + i - 1] * cc[t3 - 1];
+					t3 += t0;
+					cr3 = wa2[index2 + i - 2] * cc[t3 - 1] + wa2[index2 + i - 1] * cc[t3];
+					ci3 = wa2[index2 + i - 2] * cc[t3] - wa2[index2 + i - 1] * cc[t3 - 1];
+					t3 += t0;
+					cr4 = wa3[index3 + i - 2] * cc[t3 - 1] + wa3[index3 + i - 1] * cc[t3];
+					ci4 = wa3[index3 + i - 2] * cc[t3] - wa3[index3 + i - 1] * cc[t3 - 1];
+
+					tr1 = cr2 + cr4;
+					tr4 = cr4 - cr2;
+					ti1 = ci2 + ci4;
+					ti4 = ci2 - ci4;
+
+					ti2 = cc[t2] + ci3;
+					ti3 = cc[t2] - ci3;
+					tr2 = cc[t2 - 1] + cr3;
+					tr3 = cc[t2 - 1] - cr3;
+
+					ch[t4 - 1] = tr1 + tr2;
+					ch[t4] = ti1 + ti2;
+
+					ch[t5 - 1] = tr3 - ti4;
+					ch[t5] = tr4 - ti3;
+
+					ch[t4 + t6 - 1] = ti4 + tr3;
+					ch[t4 + t6] = tr4 + ti3;
+
+					ch[t5 + t6 - 1] = tr2 - tr1;
+					ch[t5 + t6] = ti1 - ti2;
+				}
+				t1 += ido;
+			}
+			if ((ido & 1) != 0)
+				return;
+		}
+
+		t2 = (t1 = t0 + ido - 1) + (t0 << 1);
+		t3 = ido << 2;
+		t4 = ido;
+		t5 = ido << 1;
+		t6 = ido;
+
+		for (k = 0; k < l1; k++) {
+			ti1 = -hsqt2 * (cc[t1] + cc[t2]);
+			tr1 = hsqt2 * (cc[t1] - cc[t2]);
+
+			ch[t4 - 1] = tr1 + cc[t6 - 1];
+			ch[t4 + t5 - 1] = cc[t6 - 1] - tr1;
+
+			ch[t4] = ti1 - cc[t1 + t0];
+			ch[t4 + t5] = ti1 + cc[t1 + t0];
+
+			t1 += ido;
+			t2 += ido;
+			t4 += t3;
+			t6 += ido;
+		}
+	}
+
+	static void dradfg(int ido, int ip, int l1, int idl1, float[] cc, float[] c1, float[] c2, float[] ch, float[] ch2,
+			float[] wa, int index) {
+		int idij, ipph, i, j, k, l, ic, ik, is;
+		int t0, t1, t2 = 0, t3, t4, t5, t6, t7, t8, t9, t10;
+		float dc2, ai1, ai2, ar1, ar2, ds2;
+		int nbd;
+		float dcp = 0, arg, dsp = 0, ar1h, ar2h;
+		int idp2, ipp2;
+
+		arg = tpi / (float) ip;
+		dcp = (float) Math.cos(arg);
+		dsp = (float) Math.sin(arg);
+		ipph = (ip + 1) >> 1;
+		ipp2 = ip;
+		idp2 = ido;
+		nbd = (ido - 1) >> 1;
+		t0 = l1 * ido;
+		t10 = ip * ido;
+
+		int state = 100;
+		loop: while (true) {
+			switch (state) {
+			case 101:
+				if (ido == 1) {
+					state = 119;
+					break;
+				}
+				for (ik = 0; ik < idl1; ik++)
+					ch2[ik] = c2[ik];
+
+				t1 = 0;
+				for (j = 1; j < ip; j++) {
+					t1 += t0;
+					t2 = t1;
+					for (k = 0; k < l1; k++) {
+						ch[t2] = c1[t2];
+						t2 += ido;
+					}
+				}
+
+				is = -ido;
+				t1 = 0;
+				if (nbd > l1) {
+					for (j = 1; j < ip; j++) {
+						t1 += t0;
+						is += ido;
+						t2 = -ido + t1;
+						for (k = 0; k < l1; k++) {
+							idij = is - 1;
+							t2 += ido;
+							t3 = t2;
+							for (i = 2; i < ido; i += 2) {
+								idij += 2;
+								t3 += 2;
+								ch[t3 - 1] = wa[index + idij - 1] * c1[t3 - 1] + wa[index + idij] * c1[t3];
+								ch[t3] = wa[index + idij - 1] * c1[t3] - wa[index + idij] * c1[t3 - 1];
+							}
+						}
+					}
+				} else {
+
+					for (j = 1; j < ip; j++) {
+						is += ido;
+						idij = is - 1;
+						t1 += t0;
+						t2 = t1;
+						for (i = 2; i < ido; i += 2) {
+							idij += 2;
+							t2 += 2;
+							t3 = t2;
+							for (k = 0; k < l1; k++) {
+								ch[t3 - 1] = wa[index + idij - 1] * c1[t3 - 1] + wa[index + idij] * c1[t3];
+								ch[t3] = wa[index + idij - 1] * c1[t3] - wa[index + idij] * c1[t3 - 1];
+								t3 += ido;
+							}
+						}
+					}
+				}
+
+				t1 = 0;
+				t2 = ipp2 * t0;
+				if (nbd < l1) {
+					for (j = 1; j < ipph; j++) {
+						t1 += t0;
+						t2 -= t0;
+						t3 = t1;
+						t4 = t2;
+						for (i = 2; i < ido; i += 2) {
+							t3 += 2;
+							t4 += 2;
+							t5 = t3 - ido;
+							t6 = t4 - ido;
+							for (k = 0; k < l1; k++) {
+								t5 += ido;
+								t6 += ido;
+								c1[t5 - 1] = ch[t5 - 1] + ch[t6 - 1];
+								c1[t6 - 1] = ch[t5] - ch[t6];
+								c1[t5] = ch[t5] + ch[t6];
+								c1[t6] = ch[t6 - 1] - ch[t5 - 1];
+							}
+						}
+					}
+				} else {
+					for (j = 1; j < ipph; j++) {
+						t1 += t0;
+						t2 -= t0;
+						t3 = t1;
+						t4 = t2;
+						for (k = 0; k < l1; k++) {
+							t5 = t3;
+							t6 = t4;
+							for (i = 2; i < ido; i += 2) {
+								t5 += 2;
+								t6 += 2;
+								c1[t5 - 1] = ch[t5 - 1] + ch[t6 - 1];
+								c1[t6 - 1] = ch[t5] - ch[t6];
+								c1[t5] = ch[t5] + ch[t6];
+								c1[t6] = ch[t6 - 1] - ch[t5 - 1];
+							}
+							t3 += ido;
+							t4 += ido;
+						}
+					}
+				}
+			case 119:
+				for (ik = 0; ik < idl1; ik++)
+					c2[ik] = ch2[ik];
+
+				t1 = 0;
+				t2 = ipp2 * idl1;
+				for (j = 1; j < ipph; j++) {
+					t1 += t0;
+					t2 -= t0;
+					t3 = t1 - ido;
+					t4 = t2 - ido;
+					for (k = 0; k < l1; k++) {
+						t3 += ido;
+						t4 += ido;
+						c1[t3] = ch[t3] + ch[t4];
+						c1[t4] = ch[t4] - ch[t3];
+					}
+				}
+
+				ar1 = 1.f;
+				ai1 = 0.f;
+				t1 = 0;
+				t2 = ipp2 * idl1;
+				t3 = (ip - 1) * idl1;
+				for (l = 1; l < ipph; l++) {
+					t1 += idl1;
+					t2 -= idl1;
+					ar1h = dcp * ar1 - dsp * ai1;
+					ai1 = dcp * ai1 + dsp * ar1;
+					ar1 = ar1h;
+					t4 = t1;
+					t5 = t2;
+					t6 = t3;
+					t7 = idl1;
+
+					for (ik = 0; ik < idl1; ik++) {
+						ch2[t4++] = c2[ik] + ar1 * c2[t7++];
+						ch2[t5++] = ai1 * c2[t6++];
+					}
+
+					dc2 = ar1;
+					ds2 = ai1;
+					ar2 = ar1;
+					ai2 = ai1;
+
+					t4 = idl1;
+					t5 = (ipp2 - 1) * idl1;
+					for (j = 2; j < ipph; j++) {
+						t4 += idl1;
+						t5 -= idl1;
+
+						ar2h = dc2 * ar2 - ds2 * ai2;
+						ai2 = dc2 * ai2 + ds2 * ar2;
+						ar2 = ar2h;
+
+						t6 = t1;
+						t7 = t2;
+						t8 = t4;
+						t9 = t5;
+						for (ik = 0; ik < idl1; ik++) {
+							ch2[t6++] += ar2 * c2[t8++];
+							ch2[t7++] += ai2 * c2[t9++];
+						}
+					}
+				}
+				t1 = 0;
+				for (j = 1; j < ipph; j++) {
+					t1 += idl1;
+					t2 = t1;
+					for (ik = 0; ik < idl1; ik++)
+						ch2[ik] += c2[t2++];
+				}
+
+				if (ido < l1) {
+					state = 132;
+					break;
+				}
+
+				t1 = 0;
+				t2 = 0;
+				for (k = 0; k < l1; k++) {
+					t3 = t1;
+					t4 = t2;
+					for (i = 0; i < ido; i++)
+						cc[t4++] = ch[t3++];
+					t1 += ido;
+					t2 += t10;
+				}
+				state = 135;
+				break;
+
+			case 132:
+				for (i = 0; i < ido; i++) {
+					t1 = i;
+					t2 = i;
+					for (k = 0; k < l1; k++) {
+						cc[t2] = ch[t1];
+						t1 += ido;
+						t2 += t10;
+					}
+				}
+			case 135:
+				t1 = 0;
+				t2 = ido << 1;
+				t3 = 0;
+				t4 = ipp2 * t0;
+				for (j = 1; j < ipph; j++) {
+					t1 += t2;
+					t3 += t0;
+					t4 -= t0;
+
+					t5 = t1;
+					t6 = t3;
+					t7 = t4;
+
+					for (k = 0; k < l1; k++) {
+						cc[t5 - 1] = ch[t6];
+						cc[t5] = ch[t7];
+						t5 += t10;
+						t6 += ido;
+						t7 += ido;
+					}
+				}
+
+				if (ido == 1)
+					return;
+				if (nbd < l1) {
+					state = 141;
+					break;
+				}
+
+				t1 = -ido;
+				t3 = 0;
+				t4 = 0;
+				t5 = ipp2 * t0;
+				for (j = 1; j < ipph; j++) {
+					t1 += t2;
+					t3 += t2;
+					t4 += t0;
+					t5 -= t0;
+					t6 = t1;
+					t7 = t3;
+					t8 = t4;
+					t9 = t5;
+					for (k = 0; k < l1; k++) {
+						for (i = 2; i < ido; i += 2) {
+							ic = idp2 - i;
+							cc[i + t7 - 1] = ch[i + t8 - 1] + ch[i + t9 - 1];
+							cc[ic + t6 - 1] = ch[i + t8 - 1] - ch[i + t9 - 1];
+							cc[i + t7] = ch[i + t8] + ch[i + t9];
+							cc[ic + t6] = ch[i + t9] - ch[i + t8];
+						}
+						t6 += t10;
+						t7 += t10;
+						t8 += ido;
+						t9 += ido;
+					}
+				}
+				return;
+			case 141:
+				t1 = -ido;
+				t3 = 0;
+				t4 = 0;
+				t5 = ipp2 * t0;
+				for (j = 1; j < ipph; j++) {
+					t1 += t2;
+					t3 += t2;
+					t4 += t0;
+					t5 -= t0;
+					for (i = 2; i < ido; i += 2) {
+						t6 = idp2 + t1 - i;
+						t7 = i + t3;
+						t8 = i + t4;
+						t9 = i + t5;
+						for (k = 0; k < l1; k++) {
+							cc[t7 - 1] = ch[t8 - 1] + ch[t9 - 1];
+							cc[t6 - 1] = ch[t8 - 1] - ch[t9 - 1];
+							cc[t7] = ch[t8] + ch[t9];
+							cc[t6] = ch[t9] - ch[t8];
+							t6 += t10;
+							t7 += t10;
+							t8 += ido;
+							t9 += ido;
+						}
+					}
+				}
+				break loop;
+			}
+		}
+	}
+
+	static void drftf1(int n, float[] c, float[] ch, float[] wa, int[] ifac) {
+		int i, k1, l1, l2;
+		int na, kh, nf;
+		int ip, iw, ido, idl1, ix2, ix3;
+
+		nf = ifac[1];
+		na = 1;
+		l2 = n;
+		iw = n;
+
+		for (k1 = 0; k1 < nf; k1++) {
+			kh = nf - k1;
+			ip = ifac[kh + 1];
+			l1 = l2 / ip;
+			ido = n / l2;
+			idl1 = ido * l1;
+			iw -= (ip - 1) * ido;
+			na = 1 - na;
+
+			int state = 100;
+			loop: while (true) {
+				switch (state) {
+				case 100:
+					if (ip != 4) {
+						state = 102;
+						break;
+					}
+
+					ix2 = iw + ido;
+					ix3 = ix2 + ido;
+					if (na != 0)
+						dradf4(ido, l1, ch, c, wa, iw - 1, wa, ix2 - 1, wa, ix3 - 1);
+					else
+						dradf4(ido, l1, c, ch, wa, iw - 1, wa, ix2 - 1, wa, ix3 - 1);
+					state = 110;
+					break;
+				case 102:
+					if (ip != 2) {
+						state = 104;
+						break;
+					}
+					if (na != 0) {
+						state = 103;
+						break;
+					}
+					dradf2(ido, l1, c, ch, wa, iw - 1);
+					state = 110;
+					break;
+				case 103:
+					dradf2(ido, l1, ch, c, wa, iw - 1);
+				case 104:
+					if (ido == 1)
+						na = 1 - na;
+					if (na != 0) {
+						state = 109;
+						break;
+					}
+					dradfg(ido, ip, l1, idl1, c, c, c, ch, ch, wa, iw - 1);
+					na = 1;
+					state = 110;
+					break;
+				case 109:
+					dradfg(ido, ip, l1, idl1, ch, ch, ch, c, c, wa, iw - 1);
+					na = 0;
+				case 110:
+					l2 = l1;
+					break loop;
+				}
+			}
+		}
+		if (na == 1)
+			return;
+		for (i = 0; i < n; i++)
+			c[i] = ch[i];
+	}
+
+	static void dradb2(int ido, int l1, float[] cc, float[] ch, float[] wa1, int index) {
+		int i, k, t0, t1, t2, t3, t4, t5, t6;
+		float ti2, tr2;
+
+		t0 = l1 * ido;
+
+		t1 = 0;
+		t2 = 0;
+		t3 = (ido << 1) - 1;
+		for (k = 0; k < l1; k++) {
+			ch[t1] = cc[t2] + cc[t3 + t2];
+			ch[t1 + t0] = cc[t2] - cc[t3 + t2];
+			t2 = (t1 += ido) << 1;
+		}
+
+		if (ido < 2)
+			return;
+		if (ido != 2) {
+			t1 = 0;
+			t2 = 0;
+			for (k = 0; k < l1; k++) {
+				t3 = t1;
+				t5 = (t4 = t2) + (ido << 1);
+				t6 = t0 + t1;
+				for (i = 2; i < ido; i += 2) {
+					t3 += 2;
+					t4 += 2;
+					t5 -= 2;
+					t6 += 2;
+					ch[t3 - 1] = cc[t4 - 1] + cc[t5 - 1];
+					tr2 = cc[t4 - 1] - cc[t5 - 1];
+					ch[t3] = cc[t4] - cc[t5];
+					ti2 = cc[t4] + cc[t5];
+					ch[t6 - 1] = wa1[index + i - 2] * tr2 - wa1[index + i - 1] * ti2;
+					ch[t6] = wa1[index + i - 2] * ti2 + wa1[index + i - 1] * tr2;
+				}
+				t2 = (t1 += ido) << 1;
+			}
+			if ((ido % 2) == 1)
+				return;
+		}
+
+		t1 = ido - 1;
+		t2 = ido - 1;
+		for (k = 0; k < l1; k++) {
+			ch[t1] = cc[t2] + cc[t2];
+			ch[t1 + t0] = -(cc[t2 + 1] + cc[t2 + 1]);
+			t1 += ido;
+			t2 += ido << 1;
+		}
+	}
+
+	static void dradb3(int ido, int l1, float[] cc, float[] ch, float[] wa1, int index1, float[] wa2, int index2) {
+		int i, k, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
+		float ci2, ci3, di2, di3, cr2, cr3, dr2, dr3, ti2, tr2;
+		t0 = l1 * ido;
+
+		t1 = 0;
+		t2 = t0 << 1;
+		t3 = ido << 1;
+		t4 = ido + (ido << 1);
+		t5 = 0;
+		for (k = 0; k < l1; k++) {
+			tr2 = cc[t3 - 1] + cc[t3 - 1];
+			cr2 = cc[t5] + (taur * tr2);
+			ch[t1] = cc[t5] + tr2;
+			ci3 = taui * (cc[t3] + cc[t3]);
+			ch[t1 + t0] = cr2 - ci3;
+			ch[t1 + t2] = cr2 + ci3;
+			t1 += ido;
+			t3 += t4;
+			t5 += t4;
+		}
+
+		if (ido == 1)
+			return;
+
+		t1 = 0;
+		t3 = ido << 1;
+		for (k = 0; k < l1; k++) {
+			t7 = t1 + (t1 << 1);
+			t6 = (t5 = t7 + t3);
+			t8 = t1;
+			t10 = (t9 = t1 + t0) + t0;
+
+			for (i = 2; i < ido; i += 2) {
+				t5 += 2;
+				t6 -= 2;
+				t7 += 2;
+				t8 += 2;
+				t9 += 2;
+				t10 += 2;
+				tr2 = cc[t5 - 1] + cc[t6 - 1];
+				cr2 = cc[t7 - 1] + (taur * tr2);
+				ch[t8 - 1] = cc[t7 - 1] + tr2;
+				ti2 = cc[t5] - cc[t6];
+				ci2 = cc[t7] + (taur * ti2);
+				ch[t8] = cc[t7] + ti2;
+				cr3 = taui * (cc[t5 - 1] - cc[t6 - 1]);
+				ci3 = taui * (cc[t5] + cc[t6]);
+				dr2 = cr2 - ci3;
+				dr3 = cr2 + ci3;
+				di2 = ci2 + cr3;
+				di3 = ci2 - cr3;
+				ch[t9 - 1] = wa1[index1 + i - 2] * dr2 - wa1[index1 + i - 1] * di2;
+				ch[t9] = wa1[index1 + i - 2] * di2 + wa1[index1 + i - 1] * dr2;
+				ch[t10 - 1] = wa2[index2 + i - 2] * dr3 - wa2[index2 + i - 1] * di3;
+				ch[t10] = wa2[index2 + i - 2] * di3 + wa2[index2 + i - 1] * dr3;
+			}
+			t1 += ido;
+		}
+	}
+
+	static void dradb4(int ido, int l1, float[] cc, float[] ch, float[] wa1, int index1, float[] wa2, int index2,
+			float[] wa3, int index3) {
+		int i, k, t0, t1, t2, t3, t4, t5, t6, t7, t8;
+		float ci2, ci3, ci4, cr2, cr3, cr4, ti1, ti2, ti3, ti4, tr1, tr2, tr3, tr4;
+		t0 = l1 * ido;
+
+		t1 = 0;
+		t2 = ido << 2;
+		t3 = 0;
+		t6 = ido << 1;
+		for (k = 0; k < l1; k++) {
+			t4 = t3 + t6;
+			t5 = t1;
+			tr3 = cc[t4 - 1] + cc[t4 - 1];
+			tr4 = cc[t4] + cc[t4];
+			tr1 = cc[t3] - cc[(t4 += t6) - 1];
+			tr2 = cc[t3] + cc[t4 - 1];
+			ch[t5] = tr2 + tr3;
+			ch[t5 += t0] = tr1 - tr4;
+			ch[t5 += t0] = tr2 - tr3;
+			ch[t5 += t0] = tr1 + tr4;
+			t1 += ido;
+			t3 += t2;
+		}
+
+		if (ido < 2)
+			return;
+		if (ido != 2) {
+			t1 = 0;
+			for (k = 0; k < l1; k++) {
+				t5 = (t4 = (t3 = (t2 = t1 << 2) + t6)) + t6;
+				t7 = t1;
+				for (i = 2; i < ido; i += 2) {
+					t2 += 2;
+					t3 += 2;
+					t4 -= 2;
+					t5 -= 2;
+					t7 += 2;
+					ti1 = cc[t2] + cc[t5];
+					ti2 = cc[t2] - cc[t5];
+					ti3 = cc[t3] - cc[t4];
+					tr4 = cc[t3] + cc[t4];
+					tr1 = cc[t2 - 1] - cc[t5 - 1];
+					tr2 = cc[t2 - 1] + cc[t5 - 1];
+					ti4 = cc[t3 - 1] - cc[t4 - 1];
+					tr3 = cc[t3 - 1] + cc[t4 - 1];
+					ch[t7 - 1] = tr2 + tr3;
+					cr3 = tr2 - tr3;
+					ch[t7] = ti2 + ti3;
+					ci3 = ti2 - ti3;
+					cr2 = tr1 - tr4;
+					cr4 = tr1 + tr4;
+					ci2 = ti1 + ti4;
+					ci4 = ti1 - ti4;
+
+					ch[(t8 = t7 + t0) - 1] = wa1[index1 + i - 2] * cr2 - wa1[index1 + i - 1] * ci2;
+					ch[t8] = wa1[index1 + i - 2] * ci2 + wa1[index1 + i - 1] * cr2;
+					ch[(t8 += t0) - 1] = wa2[index2 + i - 2] * cr3 - wa2[index2 + i - 1] * ci3;
+					ch[t8] = wa2[index2 + i - 2] * ci3 + wa2[index2 + i - 1] * cr3;
+					ch[(t8 += t0) - 1] = wa3[index3 + i - 2] * cr4 - wa3[index3 + i - 1] * ci4;
+					ch[t8] = wa3[index3 + i - 2] * ci4 + wa3[index3 + i - 1] * cr4;
+				}
+				t1 += ido;
+			}
+			if (ido % 2 == 1)
+				return;
+		}
+
+		t1 = ido;
+		t2 = ido << 2;
+		t3 = ido - 1;
+		t4 = ido + (ido << 1);
+		for (k = 0; k < l1; k++) {
+			t5 = t3;
+			ti1 = cc[t1] + cc[t4];
+			ti2 = cc[t4] - cc[t1];
+			tr1 = cc[t1 - 1] - cc[t4 - 1];
+			tr2 = cc[t1 - 1] + cc[t4 - 1];
+			ch[t5] = tr2 + tr2;
+			ch[t5 += t0] = sqrt2 * (tr1 - ti1);
+			ch[t5 += t0] = ti2 + ti2;
+			ch[t5 += t0] = -sqrt2 * (tr1 + ti1);
+
+			t3 += ido;
+			t1 += t2;
+			t4 += t2;
+		}
+	}
+
+	static void dradbg(int ido, int ip, int l1, int idl1, float[] cc, float[] c1, float[] c2, float[] ch, float[] ch2,
+			float[] wa, int index) {
+
+		int idij, ipph = 0, i, j, k, l, ik, is, t0 = 0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10 = 0, t11, t12;
+		float dc2, ai1, ai2, ar1, ar2, ds2;
+		int nbd = 0;
+		float dcp = 0, arg, dsp = 0, ar1h, ar2h;
+		int ipp2 = 0;
+
+		int state = 100;
+
+		loop: while (true) {
+			switch (state) {
+			case 100:
+				t10 = ip * ido;
+				t0 = l1 * ido;
+				arg = tpi / (float) ip;
+				dcp = (float) Math.cos(arg);
+				dsp = (float) Math.sin(arg);
+				nbd = (ido - 1) >>> 1;
+				ipp2 = ip;
+				ipph = (ip + 1) >>> 1;
+				if (ido < l1) {
+					state = 103;
+					break;
+				}
+				t1 = 0;
+				t2 = 0;
+				for (k = 0; k < l1; k++) {
+					t3 = t1;
+					t4 = t2;
+					for (i = 0; i < ido; i++) {
+						ch[t3] = cc[t4];
+						t3++;
+						t4++;
+					}
+					t1 += ido;
+					t2 += t10;
+				}
+				state = 106;
+				break;
+			case 103:
+				t1 = 0;
+				for (i = 0; i < ido; i++) {
+					t2 = t1;
+					t3 = t1;
+					for (k = 0; k < l1; k++) {
+						ch[t2] = cc[t3];
+						t2 += ido;
+						t3 += t10;
+					}
+					t1++;
+				}
+			case 106:
+				t1 = 0;
+				t2 = ipp2 * t0;
+				t7 = (t5 = ido << 1);
+				for (j = 1; j < ipph; j++) {
+					t1 += t0;
+					t2 -= t0;
+					t3 = t1;
+					t4 = t2;
+					t6 = t5;
+					for (k = 0; k < l1; k++) {
+						ch[t3] = cc[t6 - 1] + cc[t6 - 1];
+						ch[t4] = cc[t6] + cc[t6];
+						t3 += ido;
+						t4 += ido;
+						t6 += t10;
+					}
+					t5 += t7;
+				}
+				if (ido == 1) {
+					state = 116;
+					break;
+				}
+				if (nbd < l1) {
+					state = 112;
+					break;
+				}
+
+				t1 = 0;
+				t2 = ipp2 * t0;
+				t7 = 0;
+				for (j = 1; j < ipph; j++) {
+					t1 += t0;
+					t2 -= t0;
+					t3 = t1;
+					t4 = t2;
+
+					t7 += (ido << 1);
+					t8 = t7;
+					for (k = 0; k < l1; k++) {
+						t5 = t3;
+						t6 = t4;
+						t9 = t8;
+						t11 = t8;
+						for (i = 2; i < ido; i += 2) {
+							t5 += 2;
+							t6 += 2;
+							t9 += 2;
+							t11 -= 2;
+							ch[t5 - 1] = cc[t9 - 1] + cc[t11 - 1];
+							ch[t6 - 1] = cc[t9 - 1] - cc[t11 - 1];
+							ch[t5] = cc[t9] - cc[t11];
+							ch[t6] = cc[t9] + cc[t11];
+						}
+						t3 += ido;
+						t4 += ido;
+						t8 += t10;
+					}
+				}
+				state = 116;
+				break;
+			case 112:
+				t1 = 0;
+				t2 = ipp2 * t0;
+				t7 = 0;
+				for (j = 1; j < ipph; j++) {
+					t1 += t0;
+					t2 -= t0;
+					t3 = t1;
+					t4 = t2;
+					t7 += (ido << 1);
+					t8 = t7;
+					t9 = t7;
+					for (i = 2; i < ido; i += 2) {
+						t3 += 2;
+						t4 += 2;
+						t8 += 2;
+						t9 -= 2;
+						t5 = t3;
+						t6 = t4;
+						t11 = t8;
+						t12 = t9;
+						for (k = 0; k < l1; k++) {
+							ch[t5 - 1] = cc[t11 - 1] + cc[t12 - 1];
+							ch[t6 - 1] = cc[t11 - 1] - cc[t12 - 1];
+							ch[t5] = cc[t11] - cc[t12];
+							ch[t6] = cc[t11] + cc[t12];
+							t5 += ido;
+							t6 += ido;
+							t11 += t10;
+							t12 += t10;
+						}
+					}
+				}
+			case 116:
+				ar1 = 1.f;
+				ai1 = 0.f;
+				t1 = 0;
+				t9 = (t2 = ipp2 * idl1);
+				t3 = (ip - 1) * idl1;
+				for (l = 1; l < ipph; l++) {
+					t1 += idl1;
+					t2 -= idl1;
+
+					ar1h = dcp * ar1 - dsp * ai1;
+					ai1 = dcp * ai1 + dsp * ar1;
+					ar1 = ar1h;
+					t4 = t1;
+					t5 = t2;
+					t6 = 0;
+					t7 = idl1;
+					t8 = t3;
+					for (ik = 0; ik < idl1; ik++) {
+						c2[t4++] = ch2[t6++] + ar1 * ch2[t7++];
+						c2[t5++] = ai1 * ch2[t8++];
+					}
+					dc2 = ar1;
+					ds2 = ai1;
+					ar2 = ar1;
+					ai2 = ai1;
+
+					t6 = idl1;
+					t7 = t9 - idl1;
+					for (j = 2; j < ipph; j++) {
+						t6 += idl1;
+						t7 -= idl1;
+						ar2h = dc2 * ar2 - ds2 * ai2;
+						ai2 = dc2 * ai2 + ds2 * ar2;
+						ar2 = ar2h;
+						t4 = t1;
+						t5 = t2;
+						t11 = t6;
+						t12 = t7;
+						for (ik = 0; ik < idl1; ik++) {
+							c2[t4++] += ar2 * ch2[t11++];
+							c2[t5++] += ai2 * ch2[t12++];
+						}
+					}
+				}
+
+				t1 = 0;
+				for (j = 1; j < ipph; j++) {
+					t1 += idl1;
+					t2 = t1;
+					for (ik = 0; ik < idl1; ik++)
+						ch2[ik] += ch2[t2++];
+				}
+
+				t1 = 0;
+				t2 = ipp2 * t0;
+				for (j = 1; j < ipph; j++) {
+					t1 += t0;
+					t2 -= t0;
+					t3 = t1;
+					t4 = t2;
+					for (k = 0; k < l1; k++) {
+						ch[t3] = c1[t3] - c1[t4];
+						ch[t4] = c1[t3] + c1[t4];
+						t3 += ido;
+						t4 += ido;
+					}
+				}
+
+				if (ido == 1) {
+					state = 132;
+					break;
+				}
+				if (nbd < l1) {
+					state = 128;
+					break;
+				}
+
+				t1 = 0;
+				t2 = ipp2 * t0;
+				for (j = 1; j < ipph; j++) {
+					t1 += t0;
+					t2 -= t0;
+					t3 = t1;
+					t4 = t2;
+					for (k = 0; k < l1; k++) {
+						t5 = t3;
+						t6 = t4;
+						for (i = 2; i < ido; i += 2) {
+							t5 += 2;
+							t6 += 2;
+							ch[t5 - 1] = c1[t5 - 1] - c1[t6];
+							ch[t6 - 1] = c1[t5 - 1] + c1[t6];
+							ch[t5] = c1[t5] + c1[t6 - 1];
+							ch[t6] = c1[t5] - c1[t6 - 1];
+						}
+						t3 += ido;
+						t4 += ido;
+					}
+				}
+				state = 132;
+				break;
+			case 128:
+				t1 = 0;
+				t2 = ipp2 * t0;
+				for (j = 1; j < ipph; j++) {
+					t1 += t0;
+					t2 -= t0;
+					t3 = t1;
+					t4 = t2;
+					for (i = 2; i < ido; i += 2) {
+						t3 += 2;
+						t4 += 2;
+						t5 = t3;
+						t6 = t4;
+						for (k = 0; k < l1; k++) {
+							ch[t5 - 1] = c1[t5 - 1] - c1[t6];
+							ch[t6 - 1] = c1[t5 - 1] + c1[t6];
+							ch[t5] = c1[t5] + c1[t6 - 1];
+							ch[t6] = c1[t5] - c1[t6 - 1];
+							t5 += ido;
+							t6 += ido;
+						}
+					}
+				}
+			case 132:
+				if (ido == 1)
+					return;
+
+				for (ik = 0; ik < idl1; ik++)
+					c2[ik] = ch2[ik];
+
+				t1 = 0;
+				for (j = 1; j < ip; j++) {
+					t2 = (t1 += t0);
+					for (k = 0; k < l1; k++) {
+						c1[t2] = ch[t2];
+						t2 += ido;
+					}
+				}
+
+				if (nbd > l1) {
+					state = 139;
+					break;
+				}
+
+				is = -ido - 1;
+				t1 = 0;
+				for (j = 1; j < ip; j++) {
+					is += ido;
+					t1 += t0;
+					idij = is;
+					t2 = t1;
+					for (i = 2; i < ido; i += 2) {
+						t2 += 2;
+						idij += 2;
+						t3 = t2;
+						for (k = 0; k < l1; k++) {
+							c1[t3 - 1] = wa[index + idij - 1] * ch[t3 - 1] - wa[index + idij] * ch[t3];
+							c1[t3] = wa[index + idij - 1] * ch[t3] + wa[index + idij] * ch[t3 - 1];
+							t3 += ido;
+						}
+					}
+				}
+				return;
+
+			case 139:
+				is = -ido - 1;
+				t1 = 0;
+				for (j = 1; j < ip; j++) {
+					is += ido;
+					t1 += t0;
+					t2 = t1;
+					for (k = 0; k < l1; k++) {
+						idij = is;
+						t3 = t2;
+						for (i = 2; i < ido; i += 2) {
+							idij += 2;
+							t3 += 2;
+							c1[t3 - 1] = wa[index + idij - 1] * ch[t3 - 1] - wa[index + idij] * ch[t3];
+							c1[t3] = wa[index + idij - 1] * ch[t3] + wa[index + idij] * ch[t3 - 1];
+						}
+						t2 += ido;
+					}
+				}
+				break loop;
+			}
+		}
+	}
+
+	static void drftb1(int n, float[] c, float[] ch, float[] wa, int index, int[] ifac) {
+		int i, k1, l1, l2 = 0;
+		int na;
+		int nf, ip = 0, iw, ix2, ix3, ido = 0, idl1 = 0;
+
+		nf = ifac[1];
+		na = 0;
+		l1 = 1;
+		iw = 1;
+
+		for (k1 = 0; k1 < nf; k1++) {
+			int state = 100;
+			loop: while (true) {
+				switch (state) {
+				case 100:
+					ip = ifac[k1 + 2];
+					l2 = ip * l1;
+					ido = n / l2;
+					idl1 = ido * l1;
+					if (ip != 4) {
+						state = 103;
+						break;
+					}
+					ix2 = iw + ido;
+					ix3 = ix2 + ido;
+
+					if (na != 0)
+						dradb4(ido, l1, ch, c, wa, index + iw - 1, wa, index + ix2 - 1, wa, index + ix3 - 1);
+					else
+						dradb4(ido, l1, c, ch, wa, index + iw - 1, wa, index + ix2 - 1, wa, index + ix3 - 1);
+					na = 1 - na;
+					state = 115;
+					break;
+				case 103:
+					if (ip != 2) {
+						state = 106;
+						break;
+					}
+
+					if (na != 0)
+						dradb2(ido, l1, ch, c, wa, index + iw - 1);
+					else
+						dradb2(ido, l1, c, ch, wa, index + iw - 1);
+					na = 1 - na;
+					state = 115;
+					break;
+
+				case 106:
+					if (ip != 3) {
+						state = 109;
+						break;
+					}
+
+					ix2 = iw + ido;
+					if (na != 0)
+						dradb3(ido, l1, ch, c, wa, index + iw - 1, wa, index + ix2 - 1);
+					else
+						dradb3(ido, l1, c, ch, wa, index + iw - 1, wa, index + ix2 - 1);
+					na = 1 - na;
+					state = 115;
+					break;
+				case 109:
+					if (na != 0)
+						dradbg(ido, ip, l1, idl1, ch, ch, ch, c, c, wa, index + iw - 1);
+					else
+						dradbg(ido, ip, l1, idl1, c, c, c, ch, ch, wa, index + iw - 1);
+					if (ido == 1)
+						na = 1 - na;
+
+				case 115:
+					l1 = l2;
+					iw += (ip - 1) * ido;
+					break loop;
+				}
+			}
+		}
+		if (na == 0)
+			return;
+		for (i = 0; i < n; i++)
+			c[i] = ch[i];
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/DspState.java b/src/teavm/java/com/jcraft/jorbis/DspState.java
new file mode 100755
index 0000000..997397f
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/DspState.java
@@ -0,0 +1,369 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+public class DspState {
+	static final float M_PI = 3.1415926539f;
+	static final int VI_TRANSFORMB = 1;
+	static final int VI_WINDOWB = 1;
+
+	int analysisp;
+	Info vi;
+	int modebits;
+
+	float[][] pcm;
+	int pcm_storage;
+	int pcm_current;
+	int pcm_returned;
+
+	float[] multipliers;
+	int envelope_storage;
+	int envelope_current;
+
+	int eofflag;
+
+	int lW;
+	int W;
+	int nW;
+	int centerW;
+
+	long granulepos;
+	long sequence;
+
+	long glue_bits;
+	long time_bits;
+	long floor_bits;
+	long res_bits;
+
+	// local lookup storage
+	float[][][][][] window; // block, leadin, leadout, type
+	Object[][] transform;
+	CodeBook[] fullbooks;
+	// backend lookups are tied to the mode, not the backend or naked mapping
+	Object[] mode;
+
+	// local storage, only used on the encoding side. This way the
+	// application does not need to worry about freeing some packets'
+	// memory and not others'; packet storage is always tracked.
+	// Cleared next call to a _dsp_ function
+	byte[] header;
+	byte[] header1;
+	byte[] header2;
+
+	public DspState() {
+		transform = new Object[2][];
+		window = new float[2][][][][];
+		window[0] = new float[2][][][];
+		window[0][0] = new float[2][][];
+		window[0][1] = new float[2][][];
+		window[0][0][0] = new float[2][];
+		window[0][0][1] = new float[2][];
+		window[0][1][0] = new float[2][];
+		window[0][1][1] = new float[2][];
+		window[1] = new float[2][][][];
+		window[1][0] = new float[2][][];
+		window[1][1] = new float[2][][];
+		window[1][0][0] = new float[2][];
+		window[1][0][1] = new float[2][];
+		window[1][1][0] = new float[2][];
+		window[1][1][1] = new float[2][];
+	}
+
+	static float[] window(int type, int window, int left, int right) {
+		float[] ret = new float[window];
+		switch (type) {
+		case 0:
+		// The 'vorbis window' (window 0) is sin(sin(x)*sin(x)*2pi)
+		{
+			int leftbegin = window / 4 - left / 2;
+			int rightbegin = window - window / 4 - right / 2;
+
+			for (int i = 0; i < left; i++) {
+				float x = (float) ((i + .5) / left * M_PI / 2.);
+				x = (float) Math.sin(x);
+				x *= x;
+				x *= M_PI / 2.;
+				x = (float) Math.sin(x);
+				ret[i + leftbegin] = x;
+			}
+
+			for (int i = leftbegin + left; i < rightbegin; i++) {
+				ret[i] = 1.f;
+			}
+
+			for (int i = 0; i < right; i++) {
+				float x = (float) ((right - i - .5) / right * M_PI / 2.);
+				x = (float) Math.sin(x);
+				x *= x;
+				x *= M_PI / 2.;
+				x = (float) Math.sin(x);
+				ret[i + rightbegin] = x;
+			}
+		}
+			break;
+		default:
+			// free(ret);
+			return (null);
+		}
+		return (ret);
+	}
+
+	// Analysis side code, but directly related to blocking. Thus it's
+	// here and not in analysis.c (which is for analysis transforms only).
+	// The init is here because some of it is shared
+
+	int init(Info vi, boolean encp) {
+		this.vi = vi;
+		modebits = Util.ilog2(vi.modes);
+
+		transform[0] = new Object[VI_TRANSFORMB];
+		transform[1] = new Object[VI_TRANSFORMB];
+
+		// MDCT is tranform 0
+
+		transform[0][0] = new Mdct();
+		transform[1][0] = new Mdct();
+		((Mdct) transform[0][0]).init(vi.blocksizes[0]);
+		((Mdct) transform[1][0]).init(vi.blocksizes[1]);
+
+		window[0][0][0] = new float[VI_WINDOWB][];
+		window[0][0][1] = window[0][0][0];
+		window[0][1][0] = window[0][0][0];
+		window[0][1][1] = window[0][0][0];
+		window[1][0][0] = new float[VI_WINDOWB][];
+		window[1][0][1] = new float[VI_WINDOWB][];
+		window[1][1][0] = new float[VI_WINDOWB][];
+		window[1][1][1] = new float[VI_WINDOWB][];
+
+		for (int i = 0; i < VI_WINDOWB; i++) {
+			window[0][0][0][i] = window(i, vi.blocksizes[0], vi.blocksizes[0] / 2, vi.blocksizes[0] / 2);
+			window[1][0][0][i] = window(i, vi.blocksizes[1], vi.blocksizes[0] / 2, vi.blocksizes[0] / 2);
+			window[1][0][1][i] = window(i, vi.blocksizes[1], vi.blocksizes[0] / 2, vi.blocksizes[1] / 2);
+			window[1][1][0][i] = window(i, vi.blocksizes[1], vi.blocksizes[1] / 2, vi.blocksizes[0] / 2);
+			window[1][1][1][i] = window(i, vi.blocksizes[1], vi.blocksizes[1] / 2, vi.blocksizes[1] / 2);
+		}
+
+		fullbooks = new CodeBook[vi.books];
+		for (int i = 0; i < vi.books; i++) {
+			fullbooks[i] = new CodeBook();
+			fullbooks[i].init_decode(vi.book_param[i]);
+		}
+
+		// initialize the storage vectors to a decent size greater than the
+		// minimum
+
+		pcm_storage = 8192; // we'll assume later that we have
+		// a minimum of twice the blocksize of
+		// accumulated samples in analysis
+		pcm = new float[vi.channels][];
+		{
+			for (int i = 0; i < vi.channels; i++) {
+				pcm[i] = new float[pcm_storage];
+			}
+		}
+
+		// all 1 (large block) or 0 (small block)
+		// explicitly set for the sake of clarity
+		lW = 0; // previous window size
+		W = 0; // current window size
+
+		// all vector indexes; multiples of samples_per_envelope_step
+		centerW = vi.blocksizes[1] / 2;
+
+		pcm_current = centerW;
+
+		// initialize all the mapping/backend lookups
+		mode = new Object[vi.modes];
+		for (int i = 0; i < vi.modes; i++) {
+			int mapnum = vi.mode_param[i].mapping;
+			int maptype = vi.map_type[mapnum];
+			mode[i] = FuncMapping.mapping_P[maptype].look(this, vi.mode_param[i], vi.map_param[mapnum]);
+		}
+		return (0);
+	}
+
+	public int synthesis_init(Info vi) {
+		init(vi, false);
+		// Adjust centerW to allow an easier mechanism for determining output
+		pcm_returned = centerW;
+		centerW -= vi.blocksizes[W] / 4 + vi.blocksizes[lW] / 4;
+		granulepos = -1;
+		sequence = -1;
+		return (0);
+	}
+
+	DspState(Info vi) {
+		this();
+		init(vi, false);
+		// Adjust centerW to allow an easier mechanism for determining output
+		pcm_returned = centerW;
+		centerW -= vi.blocksizes[W] / 4 + vi.blocksizes[lW] / 4;
+		granulepos = -1;
+		sequence = -1;
+	}
+
+	// Unike in analysis, the window is only partially applied for each
+	// block. The time domain envelope is not yet handled at the point of
+	// calling (as it relies on the previous block).
+
+	public int synthesis_blockin(Block vb) {
+		// Shift out any PCM/multipliers that we returned previously
+		// centerW is currently the center of the last block added
+		if (centerW > vi.blocksizes[1] / 2 && pcm_returned > 8192) {
+			// don't shift too much; we need to have a minimum PCM buffer of
+			// 1/2 long block
+
+			int shiftPCM = centerW - vi.blocksizes[1] / 2;
+			shiftPCM = (pcm_returned < shiftPCM ? pcm_returned : shiftPCM);
+
+			pcm_current -= shiftPCM;
+			centerW -= shiftPCM;
+			pcm_returned -= shiftPCM;
+			if (shiftPCM != 0) {
+				for (int i = 0; i < vi.channels; i++) {
+					System.arraycopy(pcm[i], shiftPCM, pcm[i], 0, pcm_current);
+				}
+			}
+		}
+
+		lW = W;
+		W = vb.W;
+		nW = -1;
+
+		glue_bits += vb.glue_bits;
+		time_bits += vb.time_bits;
+		floor_bits += vb.floor_bits;
+		res_bits += vb.res_bits;
+
+		if (sequence + 1 != vb.sequence)
+			granulepos = -1; // out of sequence; lose count
+
+		sequence = vb.sequence;
+
+		{
+			int sizeW = vi.blocksizes[W];
+			int _centerW = centerW + vi.blocksizes[lW] / 4 + sizeW / 4;
+			int beginW = _centerW - sizeW / 2;
+			int endW = beginW + sizeW;
+			int beginSl = 0;
+			int endSl = 0;
+
+			// Do we have enough PCM/mult storage for the block?
+			if (endW > pcm_storage) {
+				// expand the storage
+				pcm_storage = endW + vi.blocksizes[1];
+				for (int i = 0; i < vi.channels; i++) {
+					float[] foo = new float[pcm_storage];
+					System.arraycopy(pcm[i], 0, foo, 0, pcm[i].length);
+					pcm[i] = foo;
+				}
+			}
+
+			// overlap/add PCM
+			switch (W) {
+			case 0:
+				beginSl = 0;
+				endSl = vi.blocksizes[0] / 2;
+				break;
+			case 1:
+				beginSl = vi.blocksizes[1] / 4 - vi.blocksizes[lW] / 4;
+				endSl = beginSl + vi.blocksizes[lW] / 2;
+				break;
+			}
+
+			for (int j = 0; j < vi.channels; j++) {
+				int _pcm = beginW;
+				// the overlap/add section
+				int i = 0;
+				for (i = beginSl; i < endSl; i++) {
+					pcm[j][_pcm + i] += vb.pcm[j][i];
+				}
+				// the remaining section
+				for (; i < sizeW; i++) {
+					pcm[j][_pcm + i] = vb.pcm[j][i];
+				}
+			}
+
+			// track the frame number... This is for convenience, but also
+			// making sure our last packet doesn't end with added padding. If
+			// the last packet is partial, the number of samples we'll have to
+			// return will be past the vb->granulepos.
+			//
+			// This is not foolproof! It will be confused if we begin
+			// decoding at the last page after a seek or hole. In that case,
+			// we don't have a starting point to judge where the last frame
+			// is. For this reason, vorbisfile will always try to make sure
+			// it reads the last two marked pages in proper sequence
+
+			if (granulepos == -1) {
+				granulepos = vb.granulepos;
+			} else {
+				granulepos += (_centerW - centerW);
+				if (vb.granulepos != -1 && granulepos != vb.granulepos) {
+					if (granulepos > vb.granulepos && vb.eofflag != 0) {
+						// partial last frame. Strip the padding off
+						_centerW -= (granulepos - vb.granulepos);
+					} // else{ Shouldn't happen *unless* the bitstream is out of
+						// spec. Either way, believe the bitstream }
+					granulepos = vb.granulepos;
+				}
+			}
+
+			// Update, cleanup
+
+			centerW = _centerW;
+			pcm_current = endW;
+			if (vb.eofflag != 0)
+				eofflag = 1;
+		}
+		return (0);
+	}
+
+	// pcm==NULL indicates we just want the pending samples, no more
+	public int synthesis_pcmout(float[][][] _pcm, int[] index) {
+		if (pcm_returned < centerW) {
+			if (_pcm != null) {
+				for (int i = 0; i < vi.channels; i++) {
+					index[i] = pcm_returned;
+				}
+				_pcm[0] = pcm;
+			}
+			return (centerW - pcm_returned);
+		}
+		return (0);
+	}
+
+	public int synthesis_read(int bytes) {
+		if (bytes != 0 && pcm_returned + bytes > centerW)
+			return (-1);
+		pcm_returned += bytes;
+		return (0);
+	}
+
+	public void clear() {
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Floor0.java b/src/teavm/java/com/jcraft/jorbis/Floor0.java
new file mode 100755
index 0000000..b2d49c6
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Floor0.java
@@ -0,0 +1,332 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+class Floor0 extends FuncFloor {
+
+	void pack(Object i, Buffer opb) {
+		InfoFloor0 info = (InfoFloor0) i;
+		opb.write(info.order, 8);
+		opb.write(info.rate, 16);
+		opb.write(info.barkmap, 16);
+		opb.write(info.ampbits, 6);
+		opb.write(info.ampdB, 8);
+		opb.write(info.numbooks - 1, 4);
+		for (int j = 0; j < info.numbooks; j++)
+			opb.write(info.books[j], 8);
+	}
+
+	Object unpack(Info vi, Buffer opb) {
+		InfoFloor0 info = new InfoFloor0();
+		info.order = opb.read(8);
+		info.rate = opb.read(16);
+		info.barkmap = opb.read(16);
+		info.ampbits = opb.read(6);
+		info.ampdB = opb.read(8);
+		info.numbooks = opb.read(4) + 1;
+
+		if ((info.order < 1) || (info.rate < 1) || (info.barkmap < 1) || (info.numbooks < 1)) {
+			return (null);
+		}
+
+		for (int j = 0; j < info.numbooks; j++) {
+			info.books[j] = opb.read(8);
+			if (info.books[j] < 0 || info.books[j] >= vi.books) {
+				return (null);
+			}
+		}
+		return (info);
+	}
+
+	Object look(DspState vd, InfoMode mi, Object i) {
+		float scale;
+		Info vi = vd.vi;
+		InfoFloor0 info = (InfoFloor0) i;
+		LookFloor0 look = new LookFloor0();
+		look.m = info.order;
+		look.n = vi.blocksizes[mi.blockflag] / 2;
+		look.ln = info.barkmap;
+		look.vi = info;
+		look.lpclook.init(look.ln, look.m);
+
+		// we choose a scaling constant so that:
+		scale = look.ln / toBARK((float) (info.rate / 2.));
+
+		// the mapping from a linear scale to a smaller bark scale is
+		// straightforward. We do *not* make sure that the linear mapping
+		// does not skip bark-scale bins; the decoder simply skips them and
+		// the encoder may do what it wishes in filling them. They're
+		// necessary in some mapping combinations to keep the scale spacing
+		// accurate
+		look.linearmap = new int[look.n];
+		for (int j = 0; j < look.n; j++) {
+			int val = (int) Math.floor(toBARK((float) ((info.rate / 2.) / look.n * j)) * scale); // bark numbers
+																									// represent band
+																									// edges
+			if (val >= look.ln)
+				val = look.ln; // guard against the approximation
+			look.linearmap[j] = val;
+		}
+		return look;
+	}
+
+	static float toBARK(float f) {
+		return (float) (13.1 * Math.atan(.00074 * (f)) + 2.24 * Math.atan((f) * (f) * 1.85e-8) + 1e-4 * (f));
+	}
+
+	Object state(Object i) {
+		EchstateFloor0 state = new EchstateFloor0();
+		InfoFloor0 info = (InfoFloor0) i;
+
+		// a safe size if usually too big (dim==1)
+		state.codewords = new int[info.order];
+		state.curve = new float[info.barkmap];
+		state.frameno = -1;
+		return (state);
+	}
+
+	void free_info(Object i) {
+	}
+
+	void free_look(Object i) {
+	}
+
+	void free_state(Object vs) {
+	}
+
+	int forward(Block vb, Object i, float[] in, float[] out, Object vs) {
+		return 0;
+	}
+
+	float[] lsp = null;
+
+	int inverse(Block vb, Object i, float[] out) {
+		// System.err.println("Floor0.inverse "+i.getClass()+"]");
+		LookFloor0 look = (LookFloor0) i;
+		InfoFloor0 info = look.vi;
+		int ampraw = vb.opb.read(info.ampbits);
+		if (ampraw > 0) { // also handles the -1 out of data case
+			int maxval = (1 << info.ampbits) - 1;
+			float amp = (float) ampraw / maxval * info.ampdB;
+			int booknum = vb.opb.read(Util.ilog(info.numbooks));
+
+			if (booknum != -1 && booknum < info.numbooks) {
+
+				synchronized (this) {
+					if (lsp == null || lsp.length < look.m) {
+						lsp = new float[look.m];
+					} else {
+						for (int j = 0; j < look.m; j++)
+							lsp[j] = 0.f;
+					}
+
+					CodeBook b = vb.vd.fullbooks[info.books[booknum]];
+					float last = 0.f;
+
+					for (int j = 0; j < look.m; j++)
+						out[j] = 0.0f;
+
+					for (int j = 0; j < look.m; j += b.dim) {
+						if (b.decodevs(lsp, j, vb.opb, 1, -1) == -1) {
+							for (int k = 0; k < look.n; k++)
+								out[k] = 0.0f;
+							return (0);
+						}
+					}
+					for (int j = 0; j < look.m;) {
+						for (int k = 0; k < b.dim; k++, j++)
+							lsp[j] += last;
+						last = lsp[j - 1];
+					}
+					// take the coefficients back to a spectral envelope curve
+					Lsp.lsp_to_curve(out, look.linearmap, look.n, look.ln, lsp, look.m, amp, info.ampdB);
+
+					return (1);
+				}
+			}
+		}
+		return (0);
+	}
+
+	Object inverse1(Block vb, Object i, Object memo) {
+		LookFloor0 look = (LookFloor0) i;
+		InfoFloor0 info = look.vi;
+		float[] lsp = null;
+		if (memo instanceof float[]) {
+			lsp = (float[]) memo;
+		}
+
+		int ampraw = vb.opb.read(info.ampbits);
+		if (ampraw > 0) { // also handles the -1 out of data case
+			int maxval = (1 << info.ampbits) - 1;
+			float amp = (float) ampraw / maxval * info.ampdB;
+			int booknum = vb.opb.read(Util.ilog(info.numbooks));
+
+			if (booknum != -1 && booknum < info.numbooks) {
+				CodeBook b = vb.vd.fullbooks[info.books[booknum]];
+				float last = 0.f;
+
+				if (lsp == null || lsp.length < look.m + 1) {
+					lsp = new float[look.m + 1];
+				} else {
+					for (int j = 0; j < lsp.length; j++)
+						lsp[j] = 0.f;
+				}
+
+				for (int j = 0; j < look.m; j += b.dim) {
+					if (b.decodev_set(lsp, j, vb.opb, b.dim) == -1) {
+						return (null);
+					}
+				}
+
+				for (int j = 0; j < look.m;) {
+					for (int k = 0; k < b.dim; k++, j++)
+						lsp[j] += last;
+					last = lsp[j - 1];
+				}
+				lsp[look.m] = amp;
+				return (lsp);
+			}
+		}
+		return (null);
+	}
+
+	int inverse2(Block vb, Object i, Object memo, float[] out) {
+		LookFloor0 look = (LookFloor0) i;
+		InfoFloor0 info = look.vi;
+
+		if (memo != null) {
+			float[] lsp = (float[]) memo;
+			float amp = lsp[look.m];
+
+			Lsp.lsp_to_curve(out, look.linearmap, look.n, look.ln, lsp, look.m, amp, info.ampdB);
+			return (1);
+		}
+		for (int j = 0; j < look.n; j++) {
+			out[j] = 0.f;
+		}
+		return (0);
+	}
+
+	static float fromdB(float x) {
+		return (float) (Math.exp((x) * .11512925));
+	}
+
+	static void lsp_to_lpc(float[] lsp, float[] lpc, int m) {
+		int i, j, m2 = m / 2;
+		float[] O = new float[m2];
+		float[] E = new float[m2];
+		float A;
+		float[] Ae = new float[m2 + 1];
+		float[] Ao = new float[m2 + 1];
+		float B;
+		float[] Be = new float[m2];
+		float[] Bo = new float[m2];
+		float temp;
+
+		// even/odd roots setup
+		for (i = 0; i < m2; i++) {
+			O[i] = (float) (-2. * Math.cos(lsp[i * 2]));
+			E[i] = (float) (-2. * Math.cos(lsp[i * 2 + 1]));
+		}
+
+		// set up impulse response
+		for (j = 0; j < m2; j++) {
+			Ae[j] = 0.f;
+			Ao[j] = 1.f;
+			Be[j] = 0.f;
+			Bo[j] = 1.f;
+		}
+		Ao[j] = 1.f;
+		Ae[j] = 1.f;
+
+		// run impulse response
+		for (i = 1; i < m + 1; i++) {
+			A = B = 0.f;
+			for (j = 0; j < m2; j++) {
+				temp = O[j] * Ao[j] + Ae[j];
+				Ae[j] = Ao[j];
+				Ao[j] = A;
+				A += temp;
+
+				temp = E[j] * Bo[j] + Be[j];
+				Be[j] = Bo[j];
+				Bo[j] = B;
+				B += temp;
+			}
+			lpc[i - 1] = (A + Ao[j] + B - Ae[j]) / 2;
+			Ao[j] = A;
+			Ae[j] = B;
+		}
+	}
+
+	static void lpc_to_curve(float[] curve, float[] lpc, float amp, LookFloor0 l, String name, int frameno) {
+		// l->m+1 must be less than l->ln, but guard in case we get a bad stream
+		float[] lcurve = new float[Math.max(l.ln * 2, l.m * 2 + 2)];
+
+		if (amp == 0) {
+			for (int j = 0; j < l.n; j++)
+				curve[j] = 0.0f;
+			return;
+		}
+		l.lpclook.lpc_to_curve(lcurve, lpc, amp);
+
+		for (int i = 0; i < l.n; i++)
+			curve[i] = lcurve[l.linearmap[i]];
+	}
+
+	class InfoFloor0 {
+		int order;
+		int rate;
+		int barkmap;
+
+		int ampbits;
+		int ampdB;
+
+		int numbooks; // <= 16
+		int[] books = new int[16];
+	}
+
+	class LookFloor0 {
+		int n;
+		int ln;
+		int m;
+		int[] linearmap;
+
+		InfoFloor0 vi;
+		Lpc lpclook = new Lpc();
+	}
+
+	class EchstateFloor0 {
+		int[] codewords;
+		float[] curve;
+		long frameno;
+		long codes;
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Floor1.java b/src/teavm/java/com/jcraft/jorbis/Floor1.java
new file mode 100755
index 0000000..c9f77c3
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Floor1.java
@@ -0,0 +1,584 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+class Floor1 extends FuncFloor {
+	static final int floor1_rangedb = 140;
+	static final int VIF_POSIT = 63;
+
+	void pack(Object i, Buffer opb) {
+		InfoFloor1 info = (InfoFloor1) i;
+
+		int count = 0;
+		int rangebits;
+		int maxposit = info.postlist[1];
+		int maxclass = -1;
+
+		/* save out partitions */
+		opb.write(info.partitions, 5); /* only 0 to 31 legal */
+		for (int j = 0; j < info.partitions; j++) {
+			opb.write(info.partitionclass[j], 4); /* only 0 to 15 legal */
+			if (maxclass < info.partitionclass[j])
+				maxclass = info.partitionclass[j];
+		}
+
+		/* save out partition classes */
+		for (int j = 0; j < maxclass + 1; j++) {
+			opb.write(info.class_dim[j] - 1, 3); /* 1 to 8 */
+			opb.write(info.class_subs[j], 2); /* 0 to 3 */
+			if (info.class_subs[j] != 0) {
+				opb.write(info.class_book[j], 8);
+			}
+			for (int k = 0; k < (1 << info.class_subs[j]); k++) {
+				opb.write(info.class_subbook[j][k] + 1, 8);
+			}
+		}
+
+		/* save out the post list */
+		opb.write(info.mult - 1, 2); /* only 1,2,3,4 legal now */
+		opb.write(Util.ilog2(maxposit), 4);
+		rangebits = Util.ilog2(maxposit);
+
+		for (int j = 0, k = 0; j < info.partitions; j++) {
+			count += info.class_dim[info.partitionclass[j]];
+			for (; k < count; k++) {
+				opb.write(info.postlist[k + 2], rangebits);
+			}
+		}
+	}
+
+	Object unpack(Info vi, Buffer opb) {
+		int count = 0, maxclass = -1, rangebits;
+		InfoFloor1 info = new InfoFloor1();
+
+		/* read partitions */
+		info.partitions = opb.read(5); /* only 0 to 31 legal */
+		for (int j = 0; j < info.partitions; j++) {
+			info.partitionclass[j] = opb.read(4); /* only 0 to 15 legal */
+			if (maxclass < info.partitionclass[j])
+				maxclass = info.partitionclass[j];
+		}
+
+		/* read partition classes */
+		for (int j = 0; j < maxclass + 1; j++) {
+			info.class_dim[j] = opb.read(3) + 1; /* 1 to 8 */
+			info.class_subs[j] = opb.read(2); /* 0,1,2,3 bits */
+			if (info.class_subs[j] < 0) {
+				info.free();
+				return (null);
+			}
+			if (info.class_subs[j] != 0) {
+				info.class_book[j] = opb.read(8);
+			}
+			if (info.class_book[j] < 0 || info.class_book[j] >= vi.books) {
+				info.free();
+				return (null);
+			}
+			for (int k = 0; k < (1 << info.class_subs[j]); k++) {
+				info.class_subbook[j][k] = opb.read(8) - 1;
+				if (info.class_subbook[j][k] < -1 || info.class_subbook[j][k] >= vi.books) {
+					info.free();
+					return (null);
+				}
+			}
+		}
+
+		/* read the post list */
+		info.mult = opb.read(2) + 1; /* only 1,2,3,4 legal now */
+		rangebits = opb.read(4);
+
+		for (int j = 0, k = 0; j < info.partitions; j++) {
+			count += info.class_dim[info.partitionclass[j]];
+			for (; k < count; k++) {
+				int t = info.postlist[k + 2] = opb.read(rangebits);
+				if (t < 0 || t >= (1 << rangebits)) {
+					info.free();
+					return (null);
+				}
+			}
+		}
+		info.postlist[0] = 0;
+		info.postlist[1] = 1 << rangebits;
+
+		return (info);
+	}
+
+	Object look(DspState vd, InfoMode mi, Object i) {
+		int _n = 0;
+
+		int[] sortpointer = new int[VIF_POSIT + 2];
+
+		// Info vi=vd.vi;
+
+		InfoFloor1 info = (InfoFloor1) i;
+		LookFloor1 look = new LookFloor1();
+		look.vi = info;
+		look.n = info.postlist[1];
+
+		/*
+		 * we drop each position value in-between already decoded values, and use linear
+		 * interpolation to predict each new value past the edges. The positions are
+		 * read in the order of the position list... we precompute the bounding
+		 * positions in the lookup. Of course, the neighbors can change (if a position
+		 * is declined), but this is an initial mapping
+		 */
+
+		for (int j = 0; j < info.partitions; j++) {
+			_n += info.class_dim[info.partitionclass[j]];
+		}
+		_n += 2;
+		look.posts = _n;
+
+		/* also store a sorted position index */
+		for (int j = 0; j < _n; j++) {
+			sortpointer[j] = j;
+		}
+		// qsort(sortpointer,n,sizeof(int),icomp); // !!
+
+		int foo;
+		for (int j = 0; j < _n - 1; j++) {
+			for (int k = j; k < _n; k++) {
+				if (info.postlist[sortpointer[j]] > info.postlist[sortpointer[k]]) {
+					foo = sortpointer[k];
+					sortpointer[k] = sortpointer[j];
+					sortpointer[j] = foo;
+				}
+			}
+		}
+
+		/* points from sort order back to range number */
+		for (int j = 0; j < _n; j++) {
+			look.forward_index[j] = sortpointer[j];
+		}
+		/* points from range order to sorted position */
+		for (int j = 0; j < _n; j++) {
+			look.reverse_index[look.forward_index[j]] = j;
+		}
+		/* we actually need the post values too */
+		for (int j = 0; j < _n; j++) {
+			look.sorted_index[j] = info.postlist[look.forward_index[j]];
+		}
+
+		/* quantize values to multiplier spec */
+		switch (info.mult) {
+		case 1: /* 1024 -> 256 */
+			look.quant_q = 256;
+			break;
+		case 2: /* 1024 -> 128 */
+			look.quant_q = 128;
+			break;
+		case 3: /* 1024 -> 86 */
+			look.quant_q = 86;
+			break;
+		case 4: /* 1024 -> 64 */
+			look.quant_q = 64;
+			break;
+		default:
+			look.quant_q = -1;
+		}
+
+		/*
+		 * discover our neighbors for decode where we don't use fit flags (that would
+		 * push the neighbors outward)
+		 */
+		for (int j = 0; j < _n - 2; j++) {
+			int lo = 0;
+			int hi = 1;
+			int lx = 0;
+			int hx = look.n;
+			int currentx = info.postlist[j + 2];
+			for (int k = 0; k < j + 2; k++) {
+				int x = info.postlist[k];
+				if (x > lx && x < currentx) {
+					lo = k;
+					lx = x;
+				}
+				if (x < hx && x > currentx) {
+					hi = k;
+					hx = x;
+				}
+			}
+			look.loneighbor[j] = lo;
+			look.hineighbor[j] = hi;
+		}
+
+		return look;
+	}
+
+	void free_info(Object i) {
+	}
+
+	void free_look(Object i) {
+	}
+
+	void free_state(Object vs) {
+	}
+
+	int forward(Block vb, Object i, float[] in, float[] out, Object vs) {
+		return 0;
+	}
+
+	Object inverse1(Block vb, Object ii, Object memo) {
+		LookFloor1 look = (LookFloor1) ii;
+		InfoFloor1 info = look.vi;
+		CodeBook[] books = vb.vd.fullbooks;
+
+		/* unpack wrapped/predicted values from stream */
+		if (vb.opb.read(1) == 1) {
+			int[] fit_value = null;
+			if (memo instanceof int[]) {
+				fit_value = (int[]) memo;
+			}
+			if (fit_value == null || fit_value.length < look.posts) {
+				fit_value = new int[look.posts];
+			} else {
+				for (int i = 0; i < fit_value.length; i++)
+					fit_value[i] = 0;
+			}
+
+			fit_value[0] = vb.opb.read(Util.ilog(look.quant_q - 1));
+			fit_value[1] = vb.opb.read(Util.ilog(look.quant_q - 1));
+
+			/* partition by partition */
+			for (int i = 0, j = 2; i < info.partitions; i++) {
+				int clss = info.partitionclass[i];
+				int cdim = info.class_dim[clss];
+				int csubbits = info.class_subs[clss];
+				int csub = 1 << csubbits;
+				int cval = 0;
+
+				/* decode the partition's first stage cascade value */
+				if (csubbits != 0) {
+					cval = books[info.class_book[clss]].decode(vb.opb);
+
+					if (cval == -1) {
+						return (null);
+					}
+				}
+
+				for (int k = 0; k < cdim; k++) {
+					int book = info.class_subbook[clss][cval & (csub - 1)];
+					cval >>>= csubbits;
+					if (book >= 0) {
+						if ((fit_value[j + k] = books[book].decode(vb.opb)) == -1) {
+							return (null);
+						}
+					} else {
+						fit_value[j + k] = 0;
+					}
+				}
+				j += cdim;
+			}
+
+			/* unwrap positive values and reconsitute via linear interpolation */
+			for (int i = 2; i < look.posts; i++) {
+				int predicted = render_point(info.postlist[look.loneighbor[i - 2]],
+						info.postlist[look.hineighbor[i - 2]], fit_value[look.loneighbor[i - 2]],
+						fit_value[look.hineighbor[i - 2]], info.postlist[i]);
+				int hiroom = look.quant_q - predicted;
+				int loroom = predicted;
+				int room = (hiroom < loroom ? hiroom : loroom) << 1;
+				int val = fit_value[i];
+
+				if (val != 0) {
+					if (val >= room) {
+						if (hiroom > loroom) {
+							val = val - loroom;
+						} else {
+							val = -1 - (val - hiroom);
+						}
+					} else {
+						if ((val & 1) != 0) {
+							val = -((val + 1) >>> 1);
+						} else {
+							val >>= 1;
+						}
+					}
+
+					fit_value[i] = val + predicted;
+					fit_value[look.loneighbor[i - 2]] &= 0x7fff;
+					fit_value[look.hineighbor[i - 2]] &= 0x7fff;
+				} else {
+					fit_value[i] = predicted | 0x8000;
+				}
+			}
+			return (fit_value);
+		}
+
+		return (null);
+	}
+
+	private static int render_point(int x0, int x1, int y0, int y1, int x) {
+		y0 &= 0x7fff; /* mask off flag */
+		y1 &= 0x7fff;
+
+		{
+			int dy = y1 - y0;
+			int adx = x1 - x0;
+			int ady = Math.abs(dy);
+			int err = ady * (x - x0);
+
+			int off = (int) (err / adx);
+			if (dy < 0)
+				return (y0 - off);
+			return (y0 + off);
+		}
+	}
+
+	int inverse2(Block vb, Object i, Object memo, float[] out) {
+		LookFloor1 look = (LookFloor1) i;
+		InfoFloor1 info = look.vi;
+		int n = vb.vd.vi.blocksizes[vb.mode] / 2;
+
+		if (memo != null) {
+			/* render the lines */
+			int[] fit_value = (int[]) memo;
+			int hx = 0;
+			int lx = 0;
+			int ly = fit_value[0] * info.mult;
+			for (int j = 1; j < look.posts; j++) {
+				int current = look.forward_index[j];
+				int hy = fit_value[current] & 0x7fff;
+				if (hy == fit_value[current]) {
+					hy *= info.mult;
+					hx = info.postlist[current];
+
+					render_line(lx, hx, ly, hy, out);
+
+					lx = hx;
+					ly = hy;
+				}
+			}
+			for (int j = hx; j < n; j++) {
+				out[j] *= out[j - 1]; /* be certain */
+			}
+			return (1);
+		}
+		for (int j = 0; j < n; j++) {
+			out[j] = 0.f;
+		}
+		return (0);
+	}
+
+	private static float[] FLOOR_fromdB_LOOKUP = { 1.0649863e-07F, 1.1341951e-07F, 1.2079015e-07F, 1.2863978e-07F,
+			1.3699951e-07F, 1.4590251e-07F, 1.5538408e-07F, 1.6548181e-07F, 1.7623575e-07F, 1.8768855e-07F,
+			1.9988561e-07F, 2.128753e-07F, 2.2670913e-07F, 2.4144197e-07F, 2.5713223e-07F, 2.7384213e-07F,
+			2.9163793e-07F, 3.1059021e-07F, 3.3077411e-07F, 3.5226968e-07F, 3.7516214e-07F, 3.9954229e-07F,
+			4.2550680e-07F, 4.5315863e-07F, 4.8260743e-07F, 5.1396998e-07F, 5.4737065e-07F, 5.8294187e-07F,
+			6.2082472e-07F, 6.6116941e-07F, 7.0413592e-07F, 7.4989464e-07F, 7.9862701e-07F, 8.5052630e-07F,
+			9.0579828e-07F, 9.6466216e-07F, 1.0273513e-06F, 1.0941144e-06F, 1.1652161e-06F, 1.2409384e-06F,
+			1.3215816e-06F, 1.4074654e-06F, 1.4989305e-06F, 1.5963394e-06F, 1.7000785e-06F, 1.8105592e-06F,
+			1.9282195e-06F, 2.0535261e-06F, 2.1869758e-06F, 2.3290978e-06F, 2.4804557e-06F, 2.6416497e-06F,
+			2.8133190e-06F, 2.9961443e-06F, 3.1908506e-06F, 3.3982101e-06F, 3.6190449e-06F, 3.8542308e-06F,
+			4.1047004e-06F, 4.3714470e-06F, 4.6555282e-06F, 4.9580707e-06F, 5.2802740e-06F, 5.6234160e-06F,
+			5.9888572e-06F, 6.3780469e-06F, 6.7925283e-06F, 7.2339451e-06F, 7.7040476e-06F, 8.2047000e-06F,
+			8.7378876e-06F, 9.3057248e-06F, 9.9104632e-06F, 1.0554501e-05F, 1.1240392e-05F, 1.1970856e-05F,
+			1.2748789e-05F, 1.3577278e-05F, 1.4459606e-05F, 1.5399272e-05F, 1.6400004e-05F, 1.7465768e-05F,
+			1.8600792e-05F, 1.9809576e-05F, 2.1096914e-05F, 2.2467911e-05F, 2.3928002e-05F, 2.5482978e-05F,
+			2.7139006e-05F, 2.8902651e-05F, 3.0780908e-05F, 3.2781225e-05F, 3.4911534e-05F, 3.7180282e-05F,
+			3.9596466e-05F, 4.2169667e-05F, 4.4910090e-05F, 4.7828601e-05F, 5.0936773e-05F, 5.4246931e-05F,
+			5.7772202e-05F, 6.1526565e-05F, 6.5524908e-05F, 6.9783085e-05F, 7.4317983e-05F, 7.9147585e-05F,
+			8.4291040e-05F, 8.9768747e-05F, 9.5602426e-05F, 0.00010181521F, 0.00010843174F, 0.00011547824F,
+			0.00012298267F, 0.00013097477F, 0.00013948625F, 0.00014855085F, 0.00015820453F, 0.00016848555F,
+			0.00017943469F, 0.00019109536F, 0.00020351382F, 0.00021673929F, 0.00023082423F, 0.00024582449F,
+			0.00026179955F, 0.00027881276F, 0.00029693158F, 0.00031622787F, 0.00033677814F, 0.00035866388F,
+			0.00038197188F, 0.00040679456F, 0.00043323036F, 0.00046138411F, 0.00049136745F, 0.00052329927F,
+			0.00055730621F, 0.00059352311F, 0.00063209358F, 0.00067317058F, 0.00071691700F, 0.00076350630F,
+			0.00081312324F, 0.00086596457F, 0.00092223983F, 0.00098217216F, 0.0010459992F, 0.0011139742F, 0.0011863665F,
+			0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F,
+			0.0019632195F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895994F, 0.0028643847F,
+			0.0030505286F, 0.0032487691F, 0.0034598925F, 0.0036847358F, 0.0039241906F, 0.0041792066F, 0.0044507950F,
+			0.0047400328F, 0.0050480668F, 0.0053761186F, 0.0057254891F, 0.0060975636F, 0.0064938176F, 0.0069158225F,
+			0.0073652516F, 0.0078438871F, 0.0083536271F, 0.0088964928F, 0.009474637F, 0.010090352F, 0.010746080F,
+			0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697687F,
+			0.017782797F, 0.018938423F, 0.020169149F, 0.021479854F, 0.022875735F, 0.024362330F, 0.025945531F,
+			0.027631618F, 0.029427276F, 0.031339626F, 0.033376252F, 0.035545228F, 0.037855157F, 0.040315199F,
+			0.042935108F, 0.045725273F, 0.048696758F, 0.051861348F, 0.055231591F, 0.058820850F, 0.062643361F,
+			0.066714279F, 0.071049749F, 0.075666962F, 0.080584227F, 0.085821044F, 0.091398179F, 0.097337747F,
+			0.10366330F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201813F, 0.15124727F, 0.16107617F,
+			0.17154380F, 0.18269168F, 0.19456402F, 0.20720788F, 0.22067342F, 0.23501402F, 0.25028656F, 0.26655159F,
+			0.28387361F, 0.30232132F, 0.32196786F, 0.34289114F, 0.36517414F, 0.38890521F, 0.41417847F, 0.44109412F,
+			0.46975890F, 0.50028648F, 0.53279791F, 0.56742212F, 0.60429640F, 0.64356699F, 0.68538959F, 0.72993007F,
+			0.77736504F, 0.82788260F, 0.88168307F, 0.9389798F, 1.F };
+
+	private static void render_line(int x0, int x1, int y0, int y1, float[] d) {
+		int dy = y1 - y0;
+		int adx = x1 - x0;
+		int ady = Math.abs(dy);
+		int base = dy / adx;
+		int sy = (dy < 0 ? base - 1 : base + 1);
+		int x = x0;
+		int y = y0;
+		int err = 0;
+
+		ady -= Math.abs(base * adx);
+
+		d[x] *= FLOOR_fromdB_LOOKUP[y];
+		while (++x < x1) {
+			err = err + ady;
+			if (err >= adx) {
+				err -= adx;
+				y += sy;
+			} else {
+				y += base;
+			}
+			d[x] *= FLOOR_fromdB_LOOKUP[y];
+		}
+	}
+
+	class InfoFloor1 {
+		static final int VIF_POSIT = 63;
+		static final int VIF_CLASS = 16;
+		static final int VIF_PARTS = 31;
+
+		int partitions; /* 0 to 31 */
+		int[] partitionclass = new int[VIF_PARTS]; /* 0 to 15 */
+
+		int[] class_dim = new int[VIF_CLASS]; /* 1 to 8 */
+		int[] class_subs = new int[VIF_CLASS]; /* 0,1,2,3 (bits: 1<<n poss) */
+		int[] class_book = new int[VIF_CLASS]; /* subs ^ dim entries */
+		int[][] class_subbook = new int[VIF_CLASS][]; /* [VIF_CLASS][subs] */
+
+		int mult; /* 1 2 3 or 4 */
+		int[] postlist = new int[VIF_POSIT + 2]; /* first two implicit */
+
+		/* encode side analysis parameters */
+		float maxover;
+		float maxunder;
+		float maxerr;
+
+		int twofitminsize;
+		int twofitminused;
+		int twofitweight;
+		float twofitatten;
+		int unusedminsize;
+		int unusedmin_n;
+
+		int n;
+
+		InfoFloor1() {
+			for (int i = 0; i < class_subbook.length; i++) {
+				class_subbook[i] = new int[8];
+			}
+		}
+
+		void free() {
+			partitionclass = null;
+			class_dim = null;
+			class_subs = null;
+			class_book = null;
+			class_subbook = null;
+			postlist = null;
+		}
+
+		Object copy_info() {
+			InfoFloor1 info = this;
+			InfoFloor1 ret = new InfoFloor1();
+
+			ret.partitions = info.partitions;
+			System.arraycopy(info.partitionclass, 0, ret.partitionclass, 0, VIF_PARTS);
+			System.arraycopy(info.class_dim, 0, ret.class_dim, 0, VIF_CLASS);
+			System.arraycopy(info.class_subs, 0, ret.class_subs, 0, VIF_CLASS);
+			System.arraycopy(info.class_book, 0, ret.class_book, 0, VIF_CLASS);
+
+			for (int j = 0; j < VIF_CLASS; j++) {
+				System.arraycopy(info.class_subbook[j], 0, ret.class_subbook[j], 0, 8);
+			}
+
+			ret.mult = info.mult;
+			System.arraycopy(info.postlist, 0, ret.postlist, 0, VIF_POSIT + 2);
+
+			ret.maxover = info.maxover;
+			ret.maxunder = info.maxunder;
+			ret.maxerr = info.maxerr;
+
+			ret.twofitminsize = info.twofitminsize;
+			ret.twofitminused = info.twofitminused;
+			ret.twofitweight = info.twofitweight;
+			ret.twofitatten = info.twofitatten;
+			ret.unusedminsize = info.unusedminsize;
+			ret.unusedmin_n = info.unusedmin_n;
+
+			ret.n = info.n;
+
+			return (ret);
+		}
+
+	}
+
+	class LookFloor1 {
+		static final int VIF_POSIT = 63;
+
+		int[] sorted_index = new int[VIF_POSIT + 2];
+		int[] forward_index = new int[VIF_POSIT + 2];
+		int[] reverse_index = new int[VIF_POSIT + 2];
+		int[] hineighbor = new int[VIF_POSIT];
+		int[] loneighbor = new int[VIF_POSIT];
+		int posts;
+
+		int n;
+		int quant_q;
+		InfoFloor1 vi;
+
+		int phrasebits;
+		int postbits;
+		int frames;
+
+		void free() {
+			sorted_index = null;
+			forward_index = null;
+			reverse_index = null;
+			hineighbor = null;
+			loneighbor = null;
+		}
+	}
+
+	class Lsfit_acc {
+		long x0;
+		long x1;
+
+		long xa;
+		long ya;
+		long x2a;
+		long y2a;
+		long xya;
+		long n;
+		long an;
+		long un;
+		long edgey0;
+		long edgey1;
+	}
+
+	class EchstateFloor1 {
+		int[] codewords;
+		float[] curve;
+		long frameno;
+		long codes;
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/FuncFloor.java b/src/teavm/java/com/jcraft/jorbis/FuncFloor.java
new file mode 100755
index 0000000..110c5f0
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/FuncFloor.java
@@ -0,0 +1,52 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+abstract class FuncFloor {
+
+	public static FuncFloor[] floor_P = { new Floor0(), new Floor1() };
+
+	abstract void pack(Object i, Buffer opb);
+
+	abstract Object unpack(Info vi, Buffer opb);
+
+	abstract Object look(DspState vd, InfoMode mi, Object i);
+
+	abstract void free_info(Object i);
+
+	abstract void free_look(Object i);
+
+	abstract void free_state(Object vs);
+
+	abstract int forward(Block vb, Object i, float[] in, float[] out, Object vs);
+
+	abstract Object inverse1(Block vb, Object i, Object memo);
+
+	abstract int inverse2(Block vb, Object i, Object memo, float[] out);
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/FuncMapping.java b/src/teavm/java/com/jcraft/jorbis/FuncMapping.java
new file mode 100755
index 0000000..1a83098
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/FuncMapping.java
@@ -0,0 +1,45 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+abstract class FuncMapping {
+	public static FuncMapping[] mapping_P = { new Mapping0() };
+
+	abstract void pack(Info info, Object imap, Buffer buffer);
+
+	abstract Object unpack(Info info, Buffer buffer);
+
+	abstract Object look(DspState vd, InfoMode vm, Object m);
+
+	abstract void free_info(Object imap);
+
+	abstract void free_look(Object imap);
+
+	abstract int inverse(Block vd, Object lm);
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/FuncResidue.java b/src/teavm/java/com/jcraft/jorbis/FuncResidue.java
new file mode 100755
index 0000000..33ab1e2
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/FuncResidue.java
@@ -0,0 +1,45 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+abstract class FuncResidue {
+	public static FuncResidue[] residue_P = { new Residue0(), new Residue1(), new Residue2() };
+
+	abstract void pack(Object vr, Buffer opb);
+
+	abstract Object unpack(Info vi, Buffer opb);
+
+	abstract Object look(DspState vd, InfoMode vm, Object vr);
+
+	abstract void free_info(Object i);
+
+	abstract void free_look(Object i);
+
+	abstract int inverse(Block vb, Object vl, float[][] in, int[] nonzero, int ch);
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/FuncTime.java b/src/teavm/java/com/jcraft/jorbis/FuncTime.java
new file mode 100755
index 0000000..019b634
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/FuncTime.java
@@ -0,0 +1,45 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+abstract class FuncTime {
+	public static FuncTime[] time_P = { new Time0() };
+
+	abstract void pack(Object i, Buffer opb);
+
+	abstract Object unpack(Info vi, Buffer opb);
+
+	abstract Object look(DspState vd, InfoMode vm, Object i);
+
+	abstract void free_info(Object i);
+
+	abstract void free_look(Object i);
+
+	abstract int inverse(Block vb, Object i, float[] in, float[] out);
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Info.java b/src/teavm/java/com/jcraft/jorbis/Info.java
new file mode 100755
index 0000000..e0f0285
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Info.java
@@ -0,0 +1,468 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+public class Info {
+	private static final int OV_EBADPACKET = -136;
+	private static final int OV_ENOTAUDIO = -135;
+
+	private static byte[] _vorbis = "vorbis".getBytes();
+	private static final int VI_TIMEB = 1;
+	// private static final int VI_FLOORB=1;
+	private static final int VI_FLOORB = 2;
+	// private static final int VI_RESB=1;
+	private static final int VI_RESB = 3;
+	private static final int VI_MAPB = 1;
+	private static final int VI_WINDOWB = 1;
+
+	public int version;
+	public int channels;
+	public int rate;
+
+	// The below bitrate declarations are *hints*.
+	// Combinations of the three values carry the following implications:
+	//
+	// all three set to the same value:
+	// implies a fixed rate bitstream
+	// only nominal set:
+	// implies a VBR stream that averages the nominal bitrate. No hard
+	// upper/lower limit
+	// upper and or lower set:
+	// implies a VBR bitstream that obeys the bitrate limits. nominal
+	// may also be set to give a nominal rate.
+	// none set:
+	// the coder does not care to speculate.
+
+	int bitrate_upper;
+	int bitrate_nominal;
+	int bitrate_lower;
+
+	// Vorbis supports only short and long blocks, but allows the
+	// encoder to choose the sizes
+
+	int[] blocksizes = new int[2];
+
+	// modes are the primary means of supporting on-the-fly different
+	// blocksizes, different channel mappings (LR or mid-side),
+	// different residue backends, etc. Each mode consists of a
+	// blocksize flag and a mapping (along with the mapping setup
+
+	int modes;
+	int maps;
+	int times;
+	int floors;
+	int residues;
+	int books;
+	int psys; // encode only
+
+	InfoMode[] mode_param = null;
+
+	int[] map_type = null;
+	Object[] map_param = null;
+
+	int[] time_type = null;
+	Object[] time_param = null;
+
+	int[] floor_type = null;
+	Object[] floor_param = null;
+
+	int[] residue_type = null;
+	Object[] residue_param = null;
+
+	StaticCodeBook[] book_param = null;
+
+	PsyInfo[] psy_param = new PsyInfo[64]; // encode only
+
+	// for block long/sort tuning; encode only
+	int envelopesa;
+	float preecho_thresh;
+	float preecho_clamp;
+
+	// used by synthesis, which has a full, alloced vi
+	public void init() {
+		rate = 0;
+	}
+
+	public void clear() {
+		for (int i = 0; i < modes; i++) {
+			mode_param[i] = null;
+		}
+		mode_param = null;
+
+		for (int i = 0; i < maps; i++) { // unpack does the range checking
+			FuncMapping.mapping_P[map_type[i]].free_info(map_param[i]);
+		}
+		map_param = null;
+
+		for (int i = 0; i < times; i++) { // unpack does the range checking
+			FuncTime.time_P[time_type[i]].free_info(time_param[i]);
+		}
+		time_param = null;
+
+		for (int i = 0; i < floors; i++) { // unpack does the range checking
+			FuncFloor.floor_P[floor_type[i]].free_info(floor_param[i]);
+		}
+		floor_param = null;
+
+		for (int i = 0; i < residues; i++) { // unpack does the range checking
+			FuncResidue.residue_P[residue_type[i]].free_info(residue_param[i]);
+		}
+		residue_param = null;
+
+		// the static codebooks *are* freed if you call info_clear, because
+		// decode side does alloc a 'static' codebook. Calling clear on the
+		// full codebook does not clear the static codebook (that's our
+		// responsibility)
+		for (int i = 0; i < books; i++) {
+			// just in case the decoder pre-cleared to save space
+			if (book_param[i] != null) {
+				book_param[i].clear();
+				book_param[i] = null;
+			}
+		}
+		// if(vi->book_param)free(vi->book_param);
+		book_param = null;
+
+		for (int i = 0; i < psys; i++) {
+			psy_param[i].free();
+		}
+
+	}
+
+	// Header packing/unpacking
+	int unpack_info(Buffer opb) {
+		version = opb.read(32);
+		if (version != 0)
+			return (-1);
+
+		channels = opb.read(8);
+		rate = opb.read(32);
+
+		bitrate_upper = opb.read(32);
+		bitrate_nominal = opb.read(32);
+		bitrate_lower = opb.read(32);
+
+		blocksizes[0] = 1 << opb.read(4);
+		blocksizes[1] = 1 << opb.read(4);
+
+		if ((rate < 1) || (channels < 1) || (blocksizes[0] < 8) || (blocksizes[1] < blocksizes[0])
+				|| (opb.read(1) != 1)) {
+			clear();
+			return (-1);
+		}
+		return (0);
+	}
+
+	// all of the real encoding details are here. The modes, books,
+	// everything
+	int unpack_books(Buffer opb) {
+
+		books = opb.read(8) + 1;
+
+		if (book_param == null || book_param.length != books)
+			book_param = new StaticCodeBook[books];
+		for (int i = 0; i < books; i++) {
+			book_param[i] = new StaticCodeBook();
+			if (book_param[i].unpack(opb) != 0) {
+				clear();
+				return (-1);
+			}
+		}
+
+		// time backend settings
+		times = opb.read(6) + 1;
+		if (time_type == null || time_type.length != times)
+			time_type = new int[times];
+		if (time_param == null || time_param.length != times)
+			time_param = new Object[times];
+		for (int i = 0; i < times; i++) {
+			time_type[i] = opb.read(16);
+			if (time_type[i] < 0 || time_type[i] >= VI_TIMEB) {
+				clear();
+				return (-1);
+			}
+			time_param[i] = FuncTime.time_P[time_type[i]].unpack(this, opb);
+			if (time_param[i] == null) {
+				clear();
+				return (-1);
+			}
+		}
+
+		// floor backend settings
+		floors = opb.read(6) + 1;
+		if (floor_type == null || floor_type.length != floors)
+			floor_type = new int[floors];
+		if (floor_param == null || floor_param.length != floors)
+			floor_param = new Object[floors];
+
+		for (int i = 0; i < floors; i++) {
+			floor_type[i] = opb.read(16);
+			if (floor_type[i] < 0 || floor_type[i] >= VI_FLOORB) {
+				clear();
+				return (-1);
+			}
+
+			floor_param[i] = FuncFloor.floor_P[floor_type[i]].unpack(this, opb);
+			if (floor_param[i] == null) {
+				clear();
+				return (-1);
+			}
+		}
+
+		// residue backend settings
+		residues = opb.read(6) + 1;
+
+		if (residue_type == null || residue_type.length != residues)
+			residue_type = new int[residues];
+
+		if (residue_param == null || residue_param.length != residues)
+			residue_param = new Object[residues];
+
+		for (int i = 0; i < residues; i++) {
+			residue_type[i] = opb.read(16);
+			if (residue_type[i] < 0 || residue_type[i] >= VI_RESB) {
+				clear();
+				return (-1);
+			}
+			residue_param[i] = FuncResidue.residue_P[residue_type[i]].unpack(this, opb);
+			if (residue_param[i] == null) {
+				clear();
+				return (-1);
+			}
+		}
+
+		// map backend settings
+		maps = opb.read(6) + 1;
+		if (map_type == null || map_type.length != maps)
+			map_type = new int[maps];
+		if (map_param == null || map_param.length != maps)
+			map_param = new Object[maps];
+		for (int i = 0; i < maps; i++) {
+			map_type[i] = opb.read(16);
+			if (map_type[i] < 0 || map_type[i] >= VI_MAPB) {
+				clear();
+				return (-1);
+			}
+			map_param[i] = FuncMapping.mapping_P[map_type[i]].unpack(this, opb);
+			if (map_param[i] == null) {
+				clear();
+				return (-1);
+			}
+		}
+
+		// mode settings
+		modes = opb.read(6) + 1;
+		if (mode_param == null || mode_param.length != modes)
+			mode_param = new InfoMode[modes];
+		for (int i = 0; i < modes; i++) {
+			mode_param[i] = new InfoMode();
+			mode_param[i].blockflag = opb.read(1);
+			mode_param[i].windowtype = opb.read(16);
+			mode_param[i].transformtype = opb.read(16);
+			mode_param[i].mapping = opb.read(8);
+
+			if ((mode_param[i].windowtype >= VI_WINDOWB) || (mode_param[i].transformtype >= VI_WINDOWB)
+					|| (mode_param[i].mapping >= maps)) {
+				clear();
+				return (-1);
+			}
+		}
+
+		if (opb.read(1) != 1) {
+			clear();
+			return (-1);
+		}
+
+		return (0);
+	}
+
+	// The Vorbis header is in three packets; the initial small packet in
+	// the first page that identifies basic parameters, a second packet
+	// with bitstream comments and a third packet that holds the
+	// codebook.
+
+	public int synthesis_headerin(Comment vc, Packet op) {
+		Buffer opb = new Buffer();
+
+		if (op != null) {
+			opb.readinit(op.packet_base, op.packet, op.bytes);
+
+			// Which of the three types of header is this?
+			// Also verify header-ness, vorbis
+			{
+				byte[] buffer = new byte[6];
+				int packtype = opb.read(8);
+				opb.read(buffer, 6);
+				if (buffer[0] != 'v' || buffer[1] != 'o' || buffer[2] != 'r' || buffer[3] != 'b' || buffer[4] != 'i'
+						|| buffer[5] != 's') {
+					// not a vorbis header
+					return (-1);
+				}
+				switch (packtype) {
+				case 0x01: // least significant *bit* is read first
+					if (op.b_o_s == 0) {
+						// Not the initial packet
+						return (-1);
+					}
+					if (rate != 0) {
+						// previously initialized info header
+						return (-1);
+					}
+					return (unpack_info(opb));
+				case 0x03: // least significant *bit* is read first
+					if (rate == 0) {
+						// um... we didn't get the initial header
+						return (-1);
+					}
+					return (vc.unpack(opb));
+				case 0x05: // least significant *bit* is read first
+					if (rate == 0 || vc.vendor == null) {
+						// um... we didn;t get the initial header or comments yet
+						return (-1);
+					}
+					return (unpack_books(opb));
+				default:
+					// Not a valid vorbis header type
+					// return(-1);
+					break;
+				}
+			}
+		}
+		return (-1);
+	}
+
+	// pack side
+	int pack_info(Buffer opb) {
+		// preamble
+		opb.write(0x01, 8);
+		opb.write(_vorbis);
+
+		// basic information about the stream
+		opb.write(0x00, 32);
+		opb.write(channels, 8);
+		opb.write(rate, 32);
+
+		opb.write(bitrate_upper, 32);
+		opb.write(bitrate_nominal, 32);
+		opb.write(bitrate_lower, 32);
+
+		opb.write(Util.ilog2(blocksizes[0]), 4);
+		opb.write(Util.ilog2(blocksizes[1]), 4);
+		opb.write(1, 1);
+		return (0);
+	}
+
+	int pack_books(Buffer opb) {
+		opb.write(0x05, 8);
+		opb.write(_vorbis);
+
+		// books
+		opb.write(books - 1, 8);
+		for (int i = 0; i < books; i++) {
+			if (book_param[i].pack(opb) != 0) {
+				// goto err_out;
+				return (-1);
+			}
+		}
+
+		// times
+		opb.write(times - 1, 6);
+		for (int i = 0; i < times; i++) {
+			opb.write(time_type[i], 16);
+			FuncTime.time_P[time_type[i]].pack(this.time_param[i], opb);
+		}
+
+		// floors
+		opb.write(floors - 1, 6);
+		for (int i = 0; i < floors; i++) {
+			opb.write(floor_type[i], 16);
+			FuncFloor.floor_P[floor_type[i]].pack(floor_param[i], opb);
+		}
+
+		// residues
+		opb.write(residues - 1, 6);
+		for (int i = 0; i < residues; i++) {
+			opb.write(residue_type[i], 16);
+			FuncResidue.residue_P[residue_type[i]].pack(residue_param[i], opb);
+		}
+
+		// maps
+		opb.write(maps - 1, 6);
+		for (int i = 0; i < maps; i++) {
+			opb.write(map_type[i], 16);
+			FuncMapping.mapping_P[map_type[i]].pack(this, map_param[i], opb);
+		}
+
+		// modes
+		opb.write(modes - 1, 6);
+		for (int i = 0; i < modes; i++) {
+			opb.write(mode_param[i].blockflag, 1);
+			opb.write(mode_param[i].windowtype, 16);
+			opb.write(mode_param[i].transformtype, 16);
+			opb.write(mode_param[i].mapping, 8);
+		}
+		opb.write(1, 1);
+		return (0);
+	}
+
+	public int blocksize(Packet op) {
+		// codec_setup_info
+		Buffer opb = new Buffer();
+
+		int mode;
+
+		opb.readinit(op.packet_base, op.packet, op.bytes);
+
+		/* Check the packet type */
+		if (opb.read(1) != 0) {
+			/* Oops. This is not an audio data packet */
+			return (OV_ENOTAUDIO);
+		}
+		{
+			int modebits = 0;
+			int v = modes;
+			while (v > 1) {
+				modebits++;
+				v >>>= 1;
+			}
+
+			/* read our mode and pre/post windowsize */
+			mode = opb.read(modebits);
+		}
+		if (mode == -1)
+			return (OV_EBADPACKET);
+		return (blocksizes[mode_param[mode].blockflag]);
+	}
+
+	public String toString() {
+		return "version:" + version + ", channels:" + channels + ", rate:" + rate
+				+ ", bitrate:" + bitrate_upper + "," + bitrate_nominal + ","
+				+ bitrate_lower;
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/InfoMode.java b/src/teavm/java/com/jcraft/jorbis/InfoMode.java
new file mode 100755
index 0000000..e7f203c
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/InfoMode.java
@@ -0,0 +1,34 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+class InfoMode {
+	int blockflag;
+	int windowtype;
+	int transformtype;
+	int mapping;
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/JOrbisException.java b/src/teavm/java/com/jcraft/jorbis/JOrbisException.java
new file mode 100755
index 0000000..7862e98
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/JOrbisException.java
@@ -0,0 +1,40 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+public class JOrbisException extends Exception {
+
+	private static final long serialVersionUID = 1L;
+
+	public JOrbisException() {
+		super();
+	}
+
+	public JOrbisException(String s) {
+		super("JOrbis: " + s);
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Lookup.java b/src/teavm/java/com/jcraft/jorbis/Lookup.java
new file mode 100755
index 0000000..5accc93
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Lookup.java
@@ -0,0 +1,122 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+class Lookup {
+	static final int COS_LOOKUP_SZ = 128;
+	static final float[] COS_LOOKUP = { +1.0000000000000f, +0.9996988186962f, +0.9987954562052f, +0.9972904566787f,
+			+0.9951847266722f, +0.9924795345987f, +0.9891765099648f, +0.9852776423889f, +0.9807852804032f,
+			+0.9757021300385f, +0.9700312531945f, +0.9637760657954f, +0.9569403357322f, +0.9495281805930f,
+			+0.9415440651830f, +0.9329927988347f, +0.9238795325113f, +0.9142097557035f, +0.9039892931234f,
+			+0.8932243011955f, +0.8819212643484f, +0.8700869911087f, +0.8577286100003f, +0.8448535652497f,
+			+0.8314696123025f, +0.8175848131516f, +0.8032075314806f, +0.7883464276266f, +0.7730104533627f,
+			+0.7572088465065f, +0.7409511253550f, +0.7242470829515f, +0.7071067811865f, +0.6895405447371f,
+			+0.6715589548470f, +0.6531728429538f, +0.6343932841636f, +0.6152315905806f, +0.5956993044924f,
+			+0.5758081914178f, +0.5555702330196f, +0.5349976198871f, +0.5141027441932f, +0.4928981922298f,
+			+0.4713967368260f, +0.4496113296546f, +0.4275550934303f, +0.4052413140050f, +0.3826834323651f,
+			+0.3598950365350f, +0.3368898533922f, +0.3136817403989f, +0.2902846772545f, +0.2667127574749f,
+			+0.2429801799033f, +0.2191012401569f, +0.1950903220161f, +0.1709618887603f, +0.1467304744554f,
+			+0.1224106751992f, +0.0980171403296f, +0.0735645635997f, +0.0490676743274f, +0.0245412285229f,
+			+0.0000000000000f, -0.0245412285229f, -0.0490676743274f, -0.0735645635997f, -0.0980171403296f,
+			-0.1224106751992f, -0.1467304744554f, -0.1709618887603f, -0.1950903220161f, -0.2191012401569f,
+			-0.2429801799033f, -0.2667127574749f, -0.2902846772545f, -0.3136817403989f, -0.3368898533922f,
+			-0.3598950365350f, -0.3826834323651f, -0.4052413140050f, -0.4275550934303f, -0.4496113296546f,
+			-0.4713967368260f, -0.4928981922298f, -0.5141027441932f, -0.5349976198871f, -0.5555702330196f,
+			-0.5758081914178f, -0.5956993044924f, -0.6152315905806f, -0.6343932841636f, -0.6531728429538f,
+			-0.6715589548470f, -0.6895405447371f, -0.7071067811865f, -0.7242470829515f, -0.7409511253550f,
+			-0.7572088465065f, -0.7730104533627f, -0.7883464276266f, -0.8032075314806f, -0.8175848131516f,
+			-0.8314696123025f, -0.8448535652497f, -0.8577286100003f, -0.8700869911087f, -0.8819212643484f,
+			-0.8932243011955f, -0.9039892931234f, -0.9142097557035f, -0.9238795325113f, -0.9329927988347f,
+			-0.9415440651830f, -0.9495281805930f, -0.9569403357322f, -0.9637760657954f, -0.9700312531945f,
+			-0.9757021300385f, -0.9807852804032f, -0.9852776423889f, -0.9891765099648f, -0.9924795345987f,
+			-0.9951847266722f, -0.9972904566787f, -0.9987954562052f, -0.9996988186962f, -1.0000000000000f, };
+
+	/* interpolated lookup based cos function, domain 0 to PI only */
+	static float coslook(float a) {
+		double d = a * (.31830989 * (float) COS_LOOKUP_SZ);
+		int i = (int) d;
+		return COS_LOOKUP[i] + ((float) (d - i)) * (COS_LOOKUP[i + 1] - COS_LOOKUP[i]);
+	}
+
+	static final int INVSQ_LOOKUP_SZ = 32;
+	static final float[] INVSQ_LOOKUP = { 1.414213562373f, 1.392621247646f, 1.371988681140f, 1.352246807566f,
+			1.333333333333f, 1.315191898443f, 1.297771369046f, 1.281025230441f, 1.264911064067f, 1.249390095109f,
+			1.234426799697f, 1.219988562661f, 1.206045378311f, 1.192569588000f, 1.179535649239f, 1.166919931983f,
+			1.154700538379f, 1.142857142857f, 1.131370849898f, 1.120224067222f, 1.109400392450f, 1.098884511590f,
+			1.088662107904f, 1.078719779941f, 1.069044967650f, 1.059625885652f, 1.050451462878f, 1.041511287847f,
+			1.032795558989f, 1.024295039463f, 1.016001016002f, 1.007905261358f, 1.000000000000f, };
+
+	/* interpolated 1./sqrt(p) where .5 <= p < 1. */
+	static float invsqlook(float a) {
+		double d = a * (2.f * (float) INVSQ_LOOKUP_SZ) - (float) INVSQ_LOOKUP_SZ;
+		int i = (int) d;
+		return INVSQ_LOOKUP[i] + ((float) (d - i)) * (INVSQ_LOOKUP[i + 1] - INVSQ_LOOKUP[i]);
+	}
+
+	static final int INVSQ2EXP_LOOKUP_MIN = -32;
+	static final int INVSQ2EXP_LOOKUP_MAX = 32;
+	static final float[] INVSQ2EXP_LOOKUP = { 65536.f, 46340.95001f, 32768.f, 23170.47501f, 16384.f, 11585.2375f,
+			8192.f, 5792.618751f, 4096.f, 2896.309376f, 2048.f, 1448.154688f, 1024.f, 724.0773439f, 512.f, 362.038672f,
+			256.f, 181.019336f, 128.f, 90.50966799f, 64.f, 45.254834f, 32.f, 22.627417f, 16.f, 11.3137085f, 8.f,
+			5.656854249f, 4.f, 2.828427125f, 2.f, 1.414213562f, 1.f, 0.7071067812f, 0.5f, 0.3535533906f, 0.25f,
+			0.1767766953f, 0.125f, 0.08838834765f, 0.0625f, 0.04419417382f, 0.03125f, 0.02209708691f, 0.015625f,
+			0.01104854346f, 0.0078125f, 0.005524271728f, 0.00390625f, 0.002762135864f, 0.001953125f, 0.001381067932f,
+			0.0009765625f, 0.000690533966f, 0.00048828125f, 0.000345266983f, 0.000244140625f, 0.0001726334915f,
+			0.0001220703125f, 8.631674575e-05f, 6.103515625e-05f, 4.315837288e-05f, 3.051757812e-05f, 2.157918644e-05f,
+			1.525878906e-05f, };
+
+	/* interpolated 1./sqrt(p) where .5 <= p < 1. */
+	static float invsq2explook(int a) {
+		return INVSQ2EXP_LOOKUP[a - INVSQ2EXP_LOOKUP_MIN];
+	}
+
+	static final int FROMdB_LOOKUP_SZ = 35;
+	static final int FROMdB2_LOOKUP_SZ = 32;
+	static final int FROMdB_SHIFT = 5;
+	static final int FROMdB2_SHIFT = 3;
+	static final int FROMdB2_MASK = 31;
+	static final float[] FROMdB_LOOKUP = { 1.f, 0.6309573445f, 0.3981071706f, 0.2511886432f, 0.1584893192f, 0.1f,
+			0.06309573445f, 0.03981071706f, 0.02511886432f, 0.01584893192f, 0.01f, 0.006309573445f, 0.003981071706f,
+			0.002511886432f, 0.001584893192f, 0.001f, 0.0006309573445f, 0.0003981071706f, 0.0002511886432f,
+			0.0001584893192f, 0.0001f, 6.309573445e-05f, 3.981071706e-05f, 2.511886432e-05f, 1.584893192e-05f, 1e-05f,
+			6.309573445e-06f, 3.981071706e-06f, 2.511886432e-06f, 1.584893192e-06f, 1e-06f, 6.309573445e-07f,
+			3.981071706e-07f, 2.511886432e-07f, 1.584893192e-07f, };
+	static final float[] FROMdB2_LOOKUP = { 0.9928302478f, 0.9786445908f, 0.9646616199f, 0.9508784391f, 0.9372921937f,
+			0.92390007f, 0.9106992942f, 0.8976871324f, 0.8848608897f, 0.8722179097f, 0.8597555737f, 0.8474713009f,
+			0.835362547f, 0.8234268041f, 0.8116616003f, 0.8000644989f, 0.7886330981f, 0.7773650302f, 0.7662579617f,
+			0.755309592f, 0.7445176537f, 0.7338799116f, 0.7233941627f, 0.7130582353f, 0.7028699885f, 0.6928273125f,
+			0.6829281272f, 0.6731703824f, 0.6635520573f, 0.6540711597f, 0.6447257262f, 0.6355138211f, };
+
+	/* interpolated lookup based fromdB function, domain -140dB to 0dB only */
+	static float fromdBlook(float a) {
+		int i = (int) (a * ((float) (-(1 << FROMdB2_SHIFT))));
+		return (i < 0) ? 1.f
+				: ((i >= (FROMdB_LOOKUP_SZ << FROMdB_SHIFT)) ? 0.f
+						: FROMdB_LOOKUP[i >>> FROMdB_SHIFT] * FROMdB2_LOOKUP[i & FROMdB2_MASK]);
+	}
+
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Lpc.java b/src/teavm/java/com/jcraft/jorbis/Lpc.java
new file mode 100755
index 0000000..4160c50
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Lpc.java
@@ -0,0 +1,185 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+class Lpc {
+	// en/decode lookups
+	Drft fft = new Drft();;
+
+	int ln;
+	int m;
+
+	// Autocorrelation LPC coeff generation algorithm invented by
+	// N. Levinson in 1947, modified by J. Durbin in 1959.
+
+	// Input : n elements of time doamin data
+	// Output: m lpc coefficients, excitation energy
+
+	static float lpc_from_data(float[] data, float[] lpc, int n, int m) {
+		float[] aut = new float[m + 1];
+		float error;
+		int i, j;
+
+		// autocorrelation, p+1 lag coefficients
+
+		j = m + 1;
+		while (j-- != 0) {
+			float d = 0;
+			for (i = j; i < n; i++)
+				d += data[i] * data[i - j];
+			aut[j] = d;
+		}
+
+		// Generate lpc coefficients from autocorr values
+
+		error = aut[0];
+		/*
+		 * if(error==0){ for(int k=0; k<m; k++) lpc[k]=0.0f; return 0; }
+		 */
+
+		for (i = 0; i < m; i++) {
+			float r = -aut[i + 1];
+
+			if (error == 0) {
+				for (int k = 0; k < m; k++)
+					lpc[k] = 0.0f;
+				return 0;
+			}
+
+			// Sum up this iteration's reflection coefficient; note that in
+			// Vorbis we don't save it. If anyone wants to recycle this code
+			// and needs reflection coefficients, save the results of 'r' from
+			// each iteration.
+
+			for (j = 0; j < i; j++)
+				r -= lpc[j] * aut[i - j];
+			r /= error;
+
+			// Update LPC coefficients and total error
+
+			lpc[i] = r;
+			for (j = 0; j < i / 2; j++) {
+				float tmp = lpc[j];
+				lpc[j] += r * lpc[i - 1 - j];
+				lpc[i - 1 - j] += r * tmp;
+			}
+			if (i % 2 != 0)
+				lpc[j] += lpc[j] * r;
+
+			error *= 1.0 - r * r;
+		}
+
+		// we need the error value to know how big an impulse to hit the
+		// filter with later
+
+		return error;
+	}
+
+	// Input : n element envelope spectral curve
+	// Output: m lpc coefficients, excitation energy
+
+	float lpc_from_curve(float[] curve, float[] lpc) {
+		int n = ln;
+		float[] work = new float[n + n];
+		float fscale = (float) (.5 / n);
+		int i, j;
+
+		// input is a real curve. make it complex-real
+		// This mixes phase, but the LPC generation doesn't care.
+		for (i = 0; i < n; i++) {
+			work[i * 2] = curve[i] * fscale;
+			work[i * 2 + 1] = 0;
+		}
+		work[n * 2 - 1] = curve[n - 1] * fscale;
+
+		n *= 2;
+		fft.backward(work);
+
+		// The autocorrelation will not be circular. Shift, else we lose
+		// most of the power in the edges.
+
+		for (i = 0, j = n / 2; i < n / 2;) {
+			float temp = work[i];
+			work[i++] = work[j];
+			work[j++] = temp;
+		}
+
+		return (lpc_from_data(work, lpc, n, m));
+	}
+
+	void init(int mapped, int m) {
+		ln = mapped;
+		this.m = m;
+
+		// we cheat decoding the LPC spectrum via FFTs
+		fft.init(mapped * 2);
+	}
+
+	void clear() {
+		fft.clear();
+	}
+
+	static float FAST_HYPOT(float a, float b) {
+		return (float) Math.sqrt((a) * (a) + (b) * (b));
+	}
+
+	// One can do this the long way by generating the transfer function in
+	// the time domain and taking the forward FFT of the result. The
+	// results from direct calculation are cleaner and faster.
+	//
+	// This version does a linear curve generation and then later
+	// interpolates the log curve from the linear curve.
+
+	void lpc_to_curve(float[] curve, float[] lpc, float amp) {
+
+		for (int i = 0; i < ln * 2; i++)
+			curve[i] = 0.0f;
+
+		if (amp == 0)
+			return;
+
+		for (int i = 0; i < m; i++) {
+			curve[i * 2 + 1] = lpc[i] / (4 * amp);
+			curve[i * 2 + 2] = -lpc[i] / (4 * amp);
+		}
+
+		fft.backward(curve);
+
+		{
+			int l2 = ln * 2;
+			float unit = (float) (1. / amp);
+			curve[0] = (float) (1. / (curve[0] * 2 + unit));
+			for (int i = 1; i < ln; i++) {
+				float real = (curve[i] + curve[l2 - i]);
+				float imag = (curve[i] - curve[l2 - i]);
+
+				float a = real + unit;
+				curve[i] = (float) (1.0 / FAST_HYPOT(a, imag));
+			}
+		}
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Lsp.java b/src/teavm/java/com/jcraft/jorbis/Lsp.java
new file mode 100755
index 0000000..7107234
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Lsp.java
@@ -0,0 +1,102 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+/*
+  function: LSP (also called LSF) conversion routines
+
+  The LSP generation code is taken (with minimal modification) from
+  "On the Computation of the LSP Frequencies" by Joseph Rothweiler
+  <rothwlr@altavista.net>, available at:
+  
+  http://www2.xtdl.com/~rothwlr/lsfpaper/lsfpage.html 
+ ********************************************************************/
+
+class Lsp {
+
+	static final float M_PI = (float) (3.1415926539);
+
+	static void lsp_to_curve(float[] curve, int[] map, int n, int ln, float[] lsp, int m, float amp, float ampoffset) {
+		int i;
+		float wdel = M_PI / ln;
+		for (i = 0; i < m; i++)
+			lsp[i] = Lookup.coslook(lsp[i]);
+		int m2 = (m / 2) * 2;
+
+		i = 0;
+		while (i < n) {
+			int k = map[i];
+			float p = .7071067812f;
+			float q = .7071067812f;
+			float w = Lookup.coslook(wdel * k);
+
+			for (int j = 0; j < m2; j += 2) {
+				q *= lsp[j] - w;
+				p *= lsp[j + 1] - w;
+			}
+
+			if ((m & 1) != 0) {
+				/* odd order filter; slightly assymetric */
+				/* the last coefficient */
+				q *= lsp[m - 1] - w;
+				q *= q;
+				p *= p * (1.f - w * w);
+			} else {
+				/* even order filter; still symmetric */
+				q *= q * (1.f + w);
+				p *= p * (1.f - w);
+			}
+
+			// q=frexp(p+q,&qexp);
+			q = p + q;
+			int hx = Float.floatToIntBits(q);
+			int ix = 0x7fffffff & hx;
+			int qexp = 0;
+
+			if (ix >= 0x7f800000 || (ix == 0)) {
+				// 0,inf,nan
+			} else {
+				if (ix < 0x00800000) { // subnormal
+					q *= 3.3554432000e+07; // 0x4c000000
+					hx = Float.floatToIntBits(q);
+					ix = 0x7fffffff & hx;
+					qexp = -25;
+				}
+				qexp += ((ix >>> 23) - 126);
+				hx = (hx & 0x807fffff) | 0x3f000000;
+				q = Float.intBitsToFloat(hx);
+			}
+
+			q = Lookup.fromdBlook(amp * Lookup.invsqlook(q) * Lookup.invsq2explook(qexp + m) - ampoffset);
+
+			do {
+				curve[i++] *= q;
+			} while (i < n && map[i] == k);
+
+		}
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Mapping0.java b/src/teavm/java/com/jcraft/jorbis/Mapping0.java
new file mode 100755
index 0000000..005562c
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Mapping0.java
@@ -0,0 +1,361 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+class Mapping0 extends FuncMapping {
+	static int seq = 0;
+
+	void free_info(Object imap) {
+	};
+
+	void free_look(Object imap) {
+	}
+
+	Object look(DspState vd, InfoMode vm, Object m) {
+		// System.err.println("Mapping0.look");
+		Info vi = vd.vi;
+		LookMapping0 look = new LookMapping0();
+		InfoMapping0 info = look.map = (InfoMapping0) m;
+		look.mode = vm;
+
+		look.time_look = new Object[info.submaps];
+		look.floor_look = new Object[info.submaps];
+		look.residue_look = new Object[info.submaps];
+
+		look.time_func = new FuncTime[info.submaps];
+		look.floor_func = new FuncFloor[info.submaps];
+		look.residue_func = new FuncResidue[info.submaps];
+
+		for (int i = 0; i < info.submaps; i++) {
+			int timenum = info.timesubmap[i];
+			int floornum = info.floorsubmap[i];
+			int resnum = info.residuesubmap[i];
+
+			look.time_func[i] = FuncTime.time_P[vi.time_type[timenum]];
+			look.time_look[i] = look.time_func[i].look(vd, vm, vi.time_param[timenum]);
+			look.floor_func[i] = FuncFloor.floor_P[vi.floor_type[floornum]];
+			look.floor_look[i] = look.floor_func[i].look(vd, vm, vi.floor_param[floornum]);
+			look.residue_func[i] = FuncResidue.residue_P[vi.residue_type[resnum]];
+			look.residue_look[i] = look.residue_func[i].look(vd, vm, vi.residue_param[resnum]);
+
+		}
+
+		if (vi.psys != 0 && vd.analysisp != 0) {
+			// ??
+		}
+
+		look.ch = vi.channels;
+
+		return (look);
+	}
+
+	void pack(Info vi, Object imap, Buffer opb) {
+		InfoMapping0 info = (InfoMapping0) imap;
+
+		/*
+		 * another 'we meant to do it this way' hack... up to beta 4, we packed 4 binary
+		 * zeros here to signify one submapping in use. We now redefine that to mean
+		 * four bitflags that indicate use of deeper features; bit0:submappings,
+		 * bit1:coupling, bit2,3:reserved. This is backward compatable with all actual
+		 * uses of the beta code.
+		 */
+
+		if (info.submaps > 1) {
+			opb.write(1, 1);
+			opb.write(info.submaps - 1, 4);
+		} else {
+			opb.write(0, 1);
+		}
+
+		if (info.coupling_steps > 0) {
+			opb.write(1, 1);
+			opb.write(info.coupling_steps - 1, 8);
+			for (int i = 0; i < info.coupling_steps; i++) {
+				opb.write(info.coupling_mag[i], Util.ilog2(vi.channels));
+				opb.write(info.coupling_ang[i], Util.ilog2(vi.channels));
+			}
+		} else {
+			opb.write(0, 1);
+		}
+
+		opb.write(0, 2); /* 2,3:reserved */
+
+		/* we don't write the channel submappings if we only have one... */
+		if (info.submaps > 1) {
+			for (int i = 0; i < vi.channels; i++)
+				opb.write(info.chmuxlist[i], 4);
+		}
+		for (int i = 0; i < info.submaps; i++) {
+			opb.write(info.timesubmap[i], 8);
+			opb.write(info.floorsubmap[i], 8);
+			opb.write(info.residuesubmap[i], 8);
+		}
+	}
+
+	// also responsible for range checking
+	Object unpack(Info vi, Buffer opb) {
+		InfoMapping0 info = new InfoMapping0();
+
+		if (opb.read(1) != 0) {
+			info.submaps = opb.read(4) + 1;
+		} else {
+			info.submaps = 1;
+		}
+
+		if (opb.read(1) != 0) {
+			info.coupling_steps = opb.read(8) + 1;
+
+			for (int i = 0; i < info.coupling_steps; i++) {
+				int testM = info.coupling_mag[i] = opb.read(Util.ilog2(vi.channels));
+				int testA = info.coupling_ang[i] = opb.read(Util.ilog2(vi.channels));
+
+				if (testM < 0 || testA < 0 || testM == testA || testM >= vi.channels || testA >= vi.channels) {
+					// goto err_out;
+					info.free();
+					return (null);
+				}
+			}
+		}
+
+		if (opb.read(2) > 0) { /* 2,3:reserved */
+			info.free();
+			return (null);
+		}
+
+		if (info.submaps > 1) {
+			for (int i = 0; i < vi.channels; i++) {
+				info.chmuxlist[i] = opb.read(4);
+				if (info.chmuxlist[i] >= info.submaps) {
+					info.free();
+					return (null);
+				}
+			}
+		}
+
+		for (int i = 0; i < info.submaps; i++) {
+			info.timesubmap[i] = opb.read(8);
+			if (info.timesubmap[i] >= vi.times) {
+				info.free();
+				return (null);
+			}
+			info.floorsubmap[i] = opb.read(8);
+			if (info.floorsubmap[i] >= vi.floors) {
+				info.free();
+				return (null);
+			}
+			info.residuesubmap[i] = opb.read(8);
+			if (info.residuesubmap[i] >= vi.residues) {
+				info.free();
+				return (null);
+			}
+		}
+		return info;
+	}
+
+	float[][] pcmbundle = null;
+	int[] zerobundle = null;
+	int[] nonzero = null;
+	Object[] floormemo = null;
+
+	synchronized int inverse(Block vb, Object l) {
+		DspState vd = vb.vd;
+		Info vi = vd.vi;
+		LookMapping0 look = (LookMapping0) l;
+		InfoMapping0 info = look.map;
+		InfoMode mode = look.mode;
+		int n = vb.pcmend = vi.blocksizes[vb.W];
+
+		float[] window = vd.window[vb.W][vb.lW][vb.nW][mode.windowtype];
+		if (pcmbundle == null || pcmbundle.length < vi.channels) {
+			pcmbundle = new float[vi.channels][];
+			nonzero = new int[vi.channels];
+			zerobundle = new int[vi.channels];
+			floormemo = new Object[vi.channels];
+		}
+
+		// time domain information decode (note that applying the
+		// information would have to happen later; we'll probably add a
+		// function entry to the harness for that later
+		// NOT IMPLEMENTED
+
+		// recover the spectral envelope; store it in the PCM vector for now
+		for (int i = 0; i < vi.channels; i++) {
+			float[] pcm = vb.pcm[i];
+			int submap = info.chmuxlist[i];
+
+			floormemo[i] = look.floor_func[submap].inverse1(vb, look.floor_look[submap], floormemo[i]);
+			if (floormemo[i] != null) {
+				nonzero[i] = 1;
+			} else {
+				nonzero[i] = 0;
+			}
+			for (int j = 0; j < n / 2; j++) {
+				pcm[j] = 0;
+			}
+
+		}
+
+		for (int i = 0; i < info.coupling_steps; i++) {
+			if (nonzero[info.coupling_mag[i]] != 0 || nonzero[info.coupling_ang[i]] != 0) {
+				nonzero[info.coupling_mag[i]] = 1;
+				nonzero[info.coupling_ang[i]] = 1;
+			}
+		}
+
+		// recover the residue, apply directly to the spectral envelope
+
+		for (int i = 0; i < info.submaps; i++) {
+			int ch_in_bundle = 0;
+			for (int j = 0; j < vi.channels; j++) {
+				if (info.chmuxlist[j] == i) {
+					if (nonzero[j] != 0) {
+						zerobundle[ch_in_bundle] = 1;
+					} else {
+						zerobundle[ch_in_bundle] = 0;
+					}
+					pcmbundle[ch_in_bundle++] = vb.pcm[j];
+				}
+			}
+
+			look.residue_func[i].inverse(vb, look.residue_look[i], pcmbundle, zerobundle, ch_in_bundle);
+		}
+
+		for (int i = info.coupling_steps - 1; i >= 0; i--) {
+			float[] pcmM = vb.pcm[info.coupling_mag[i]];
+			float[] pcmA = vb.pcm[info.coupling_ang[i]];
+
+			for (int j = 0; j < n / 2; j++) {
+				float mag = pcmM[j];
+				float ang = pcmA[j];
+
+				if (mag > 0) {
+					if (ang > 0) {
+						pcmM[j] = mag;
+						pcmA[j] = mag - ang;
+					} else {
+						pcmA[j] = mag;
+						pcmM[j] = mag + ang;
+					}
+				} else {
+					if (ang > 0) {
+						pcmM[j] = mag;
+						pcmA[j] = mag + ang;
+					} else {
+						pcmA[j] = mag;
+						pcmM[j] = mag - ang;
+					}
+				}
+			}
+		}
+
+		// /* compute and apply spectral envelope */
+
+		for (int i = 0; i < vi.channels; i++) {
+			float[] pcm = vb.pcm[i];
+			int submap = info.chmuxlist[i];
+			look.floor_func[submap].inverse2(vb, look.floor_look[submap], floormemo[i], pcm);
+		}
+
+		// transform the PCM data; takes PCM vector, vb; modifies PCM vector
+		// only MDCT right now....
+
+		for (int i = 0; i < vi.channels; i++) {
+			float[] pcm = vb.pcm[i];
+			// _analysis_output("out",seq+i,pcm,n/2,0,0);
+			((Mdct) vd.transform[vb.W][0]).backward(pcm, pcm);
+		}
+
+		// now apply the decoded pre-window time information
+		// NOT IMPLEMENTED
+
+		// window the data
+		for (int i = 0; i < vi.channels; i++) {
+			float[] pcm = vb.pcm[i];
+			if (nonzero[i] != 0) {
+				for (int j = 0; j < n; j++) {
+					pcm[j] *= window[j];
+				}
+			} else {
+				for (int j = 0; j < n; j++) {
+					pcm[j] = 0.f;
+				}
+			}
+		}
+
+		// now apply the decoded post-window time information
+		// NOT IMPLEMENTED
+		// all done!
+		return (0);
+	}
+
+	class InfoMapping0 {
+		int submaps; // <= 16
+		int[] chmuxlist = new int[256]; // up to 256 channels in a Vorbis stream
+
+		int[] timesubmap = new int[16]; // [mux]
+		int[] floorsubmap = new int[16]; // [mux] submap to floors
+		int[] residuesubmap = new int[16];// [mux] submap to residue
+		int[] psysubmap = new int[16]; // [mux]; encode only
+
+		int coupling_steps;
+		int[] coupling_mag = new int[256];
+		int[] coupling_ang = new int[256];
+
+		void free() {
+			chmuxlist = null;
+			timesubmap = null;
+			floorsubmap = null;
+			residuesubmap = null;
+			psysubmap = null;
+
+			coupling_mag = null;
+			coupling_ang = null;
+		}
+	}
+
+	class LookMapping0 {
+		InfoMode mode;
+		InfoMapping0 map;
+		Object[] time_look;
+		Object[] floor_look;
+		Object[] floor_state;
+		Object[] residue_look;
+		PsyLook[] psy_look;
+
+		FuncTime[] time_func;
+		FuncFloor[] floor_func;
+		FuncResidue[] residue_func;
+
+		int ch;
+		float[][] decay;
+		int lastframe; // if a different mode is called, we need to
+		// invalidate decay and floor state
+	}
+
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Mdct.java b/src/teavm/java/com/jcraft/jorbis/Mdct.java
new file mode 100755
index 0000000..c2b29fb
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Mdct.java
@@ -0,0 +1,249 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+class Mdct {
+
+	int n;
+	int log2n;
+
+	float[] trig;
+	int[] bitrev;
+
+	float scale;
+
+	void init(int n) {
+		bitrev = new int[n / 4];
+		trig = new float[n + n / 4];
+
+		log2n = (int) Math.rint(Math.log(n) / Math.log(2));
+		this.n = n;
+
+		int AE = 0;
+		int AO = 1;
+		int BE = AE + n / 2;
+		int BO = BE + 1;
+		int CE = BE + n / 2;
+		int CO = CE + 1;
+		// trig lookups...
+		for (int i = 0; i < n / 4; i++) {
+			trig[AE + i * 2] = (float) Math.cos((Math.PI / n) * (4 * i));
+			trig[AO + i * 2] = (float) -Math.sin((Math.PI / n) * (4 * i));
+			trig[BE + i * 2] = (float) Math.cos((Math.PI / (2 * n)) * (2 * i + 1));
+			trig[BO + i * 2] = (float) Math.sin((Math.PI / (2 * n)) * (2 * i + 1));
+		}
+		for (int i = 0; i < n / 8; i++) {
+			trig[CE + i * 2] = (float) Math.cos((Math.PI / n) * (4 * i + 2));
+			trig[CO + i * 2] = (float) -Math.sin((Math.PI / n) * (4 * i + 2));
+		}
+
+		{
+			int mask = (1 << (log2n - 1)) - 1;
+			int msb = 1 << (log2n - 2);
+			for (int i = 0; i < n / 8; i++) {
+				int acc = 0;
+				for (int j = 0; msb >>> j != 0; j++)
+					if (((msb >>> j) & i) != 0)
+						acc |= 1 << j;
+				bitrev[i * 2] = ((~acc) & mask);
+				// bitrev[i*2]=((~acc)&mask)-1;
+				bitrev[i * 2 + 1] = acc;
+			}
+		}
+		scale = 4.f / n;
+	}
+
+	void clear() {
+	}
+
+	void forward(float[] in, float[] out) {
+	}
+
+	float[] _x = new float[1024];
+	float[] _w = new float[1024];
+
+	synchronized void backward(float[] in, float[] out) {
+		if (_x.length < n / 2) {
+			_x = new float[n / 2];
+		}
+		if (_w.length < n / 2) {
+			_w = new float[n / 2];
+		}
+		float[] x = _x;
+		float[] w = _w;
+		int n2 = n >>> 1;
+		int n4 = n >>> 2;
+		int n8 = n >>> 3;
+
+		// rotate + step 1
+		{
+			int inO = 1;
+			int xO = 0;
+			int A = n2;
+
+			int i;
+			for (i = 0; i < n8; i++) {
+				A -= 2;
+				x[xO++] = -in[inO + 2] * trig[A + 1] - in[inO] * trig[A];
+				x[xO++] = in[inO] * trig[A + 1] - in[inO + 2] * trig[A];
+				inO += 4;
+			}
+
+			inO = n2 - 4;
+
+			for (i = 0; i < n8; i++) {
+				A -= 2;
+				x[xO++] = in[inO] * trig[A + 1] + in[inO + 2] * trig[A];
+				x[xO++] = in[inO] * trig[A] - in[inO + 2] * trig[A + 1];
+				inO -= 4;
+			}
+		}
+
+		float[] xxx = mdct_kernel(x, w, n, n2, n4, n8);
+		int xx = 0;
+
+		// step 8
+
+		{
+			int B = n2;
+			int o1 = n4, o2 = o1 - 1;
+			int o3 = n4 + n2, o4 = o3 - 1;
+
+			for (int i = 0; i < n4; i++) {
+				float temp1 = (xxx[xx] * trig[B + 1] - xxx[xx + 1] * trig[B]);
+				float temp2 = -(xxx[xx] * trig[B] + xxx[xx + 1] * trig[B + 1]);
+
+				out[o1] = -temp1;
+				out[o2] = temp1;
+				out[o3] = temp2;
+				out[o4] = temp2;
+
+				o1++;
+				o2--;
+				o3++;
+				o4--;
+				xx += 2;
+				B += 2;
+			}
+		}
+	}
+
+	private float[] mdct_kernel(float[] x, float[] w, int n, int n2, int n4, int n8) {
+		// step 2
+
+		int xA = n4;
+		int xB = 0;
+		int w2 = n4;
+		int A = n2;
+
+		for (int i = 0; i < n4;) {
+			float x0 = x[xA] - x[xB];
+			float x1;
+			w[w2 + i] = x[xA++] + x[xB++];
+
+			x1 = x[xA] - x[xB];
+			A -= 4;
+
+			w[i++] = x0 * trig[A] + x1 * trig[A + 1];
+			w[i] = x1 * trig[A] - x0 * trig[A + 1];
+
+			w[w2 + i] = x[xA++] + x[xB++];
+			i++;
+		}
+
+		// step 3
+
+		{
+			for (int i = 0; i < log2n - 3; i++) {
+				int k0 = n >>> (i + 2);
+				int k1 = 1 << (i + 3);
+				int wbase = n2 - 2;
+
+				A = 0;
+				float[] temp;
+
+				for (int r = 0; r < (k0 >>> 2); r++) {
+					int w1 = wbase;
+					w2 = w1 - (k0 >> 1);
+					float AEv = trig[A], wA;
+					float AOv = trig[A + 1], wB;
+					wbase -= 2;
+
+					k0++;
+					for (int s = 0; s < (2 << i); s++) {
+						wB = w[w1] - w[w2];
+						x[w1] = w[w1] + w[w2];
+
+						wA = w[++w1] - w[++w2];
+						x[w1] = w[w1] + w[w2];
+
+						x[w2] = wA * AEv - wB * AOv;
+						x[w2 - 1] = wB * AEv + wA * AOv;
+
+						w1 -= k0;
+						w2 -= k0;
+					}
+					k0--;
+					A += k1;
+				}
+
+				temp = w;
+				w = x;
+				x = temp;
+			}
+		}
+
+		// step 4, 5, 6, 7
+		{
+			int C = n;
+			int bit = 0;
+			int x1 = 0;
+			int x2 = n2 - 1;
+
+			for (int i = 0; i < n8; i++) {
+				int t1 = bitrev[bit++];
+				int t2 = bitrev[bit++];
+
+				float wA = w[t1] - w[t2 + 1];
+				float wB = w[t1 - 1] + w[t2];
+				float wC = w[t1] + w[t2 + 1];
+				float wD = w[t1 - 1] - w[t2];
+
+				float wACE = wA * trig[C];
+				float wBCE = wB * trig[C++];
+				float wACO = wA * trig[C];
+				float wBCO = wB * trig[C++];
+
+				x[x1++] = (wC + wACO + wBCE) * .5f;
+				x[x2--] = (-wD + wBCO - wACE) * .5f;
+				x[x1++] = (wD + wBCO - wACE) * .5f;
+				x[x2--] = (wC - wACO - wBCE) * .5f;
+			}
+		}
+		return (x);
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/PsyInfo.java b/src/teavm/java/com/jcraft/jorbis/PsyInfo.java
new file mode 100755
index 0000000..906efab
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/PsyInfo.java
@@ -0,0 +1,74 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+// psychoacoustic setup
+class PsyInfo {
+	int athp;
+	int decayp;
+	int smoothp;
+	int noisefitp;
+	int noisefit_subblock;
+	float noisefit_threshdB;
+
+	float ath_att;
+
+	int tonemaskp;
+	float[] toneatt_125Hz = new float[5];
+	float[] toneatt_250Hz = new float[5];
+	float[] toneatt_500Hz = new float[5];
+	float[] toneatt_1000Hz = new float[5];
+	float[] toneatt_2000Hz = new float[5];
+	float[] toneatt_4000Hz = new float[5];
+	float[] toneatt_8000Hz = new float[5];
+
+	int peakattp;
+	float[] peakatt_125Hz = new float[5];
+	float[] peakatt_250Hz = new float[5];
+	float[] peakatt_500Hz = new float[5];
+	float[] peakatt_1000Hz = new float[5];
+	float[] peakatt_2000Hz = new float[5];
+	float[] peakatt_4000Hz = new float[5];
+	float[] peakatt_8000Hz = new float[5];
+
+	int noisemaskp;
+	float[] noiseatt_125Hz = new float[5];
+	float[] noiseatt_250Hz = new float[5];
+	float[] noiseatt_500Hz = new float[5];
+	float[] noiseatt_1000Hz = new float[5];
+	float[] noiseatt_2000Hz = new float[5];
+	float[] noiseatt_4000Hz = new float[5];
+	float[] noiseatt_8000Hz = new float[5];
+
+	float max_curve_dB;
+
+	float attack_coeff;
+	float decay_coeff;
+
+	void free() {
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/PsyLook.java b/src/teavm/java/com/jcraft/jorbis/PsyLook.java
new file mode 100755
index 0000000..8fee7bf
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/PsyLook.java
@@ -0,0 +1,42 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+class PsyLook {
+	int n;
+	PsyInfo vi;
+
+	float[][][] tonecurves;
+	float[][] peakatt;
+	float[][][] noisecurves;
+
+	float[] ath;
+	int[] octave;
+
+	void init(PsyInfo vi, int n, int rate) {
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Residue0.java b/src/teavm/java/com/jcraft/jorbis/Residue0.java
new file mode 100755
index 0000000..d919709
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Residue0.java
@@ -0,0 +1,326 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+class Residue0 extends FuncResidue {
+	void pack(Object vr, Buffer opb) {
+		InfoResidue0 info = (InfoResidue0) vr;
+		int acc = 0;
+		opb.write(info.begin, 24);
+		opb.write(info.end, 24);
+
+		opb.write(info.grouping - 1, 24); /*
+											 * residue vectors to group and code with a partitioned book
+											 */
+		opb.write(info.partitions - 1, 6); /* possible partition choices */
+		opb.write(info.groupbook, 8); /* group huffman book */
+
+		/*
+		 * secondstages is a bitmask; as encoding progresses pass by pass, a bitmask of
+		 * one indicates this partition class has bits to write this pass
+		 */
+		for (int j = 0; j < info.partitions; j++) {
+			int i = info.secondstages[j];
+			if (Util.ilog(i) > 3) {
+				/* yes, this is a minor hack due to not thinking ahead */
+				opb.write(i, 3);
+				opb.write(1, 1);
+				opb.write(i >>> 3, 5);
+			} else {
+				opb.write(i, 4); /* trailing zero */
+			}
+			acc += Util.icount(i);
+		}
+		for (int j = 0; j < acc; j++) {
+			opb.write(info.booklist[j], 8);
+		}
+	}
+
+	Object unpack(Info vi, Buffer opb) {
+		int acc = 0;
+		InfoResidue0 info = new InfoResidue0();
+		info.begin = opb.read(24);
+		info.end = opb.read(24);
+		info.grouping = opb.read(24) + 1;
+		info.partitions = opb.read(6) + 1;
+		info.groupbook = opb.read(8);
+
+		for (int j = 0; j < info.partitions; j++) {
+			int cascade = opb.read(3);
+			if (opb.read(1) != 0) {
+				cascade |= (opb.read(5) << 3);
+			}
+			info.secondstages[j] = cascade;
+			acc += Util.icount(cascade);
+		}
+
+		for (int j = 0; j < acc; j++) {
+			info.booklist[j] = opb.read(8);
+		}
+
+		if (info.groupbook >= vi.books) {
+			free_info(info);
+			return (null);
+		}
+
+		for (int j = 0; j < acc; j++) {
+			if (info.booklist[j] >= vi.books) {
+				free_info(info);
+				return (null);
+			}
+		}
+		return (info);
+	}
+
+	Object look(DspState vd, InfoMode vm, Object vr) {
+		InfoResidue0 info = (InfoResidue0) vr;
+		LookResidue0 look = new LookResidue0();
+		int acc = 0;
+		int dim;
+		int maxstage = 0;
+		look.info = info;
+		look.map = vm.mapping;
+
+		look.parts = info.partitions;
+		look.fullbooks = vd.fullbooks;
+		look.phrasebook = vd.fullbooks[info.groupbook];
+
+		dim = look.phrasebook.dim;
+
+		look.partbooks = new int[look.parts][];
+
+		for (int j = 0; j < look.parts; j++) {
+			int i = info.secondstages[j];
+			int stages = Util.ilog(i);
+			if (stages != 0) {
+				if (stages > maxstage)
+					maxstage = stages;
+				look.partbooks[j] = new int[stages];
+				for (int k = 0; k < stages; k++) {
+					if ((i & (1 << k)) != 0) {
+						look.partbooks[j][k] = info.booklist[acc++];
+					}
+				}
+			}
+		}
+
+		look.partvals = (int) Math.rint(Math.pow(look.parts, dim));
+		look.stages = maxstage;
+		look.decodemap = new int[look.partvals][];
+		for (int j = 0; j < look.partvals; j++) {
+			int val = j;
+			int mult = look.partvals / look.parts;
+			look.decodemap[j] = new int[dim];
+
+			for (int k = 0; k < dim; k++) {
+				int deco = val / mult;
+				val -= deco * mult;
+				mult /= look.parts;
+				look.decodemap[j][k] = deco;
+			}
+		}
+		return (look);
+	}
+
+	void free_info(Object i) {
+	}
+
+	void free_look(Object i) {
+	}
+
+	private static int[][][] _01inverse_partword = new int[2][][]; // _01inverse is synchronized for
+
+	// re-using partword
+	synchronized static int _01inverse(Block vb, Object vl, float[][] in, int ch, int decodepart) {
+		int i, j, k, l, s;
+		LookResidue0 look = (LookResidue0) vl;
+		InfoResidue0 info = look.info;
+
+		// move all this setup out later
+		int samples_per_partition = info.grouping;
+		int partitions_per_word = look.phrasebook.dim;
+		int n = info.end - info.begin;
+
+		int partvals = n / samples_per_partition;
+		int partwords = (partvals + partitions_per_word - 1) / partitions_per_word;
+
+		if (_01inverse_partword.length < ch) {
+			_01inverse_partword = new int[ch][][];
+		}
+
+		for (j = 0; j < ch; j++) {
+			if (_01inverse_partword[j] == null || _01inverse_partword[j].length < partwords) {
+				_01inverse_partword[j] = new int[partwords][];
+			}
+		}
+
+		for (s = 0; s < look.stages; s++) {
+			// each loop decodes on partition codeword containing
+			// partitions_pre_word partitions
+			for (i = 0, l = 0; i < partvals; l++) {
+				if (s == 0) {
+					// fetch the partition word for each channel
+					for (j = 0; j < ch; j++) {
+						int temp = look.phrasebook.decode(vb.opb);
+						if (temp == -1) {
+							return (0);
+						}
+						_01inverse_partword[j][l] = look.decodemap[temp];
+						if (_01inverse_partword[j][l] == null) {
+							return (0);
+						}
+					}
+				}
+
+				// now we decode residual values for the partitions
+				for (k = 0; k < partitions_per_word && i < partvals; k++, i++)
+					for (j = 0; j < ch; j++) {
+						int offset = info.begin + i * samples_per_partition;
+						int index = _01inverse_partword[j][l][k];
+						if ((info.secondstages[index] & (1 << s)) != 0) {
+							CodeBook stagebook = look.fullbooks[look.partbooks[index][s]];
+							if (stagebook != null) {
+								if (decodepart == 0) {
+									if (stagebook.decodevs_add(in[j], offset, vb.opb, samples_per_partition) == -1) {
+										return (0);
+									}
+								} else if (decodepart == 1) {
+									if (stagebook.decodev_add(in[j], offset, vb.opb, samples_per_partition) == -1) {
+										return (0);
+									}
+								}
+							}
+						}
+					}
+			}
+		}
+		return (0);
+	}
+
+	static int[][] _2inverse_partword = null;
+
+	synchronized static int _2inverse(Block vb, Object vl, float[][] in, int ch) {
+		int i, k, l, s;
+		LookResidue0 look = (LookResidue0) vl;
+		InfoResidue0 info = look.info;
+
+		// move all this setup out later
+		int samples_per_partition = info.grouping;
+		int partitions_per_word = look.phrasebook.dim;
+		int n = info.end - info.begin;
+
+		int partvals = n / samples_per_partition;
+		int partwords = (partvals + partitions_per_word - 1) / partitions_per_word;
+
+		if (_2inverse_partword == null || _2inverse_partword.length < partwords) {
+			_2inverse_partword = new int[partwords][];
+		}
+		for (s = 0; s < look.stages; s++) {
+			for (i = 0, l = 0; i < partvals; l++) {
+				if (s == 0) {
+					// fetch the partition word for each channel
+					int temp = look.phrasebook.decode(vb.opb);
+					if (temp == -1) {
+						return (0);
+					}
+					_2inverse_partword[l] = look.decodemap[temp];
+					if (_2inverse_partword[l] == null) {
+						return (0);
+					}
+				}
+
+				// now we decode residual values for the partitions
+				for (k = 0; k < partitions_per_word && i < partvals; k++, i++) {
+					int offset = info.begin + i * samples_per_partition;
+					int index = _2inverse_partword[l][k];
+					if ((info.secondstages[index] & (1 << s)) != 0) {
+						CodeBook stagebook = look.fullbooks[look.partbooks[index][s]];
+						if (stagebook != null) {
+							if (stagebook.decodevv_add(in, offset, ch, vb.opb, samples_per_partition) == -1) {
+								return (0);
+							}
+						}
+					}
+				}
+			}
+		}
+		return (0);
+	}
+
+	int inverse(Block vb, Object vl, float[][] in, int[] nonzero, int ch) {
+		int used = 0;
+		for (int i = 0; i < ch; i++) {
+			if (nonzero[i] != 0) {
+				in[used++] = in[i];
+			}
+		}
+		if (used != 0)
+			return (_01inverse(vb, vl, in, used, 0));
+		else
+			return (0);
+	}
+
+	class LookResidue0 {
+		InfoResidue0 info;
+		int map;
+
+		int parts;
+		int stages;
+		CodeBook[] fullbooks;
+		CodeBook phrasebook;
+		int[][] partbooks;
+
+		int partvals;
+		int[][] decodemap;
+
+		int postbits;
+		int phrasebits;
+		int frames;
+	}
+
+	class InfoResidue0 {
+		// block-partitioned VQ coded straight residue
+		int begin;
+		int end;
+
+		// first stage (lossless partitioning)
+		int grouping; // group n vectors per partition
+		int partitions; // possible codebooks for a partition
+		int groupbook; // huffbook for partitioning
+		int[] secondstages = new int[64]; // expanded out to pointers in lookup
+		int[] booklist = new int[256]; // list of second stage books
+
+		// encode-only heuristic settings
+		float[] entmax = new float[64]; // book entropy threshholds
+		float[] ampmax = new float[64]; // book amp threshholds
+		int[] subgrp = new int[64]; // book heuristic subgroup size
+		int[] blimit = new int[64]; // subgroup position limits
+	}
+
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Residue1.java b/src/teavm/java/com/jcraft/jorbis/Residue1.java
new file mode 100755
index 0000000..55b0d9a
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Residue1.java
@@ -0,0 +1,44 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+class Residue1 extends Residue0 {
+
+	int inverse(Block vb, Object vl, float[][] in, int[] nonzero, int ch) {
+		int used = 0;
+		for (int i = 0; i < ch; i++) {
+			if (nonzero[i] != 0) {
+				in[used++] = in[i];
+			}
+		}
+		if (used != 0) {
+			return (_01inverse(vb, vl, in, used, 1));
+		} else {
+			return 0;
+		}
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Residue2.java b/src/teavm/java/com/jcraft/jorbis/Residue2.java
new file mode 100755
index 0000000..cb4ec8f
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Residue2.java
@@ -0,0 +1,41 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+class Residue2 extends Residue0 {
+
+	int inverse(Block vb, Object vl, float[][] in, int[] nonzero, int ch) {
+		int i = 0;
+		for (i = 0; i < ch; i++)
+			if (nonzero[i] != 0)
+				break;
+		if (i == ch)
+			return (0); /* no nonzero vectors */
+
+		return (_2inverse(vb, vl, in, ch));
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/StaticCodeBook.java b/src/teavm/java/com/jcraft/jorbis/StaticCodeBook.java
new file mode 100755
index 0000000..d06a2e8
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/StaticCodeBook.java
@@ -0,0 +1,436 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+class StaticCodeBook {
+	int dim; // codebook dimensions (elements per vector)
+	int entries; // codebook entries
+	int[] lengthlist; // codeword lengths in bits
+
+	// mapping
+	int maptype; // 0=none
+	// 1=implicitly populated values from map column
+	// 2=listed arbitrary values
+
+	// The below does a linear, single monotonic sequence mapping.
+	int q_min; // packed 32 bit float; quant value 0 maps to minval
+	int q_delta; // packed 32 bit float; val 1 - val 0 == delta
+	int q_quant; // bits: 0 < quant <= 16
+	int q_sequencep; // bitflag
+
+	// additional information for log (dB) mapping; the linear mapping
+	// is assumed to actually be values in dB. encodebias is used to
+	// assign an error weight to 0 dB. We have two additional flags:
+	// zeroflag indicates if entry zero is to represent -Inf dB; negflag
+	// indicates if we're to represent negative linear values in a
+	// mirror of the positive mapping.
+
+	int[] quantlist; // map == 1: (int)(entries/dim) element column map
+	// map == 2: list of dim*entries quantized entry vals
+
+	StaticCodeBook() {
+	}
+
+	int pack(Buffer opb) {
+		int i;
+		boolean ordered = false;
+
+		opb.write(0x564342, 24);
+		opb.write(dim, 16);
+		opb.write(entries, 24);
+
+		// pack the codewords. There are two packings; length ordered and
+		// length random. Decide between the two now.
+
+		for (i = 1; i < entries; i++) {
+			if (lengthlist[i] < lengthlist[i - 1])
+				break;
+		}
+		if (i == entries)
+			ordered = true;
+
+		if (ordered) {
+			// length ordered. We only need to say how many codewords of
+			// each length. The actual codewords are generated
+			// deterministically
+
+			int count = 0;
+			opb.write(1, 1); // ordered
+			opb.write(lengthlist[0] - 1, 5); // 1 to 32
+
+			for (i = 1; i < entries; i++) {
+				int _this = lengthlist[i];
+				int _last = lengthlist[i - 1];
+				if (_this > _last) {
+					for (int j = _last; j < _this; j++) {
+						opb.write(i - count, Util.ilog(entries - count));
+						count = i;
+					}
+				}
+			}
+			opb.write(i - count, Util.ilog(entries - count));
+		} else {
+			// length random. Again, we don't code the codeword itself, just
+			// the length. This time, though, we have to encode each length
+			opb.write(0, 1); // unordered
+
+			// algortihmic mapping has use for 'unused entries', which we tag
+			// here. The algorithmic mapping happens as usual, but the unused
+			// entry has no codeword.
+			for (i = 0; i < entries; i++) {
+				if (lengthlist[i] == 0)
+					break;
+			}
+
+			if (i == entries) {
+				opb.write(0, 1); // no unused entries
+				for (i = 0; i < entries; i++) {
+					opb.write(lengthlist[i] - 1, 5);
+				}
+			} else {
+				opb.write(1, 1); // we have unused entries; thus we tag
+				for (i = 0; i < entries; i++) {
+					if (lengthlist[i] == 0) {
+						opb.write(0, 1);
+					} else {
+						opb.write(1, 1);
+						opb.write(lengthlist[i] - 1, 5);
+					}
+				}
+			}
+		}
+
+		// is the entry number the desired return value, or do we have a
+		// mapping? If we have a mapping, what type?
+		opb.write(maptype, 4);
+		switch (maptype) {
+		case 0:
+			// no mapping
+			break;
+		case 1:
+		case 2:
+			// implicitly populated value mapping
+			// explicitly populated value mapping
+			if (quantlist == null) {
+				// no quantlist? error
+				return (-1);
+			}
+
+			// values that define the dequantization
+			opb.write(q_min, 32);
+			opb.write(q_delta, 32);
+			opb.write(q_quant - 1, 4);
+			opb.write(q_sequencep, 1);
+
+		{
+			int quantvals = 0;
+			switch (maptype) {
+			case 1:
+				// a single column of (c->entries/c->dim) quantized values for
+				// building a full value list algorithmically (square lattice)
+				quantvals = maptype1_quantvals();
+				break;
+			case 2:
+				// every value (c->entries*c->dim total) specified explicitly
+				quantvals = entries * dim;
+				break;
+			}
+
+			// quantized values
+			for (i = 0; i < quantvals; i++) {
+				opb.write(Math.abs(quantlist[i]), q_quant);
+			}
+		}
+			break;
+		default:
+			// error case; we don't have any other map types now
+			return (-1);
+		}
+		return (0);
+	}
+
+	// unpacks a codebook from the packet buffer into the codebook struct,
+	// readies the codebook auxiliary structures for decode
+	int unpack(Buffer opb) {
+		int i;
+		// memset(s,0,sizeof(static_codebook));
+
+		// make sure alignment is correct
+		if (opb.read(24) != 0x564342) {
+			// goto _eofout;
+			clear();
+			return (-1);
+		}
+
+		// first the basic parameters
+		dim = opb.read(16);
+		entries = opb.read(24);
+		if (entries == -1) {
+			// goto _eofout;
+			clear();
+			return (-1);
+		}
+
+		// codeword ordering.... length ordered or unordered?
+		switch (opb.read(1)) {
+		case 0:
+			// unordered
+			lengthlist = new int[entries];
+
+			// allocated but unused entries?
+			if (opb.read(1) != 0) {
+				// yes, unused entries
+
+				for (i = 0; i < entries; i++) {
+					if (opb.read(1) != 0) {
+						int num = opb.read(5);
+						if (num == -1) {
+							// goto _eofout;
+							clear();
+							return (-1);
+						}
+						lengthlist[i] = num + 1;
+					} else {
+						lengthlist[i] = 0;
+					}
+				}
+			} else {
+				// all entries used; no tagging
+				for (i = 0; i < entries; i++) {
+					int num = opb.read(5);
+					if (num == -1) {
+						// goto _eofout;
+						clear();
+						return (-1);
+					}
+					lengthlist[i] = num + 1;
+				}
+			}
+			break;
+		case 1:
+		// ordered
+		{
+			int length = opb.read(5) + 1;
+			lengthlist = new int[entries];
+
+			for (i = 0; i < entries;) {
+				int num = opb.read(Util.ilog(entries - i));
+				if (num == -1) {
+					// goto _eofout;
+					clear();
+					return (-1);
+				}
+				for (int j = 0; j < num; j++, i++) {
+					lengthlist[i] = length;
+				}
+				length++;
+			}
+		}
+			break;
+		default:
+			// EOF
+			return (-1);
+		}
+
+		// Do we have a mapping to unpack?
+		switch ((maptype = opb.read(4))) {
+		case 0:
+			// no mapping
+			break;
+		case 1:
+		case 2:
+			// implicitly populated value mapping
+			// explicitly populated value mapping
+			q_min = opb.read(32);
+			q_delta = opb.read(32);
+			q_quant = opb.read(4) + 1;
+			q_sequencep = opb.read(1);
+
+		{
+			int quantvals = 0;
+			switch (maptype) {
+			case 1:
+				quantvals = maptype1_quantvals();
+				break;
+			case 2:
+				quantvals = entries * dim;
+				break;
+			}
+
+			// quantized values
+			quantlist = new int[quantvals];
+			for (i = 0; i < quantvals; i++) {
+				quantlist[i] = opb.read(q_quant);
+			}
+			if (quantlist[quantvals - 1] == -1) {
+				// goto _eofout;
+				clear();
+				return (-1);
+			}
+		}
+			break;
+		default:
+			// goto _eofout;
+			clear();
+			return (-1);
+		}
+		// all set
+		return (0);
+		// _errout:
+		// _eofout:
+		// vorbis_staticbook_clear(s);
+		// return(-1);
+	}
+
+	// there might be a straightforward one-line way to do the below
+	// that's portable and totally safe against roundoff, but I haven't
+	// thought of it. Therefore, we opt on the side of caution
+	private int maptype1_quantvals() {
+		int vals = (int) (Math.floor(Math.pow(entries, 1. / dim)));
+
+		// the above *should* be reliable, but we'll not assume that FP is
+		// ever reliable when bitstream sync is at stake; verify via integer
+		// means that vals really is the greatest value of dim for which
+		// vals^b->bim <= b->entries
+		// treat the above as an initial guess
+		while (true) {
+			int acc = 1;
+			int acc1 = 1;
+			for (int i = 0; i < dim; i++) {
+				acc *= vals;
+				acc1 *= vals + 1;
+			}
+			if (acc <= entries && acc1 > entries) {
+				return (vals);
+			} else {
+				if (acc > entries) {
+					vals--;
+				} else {
+					vals++;
+				}
+			}
+		}
+	}
+
+	void clear() {
+	}
+
+	// unpack the quantized list of values for encode/decode
+	// we need to deal with two map types: in map type 1, the values are
+	// generated algorithmically (each column of the vector counts through
+	// the values in the quant vector). in map type 2, all the values came
+	// in in an explicit list. Both value lists must be unpacked
+	float[] unquantize() {
+
+		if (maptype == 1 || maptype == 2) {
+			int quantvals;
+			float mindel = float32_unpack(q_min);
+			float delta = float32_unpack(q_delta);
+			float[] r = new float[entries * dim];
+
+			// maptype 1 and 2 both use a quantized value vector, but
+			// different sizes
+			switch (maptype) {
+			case 1:
+				// most of the time, entries%dimensions == 0, but we need to be
+				// well defined. We define that the possible vales at each
+				// scalar is values == entries/dim. If entries%dim != 0, we'll
+				// have 'too few' values (values*dim<entries), which means that
+				// we'll have 'left over' entries; left over entries use zeroed
+				// values (and are wasted). So don't generate codebooks like that
+				quantvals = maptype1_quantvals();
+				for (int j = 0; j < entries; j++) {
+					float last = 0.f;
+					int indexdiv = 1;
+					for (int k = 0; k < dim; k++) {
+						int index = (j / indexdiv) % quantvals;
+						float val = quantlist[index];
+						val = Math.abs(val) * delta + mindel + last;
+						if (q_sequencep != 0)
+							last = val;
+						r[j * dim + k] = val;
+						indexdiv *= quantvals;
+					}
+				}
+				break;
+			case 2:
+				for (int j = 0; j < entries; j++) {
+					float last = 0.f;
+					for (int k = 0; k < dim; k++) {
+						float val = quantlist[j * dim + k];
+						// if((j*dim+k)==0){System.err.println(" | 0 -> "+val+" | ");}
+						val = Math.abs(val) * delta + mindel + last;
+						if (q_sequencep != 0)
+							last = val;
+						r[j * dim + k] = val;
+						// if((j*dim+k)==0){System.err.println(" $ r[0] -> "+r[0]+" | ");}
+					}
+				}
+				// System.err.println("\nr[0]="+r[0]);
+			}
+			return (r);
+		}
+		return (null);
+	}
+
+	// 32 bit float (not IEEE; nonnormalized mantissa +
+	// biased exponent) : neeeeeee eeemmmmm mmmmmmmm mmmmmmmm
+	// Why not IEEE? It's just not that important here.
+
+	static final int VQ_FEXP = 10;
+	static final int VQ_FMAN = 21;
+	static final int VQ_FEXP_BIAS = 768; // bias toward values smaller than 1.
+
+	// doesn't currently guard under/overflow
+	static long float32_pack(float val) {
+		int sign = 0;
+		int exp;
+		int mant;
+		if (val < 0) {
+			sign = 0x80000000;
+			val = -val;
+		}
+		exp = (int) Math.floor(Math.log(val) / Math.log(2));
+		mant = (int) Math.rint(Math.pow(val, (VQ_FMAN - 1) - exp));
+		exp = (exp + VQ_FEXP_BIAS) << VQ_FMAN;
+		return (sign | exp | mant);
+	}
+
+	static float float32_unpack(int val) {
+		float mant = val & 0x1fffff;
+		float exp = (val & 0x7fe00000) >>> VQ_FMAN;
+		if ((val & 0x80000000) != 0)
+			mant = -mant;
+		return (ldexp(mant, ((int) exp) - (VQ_FMAN - 1) - VQ_FEXP_BIAS));
+	}
+
+	static float ldexp(float foo, int e) {
+		return (float) (foo * Math.pow(2, e));
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Time0.java b/src/teavm/java/com/jcraft/jorbis/Time0.java
new file mode 100755
index 0000000..3e9e81f
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Time0.java
@@ -0,0 +1,52 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+class Time0 extends FuncTime {
+	void pack(Object i, Buffer opb) {
+	}
+
+	Object unpack(Info vi, Buffer opb) {
+		return "";
+	}
+
+	Object look(DspState vd, InfoMode mi, Object i) {
+		return "";
+	}
+
+	void free_info(Object i) {
+	}
+
+	void free_look(Object i) {
+	}
+
+	int inverse(Block vb, Object i, float[] in, float[] out) {
+		return 0;
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/Util.java b/src/teavm/java/com/jcraft/jorbis/Util.java
new file mode 100755
index 0000000..a8844c3
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/Util.java
@@ -0,0 +1,30 @@
+package com.jcraft.jorbis;
+
+class Util {
+	static int ilog(int v) {
+		int ret = 0;
+		while (v != 0) {
+			ret++;
+			v >>>= 1;
+		}
+		return (ret);
+	}
+
+	static int ilog2(int v) {
+		int ret = 0;
+		while (v > 1) {
+			ret++;
+			v >>>= 1;
+		}
+		return (ret);
+	}
+
+	static int icount(int v) {
+		int ret = 0;
+		while (v != 0) {
+			ret += (v & 1);
+			v >>>= 1;
+		}
+		return (ret);
+	}
+}
diff --git a/src/teavm/java/com/jcraft/jorbis/VorbisFile.java b/src/teavm/java/com/jcraft/jorbis/VorbisFile.java
new file mode 100755
index 0000000..4222740
--- /dev/null
+++ b/src/teavm/java/com/jcraft/jorbis/VorbisFile.java
@@ -0,0 +1,1348 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* JOrbis
+ * Copyright (C) 2000 ymnk, JCraft,Inc.
+ *  
+ * Written by: 2000 ymnk<ymnk@jcraft.com>
+ *   
+ * Many thanks to 
+ *   Monty <monty@xiph.org> and 
+ *   The XIPHOPHORUS Company http://www.xiph.org/ .
+ * JOrbis has been based on their awesome works, Vorbis codec.
+ *   
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.*;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+public class VorbisFile {
+	static final int CHUNKSIZE = 8500;
+	static final int SEEK_SET = 0;
+	static final int SEEK_CUR = 1;
+	static final int SEEK_END = 2;
+
+	static final int OV_FALSE = -1;
+	static final int OV_EOF = -2;
+	static final int OV_HOLE = -3;
+
+	static final int OV_EREAD = -128;
+	static final int OV_EFAULT = -129;
+	static final int OV_EIMPL = -130;
+	static final int OV_EINVAL = -131;
+	static final int OV_ENOTVORBIS = -132;
+	static final int OV_EBADHEADER = -133;
+	static final int OV_EVERSION = -134;
+	static final int OV_ENOTAUDIO = -135;
+	static final int OV_EBADPACKET = -136;
+	static final int OV_EBADLINK = -137;
+	static final int OV_ENOSEEK = -138;
+
+	InputStream datasource;
+	boolean seekable = false;
+	long offset;
+	long end;
+
+	SyncState oy = new SyncState();
+
+	int links;
+	long[] offsets;
+	long[] dataoffsets;
+	int[] serialnos;
+	long[] pcmlengths;
+	Info[] vi;
+	Comment[] vc;
+
+	// Decoding working state local storage
+	long pcm_offset;
+	boolean decode_ready = false;
+
+	int current_serialno;
+	int current_link;
+
+	float bittrack;
+	float samptrack;
+
+	StreamState os = new StreamState(); // take physical pages, weld into a logical
+	// stream of packets
+	DspState vd = new DspState(); // central working state for
+	// the packet->PCM decoder
+	Block vb = new Block(vd); // local working space for packet->PCM decode
+
+	// ov_callbacks callbacks;
+
+	public VorbisFile(String file) throws JOrbisException {
+		super();
+		InputStream is = null;
+		try {
+			is = new SeekableInputStream(file);
+			int ret = open(is, null, 0);
+			if (ret == -1) {
+				throw new JOrbisException("VorbisFile: open return -1");
+			}
+		} catch (Exception e) {
+			throw new JOrbisException("VorbisFile: " + e.toString());
+		} finally {
+			if (is != null) {
+				try {
+					is.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	public VorbisFile(InputStream is, byte[] initial, int ibytes) throws JOrbisException {
+		super();
+		int ret = open(is, initial, ibytes);
+		if (ret == -1) {
+		}
+	}
+
+	private int get_data() {
+		int index = oy.buffer(CHUNKSIZE);
+		byte[] buffer = oy.data;
+		int bytes = 0;
+		try {
+			bytes = datasource.read(buffer, index, CHUNKSIZE);
+		} catch (Exception e) {
+			return OV_EREAD;
+		}
+		oy.wrote(bytes);
+		if (bytes == -1) {
+			bytes = 0;
+		}
+		return bytes;
+	}
+
+	private void seek_helper(long offst) {
+		fseek(datasource, offst, SEEK_SET);
+		this.offset = offst;
+		oy.reset();
+	}
+
+	private int get_next_page(Page page, long boundary) {
+		if (boundary > 0)
+			boundary += offset;
+		while (true) {
+			int more;
+			if (boundary > 0 && offset >= boundary)
+				return OV_FALSE;
+			more = oy.pageseek(page);
+			if (more < 0) {
+				offset -= more;
+			} else {
+				if (more == 0) {
+					if (boundary == 0)
+						return OV_FALSE;
+					int ret = get_data();
+					if (ret == 0)
+						return OV_EOF;
+					if (ret < 0)
+						return OV_EREAD;
+				} else {
+					int ret = (int) offset; // !!!
+					offset += more;
+					return ret;
+				}
+			}
+		}
+	}
+
+	private int get_prev_page(Page page) throws JOrbisException {
+		long begin = offset; // !!!
+		int ret;
+		int offst = -1;
+		while (offst == -1) {
+			begin -= CHUNKSIZE;
+			if (begin < 0)
+				begin = 0;
+			seek_helper(begin);
+			while (offset < begin + CHUNKSIZE) {
+				ret = get_next_page(page, begin + CHUNKSIZE - offset);
+				if (ret == OV_EREAD) {
+					return OV_EREAD;
+				}
+				if (ret < 0) {
+					if (offst == -1)
+						throw new JOrbisException();
+					break;
+				} else {
+					offst = ret;
+				}
+			}
+		}
+		seek_helper(offst); // !!!
+		ret = get_next_page(page, CHUNKSIZE);
+		if (ret < 0) {
+			return OV_EFAULT;
+		}
+		return offst;
+	}
+
+	int bisect_forward_serialno(long begin, long searched, long end, int currentno, int m) {
+		long endsearched = end;
+		long next = end;
+		Page page = new Page();
+		int ret;
+
+		while (searched < endsearched) {
+			long bisect;
+			if (endsearched - searched < CHUNKSIZE) {
+				bisect = searched;
+			} else {
+				bisect = (searched + endsearched) / 2;
+			}
+
+			seek_helper(bisect);
+			ret = get_next_page(page, -1);
+			if (ret == OV_EREAD)
+				return OV_EREAD;
+			if (ret < 0 || page.serialno() != currentno) {
+				endsearched = bisect;
+				if (ret >= 0)
+					next = ret;
+			} else {
+				searched = ret + page.header_len + page.body_len;
+			}
+		}
+		seek_helper(next);
+		ret = get_next_page(page, -1);
+		if (ret == OV_EREAD)
+			return OV_EREAD;
+
+		if (searched >= end || ret == -1) {
+			links = m + 1;
+			offsets = new long[m + 2];
+			offsets[m + 1] = searched;
+		} else {
+			ret = bisect_forward_serialno(next, offset, end, page.serialno(), m + 1);
+			if (ret == OV_EREAD)
+				return OV_EREAD;
+		}
+		offsets[m] = begin;
+		return 0;
+	}
+
+	// uses the local ogg_stream storage in vf; this is important for
+	// non-streaming input sources
+	int fetch_headers(Info vi, Comment vc, int[] serialno, Page og_ptr) {
+		Page og = new Page();
+		Packet op = new Packet();
+		int ret;
+
+		if (og_ptr == null) {
+			ret = get_next_page(og, CHUNKSIZE);
+			if (ret == OV_EREAD)
+				return OV_EREAD;
+			if (ret < 0)
+				return OV_ENOTVORBIS;
+			og_ptr = og;
+		}
+
+		if (serialno != null)
+			serialno[0] = og_ptr.serialno();
+
+		os.init(og_ptr.serialno());
+
+		// extract the initial header from the first page and verify that the
+		// Ogg bitstream is in fact Vorbis data
+
+		vi.init();
+		vc.init();
+
+		int i = 0;
+		while (i < 3) {
+			os.pagein(og_ptr);
+			while (i < 3) {
+				int result = os.packetout(op);
+				if (result == 0)
+					break;
+				if (result == -1) {
+					vi.clear();
+					vc.clear();
+					os.clear();
+					return -1;
+				}
+				if (vi.synthesis_headerin(vc, op) != 0) {
+					vi.clear();
+					vc.clear();
+					os.clear();
+					return -1;
+				}
+				i++;
+			}
+			if (i < 3)
+				if (get_next_page(og_ptr, 1) < 0) {
+					vi.clear();
+					vc.clear();
+					os.clear();
+					return -1;
+				}
+		}
+		return 0;
+	}
+
+	// last step of the OggVorbis_File initialization; get all the
+	// vorbis_info structs and PCM positions. Only called by the seekable
+	// initialization (local stream storage is hacked slightly; pay
+	// attention to how that's done)
+	void prefetch_all_headers(Info first_i, Comment first_c, int dataoffset) throws JOrbisException {
+		Page og = new Page();
+		int ret;
+
+		vi = new Info[links];
+		vc = new Comment[links];
+		dataoffsets = new long[links];
+		pcmlengths = new long[links];
+		serialnos = new int[links];
+
+		for (int i = 0; i < links; i++) {
+			if (first_i != null && first_c != null && i == 0) {
+				// we already grabbed the initial header earlier. This just
+				// saves the waste of grabbing it again
+				vi[i] = first_i;
+				vc[i] = first_c;
+				dataoffsets[i] = dataoffset;
+			} else {
+				// seek to the location of the initial header
+				seek_helper(offsets[i]); // !!!
+				vi[i] = new Info();
+				vc[i] = new Comment();
+				if (fetch_headers(vi[i], vc[i], null, null) == -1) {
+					dataoffsets[i] = -1;
+				} else {
+					dataoffsets[i] = offset;
+					os.clear();
+				}
+			}
+
+			// get the serial number and PCM length of this link. To do this,
+			// get the last page of the stream
+			{
+				long end = offsets[i + 1]; // !!!
+				seek_helper(end);
+
+				while (true) {
+					ret = get_prev_page(og);
+					if (ret == -1) {
+						// this should not be possible
+						vi[i].clear();
+						vc[i].clear();
+						break;
+					}
+					if (og.granulepos() != -1) {
+						serialnos[i] = og.serialno();
+						pcmlengths[i] = og.granulepos();
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	private int make_decode_ready() {
+		if (decode_ready)
+			System.exit(1);
+		vd.synthesis_init(vi[0]);
+		vb.init(vd);
+		decode_ready = true;
+		return (0);
+	}
+
+	int open_seekable() throws JOrbisException {
+		Info initial_i = new Info();
+		Comment initial_c = new Comment();
+		int serialno;
+		long end;
+		int ret;
+		int dataoffset;
+		Page og = new Page();
+		// is this even vorbis...?
+		int[] foo = new int[1];
+		ret = fetch_headers(initial_i, initial_c, foo, null);
+		serialno = foo[0];
+		dataoffset = (int) offset; // !!
+		os.clear();
+		if (ret == -1)
+			return (-1);
+		if (ret < 0)
+			return (ret);
+		// we can seek, so set out learning all about this file
+		seekable = true;
+		fseek(datasource, 0, SEEK_END);
+		offset = ftell(datasource);
+		end = offset;
+		// We get the offset for the last page of the physical bitstream.
+		// Most OggVorbis files will contain a single logical bitstream
+		end = get_prev_page(og);
+		// moer than one logical bitstream?
+		if (og.serialno() != serialno) {
+			// Chained bitstream. Bisect-search each logical bitstream
+			// section. Do so based on serial number only
+			if (bisect_forward_serialno(0, 0, end + 1, serialno, 0) < 0) {
+				clear();
+				return OV_EREAD;
+			}
+		} else {
+			// Only one logical bitstream
+			if (bisect_forward_serialno(0, end, end + 1, serialno, 0) < 0) {
+				clear();
+				return OV_EREAD;
+			}
+		}
+		prefetch_all_headers(initial_i, initial_c, dataoffset);
+		return 0;
+	}
+
+	int open_nonseekable() {
+		// we cannot seek. Set up a 'single' (current) logical bitstream entry
+		links = 1;
+		vi = new Info[links];
+		vi[0] = new Info(); // ??
+		vc = new Comment[links];
+		vc[0] = new Comment(); // ?? bug?
+
+		// Try to fetch the headers, maintaining all the storage
+		int[] foo = new int[1];
+		if (fetch_headers(vi[0], vc[0], foo, null) == -1)
+			return (-1);
+		current_serialno = foo[0];
+		make_decode_ready();
+		return 0;
+	}
+
+	// clear out the current logical bitstream decoder
+	void decode_clear() {
+		os.clear();
+		vd.clear();
+		vb.clear();
+		decode_ready = false;
+		bittrack = 0.f;
+		samptrack = 0.f;
+	}
+
+	// fetch and process a packet. Handles the case where we're at a
+	// bitstream boundary and dumps the decoding machine. If the decoding
+	// machine is unloaded, it loads it. It also keeps pcm_offset up to
+	// date (seek and read both use this. seek uses a special hack with
+	// readp).
+	//
+	// return: -1) hole in the data (lost packet)
+	// 0) need more date (only if readp==0)/eof
+	// 1) got a packet
+
+	int process_packet(int readp) {
+		Page og = new Page();
+
+		// handle one packet. Try to fetch it from current stream state
+		// extract packets from page
+		while (true) {
+			// process a packet if we can. If the machine isn't loaded,
+			// neither is a page
+			if (decode_ready) {
+				Packet op = new Packet();
+				int result = os.packetout(op);
+				long granulepos;
+				// if(result==-1)return(-1); // hole in the data. For now, swallow
+				// and go. We'll need to add a real
+				// error code in a bit.
+				if (result > 0) {
+					// got a packet. process it
+					granulepos = op.granulepos;
+					if (vb.synthesis(op) == 0) { // lazy check for lazy
+						// header handling. The
+						// header packets aren't
+						// audio, so if/when we
+						// submit them,
+						// vorbis_synthesis will
+						// reject them
+						// suck in the synthesis data and track bitrate
+						{
+							int oldsamples = vd.synthesis_pcmout(null, null);
+							vd.synthesis_blockin(vb);
+							samptrack += vd.synthesis_pcmout(null, null) - oldsamples;
+							bittrack += op.bytes * 8;
+						}
+
+						// update the pcm offset.
+						if (granulepos != -1 && op.e_o_s == 0) {
+							int link = (seekable ? current_link : 0);
+							int samples;
+							// this packet has a pcm_offset on it (the last packet
+							// completed on a page carries the offset) After processing
+							// (above), we know the pcm position of the *last* sample
+							// ready to be returned. Find the offset of the *first*
+							//
+							// As an aside, this trick is inaccurate if we begin
+							// reading anew right at the last page; the end-of-stream
+							// granulepos declares the last frame in the stream, and the
+							// last packet of the last page may be a partial frame.
+							// So, we need a previous granulepos from an in-sequence page
+							// to have a reference point. Thus the !op.e_o_s clause above
+
+							samples = vd.synthesis_pcmout(null, null);
+							granulepos -= samples;
+							for (int i = 0; i < link; i++) {
+								granulepos += pcmlengths[i];
+							}
+							pcm_offset = granulepos;
+						}
+						return (1);
+					}
+				}
+			}
+
+			if (readp == 0)
+				return (0);
+			if (get_next_page(og, -1) < 0)
+				return (0); // eof. leave unitialized
+
+			// bitrate tracking; add the header's bytes here, the body bytes
+			// are done by packet above
+			bittrack += og.header_len * 8;
+
+			// has our decoding just traversed a bitstream boundary?
+			if (decode_ready) {
+				if (current_serialno != og.serialno()) {
+					decode_clear();
+				}
+			}
+
+			// Do we need to load a new machine before submitting the page?
+			// This is different in the seekable and non-seekable cases.
+			//
+			// In the seekable case, we already have all the header
+			// information loaded and cached; we just initialize the machine
+			// with it and continue on our merry way.
+			//
+			// In the non-seekable (streaming) case, we'll only be at a
+			// boundary if we just left the previous logical bitstream and
+			// we're now nominally at the header of the next bitstream
+
+			if (!decode_ready) {
+				int i;
+				if (seekable) {
+					current_serialno = og.serialno();
+
+					// match the serialno to bitstream section. We use this rather than
+					// offset positions to avoid problems near logical bitstream
+					// boundaries
+					for (i = 0; i < links; i++) {
+						if (serialnos[i] == current_serialno)
+							break;
+					}
+					if (i == links)
+						return (-1); // sign of a bogus stream. error out,
+					// leave machine uninitialized
+					current_link = i;
+
+					os.init(current_serialno);
+					os.reset();
+
+				} else {
+					// we're streaming
+					// fetch the three header packets, build the info struct
+					int foo[] = new int[1];
+					int ret = fetch_headers(vi[0], vc[0], foo, og);
+					current_serialno = foo[0];
+					if (ret != 0)
+						return ret;
+					current_link++;
+					i = 0;
+				}
+				make_decode_ready();
+			}
+			os.pagein(og);
+		}
+	}
+
+	// The helpers are over; it's all toplevel interface from here on out
+	// clear out the OggVorbis_File struct
+	int clear() {
+		vb.clear();
+		vd.clear();
+		os.clear();
+
+		if (vi != null && links != 0) {
+			for (int i = 0; i < links; i++) {
+				vi[i].clear();
+				vc[i].clear();
+			}
+			vi = null;
+			vc = null;
+		}
+		if (dataoffsets != null)
+			dataoffsets = null;
+		if (pcmlengths != null)
+			pcmlengths = null;
+		if (serialnos != null)
+			serialnos = null;
+		if (offsets != null)
+			offsets = null;
+		oy.clear();
+
+		return (0);
+	}
+
+	static int fseek(InputStream fis, long off, int whence) {
+		if (fis instanceof SeekableInputStream) {
+			SeekableInputStream sis = (SeekableInputStream) fis;
+			try {
+				if (whence == SEEK_SET) {
+					sis.seek(off);
+				} else if (whence == SEEK_END) {
+					sis.seek(sis.getLength() - off);
+				} else {
+				}
+			} catch (Exception e) {
+			}
+			return 0;
+		}
+		try {
+			if (whence == 0) {
+				fis.reset();
+			}
+			fis.skip(off);
+		} catch (Exception e) {
+			return -1;
+		}
+		return 0;
+	}
+
+	static long ftell(InputStream fis) {
+		try {
+			if (fis instanceof SeekableInputStream) {
+				SeekableInputStream sis = (SeekableInputStream) fis;
+				return (sis.tell());
+			}
+		} catch (Exception e) {
+		}
+		return 0;
+	}
+
+	// inspects the OggVorbis file and finds/documents all the logical
+	// bitstreams contained in it. Tries to be tolerant of logical
+	// bitstream sections that are truncated/woogie.
+	//
+	// return: -1) error
+	// 0) OK
+
+	int open(InputStream is, byte[] initial, int ibytes) throws JOrbisException {
+		return open_callbacks(is, initial, ibytes);
+	}
+
+	int open_callbacks(InputStream is, byte[] initial, int ibytes// , callbacks callbacks
+	) throws JOrbisException {
+		int ret;
+		datasource = is;
+
+		oy.init();
+
+		// perhaps some data was previously read into a buffer for testing
+		// against other stream types. Allow initialization from this
+		// previously read data (as we may be reading from a non-seekable
+		// stream)
+		if (initial != null) {
+			int index = oy.buffer(ibytes);
+			System.arraycopy(initial, 0, oy.data, index, ibytes);
+			oy.wrote(ibytes);
+		}
+		// can we seek? Stevens suggests the seek test was portable
+		if (is instanceof SeekableInputStream) {
+			ret = open_seekable();
+		} else {
+			ret = open_nonseekable();
+		}
+		if (ret != 0) {
+			datasource = null;
+			clear();
+		}
+		return ret;
+	}
+
+	// How many logical bitstreams in this physical bitstream?
+	public int streams() {
+		return links;
+	}
+
+	// Is the FILE * associated with vf seekable?
+	public boolean seekable() {
+		return seekable;
+	}
+
+	// returns the bitrate for a given logical bitstream or the entire
+	// physical bitstream. If the file is open for random access, it will
+	// find the *actual* average bitrate. If the file is streaming, it
+	// returns the nominal bitrate (if set) else the average of the
+	// upper/lower bounds (if set) else -1 (unset).
+	//
+	// If you want the actual bitrate field settings, get them from the
+	// vorbis_info structs
+
+	public int bitrate(int i) {
+		if (i >= links)
+			return (-1);
+		if (!seekable && i != 0)
+			return (bitrate(0));
+		if (i < 0) {
+			long bits = 0;
+			for (int j = 0; j < links; j++) {
+				bits += (offsets[j + 1] - dataoffsets[j]) * 8;
+			}
+			return ((int) Math.rint(bits / time_total(-1)));
+		} else {
+			if (seekable) {
+				// return the actual bitrate
+				return ((int) Math.rint((offsets[i + 1] - dataoffsets[i]) * 8 / time_total(i)));
+			} else {
+				// return nominal if set
+				if (vi[i].bitrate_nominal > 0) {
+					return vi[i].bitrate_nominal;
+				} else {
+					if (vi[i].bitrate_upper > 0) {
+						if (vi[i].bitrate_lower > 0) {
+							return (vi[i].bitrate_upper + vi[i].bitrate_lower) / 2;
+						} else {
+							return vi[i].bitrate_upper;
+						}
+					}
+					return (-1);
+				}
+			}
+		}
+	}
+
+	// returns the actual bitrate since last call. returns -1 if no
+	// additional data to offer since last call (or at beginning of stream)
+	public int bitrate_instant() {
+		int _link = (seekable ? current_link : 0);
+		if (samptrack == 0)
+			return (-1);
+		int ret = (int) (bittrack / samptrack * vi[_link].rate + .5);
+		bittrack = 0.f;
+		samptrack = 0.f;
+		return (ret);
+	}
+
+	public int serialnumber(int i) {
+		if (i >= links)
+			return (-1);
+		if (!seekable && i >= 0)
+			return (serialnumber(-1));
+		if (i < 0) {
+			return (current_serialno);
+		} else {
+			return (serialnos[i]);
+		}
+	}
+
+	// returns: total raw (compressed) length of content if i==-1
+	// raw (compressed) length of that logical bitstream for i==0 to n
+	// -1 if the stream is not seekable (we can't know the length)
+
+	public long raw_total(int i) {
+		if (!seekable || i >= links)
+			return (-1);
+		if (i < 0) {
+			long acc = 0; // bug?
+			for (int j = 0; j < links; j++) {
+				acc += raw_total(j);
+			}
+			return (acc);
+		} else {
+			return (offsets[i + 1] - offsets[i]);
+		}
+	}
+
+	// returns: total PCM length (samples) of content if i==-1
+	// PCM length (samples) of that logical bitstream for i==0 to n
+	// -1 if the stream is not seekable (we can't know the length)
+	public long pcm_total(int i) {
+		if (!seekable || i >= links)
+			return (-1);
+		if (i < 0) {
+			long acc = 0;
+			for (int j = 0; j < links; j++) {
+				acc += pcm_total(j);
+			}
+			return (acc);
+		} else {
+			return (pcmlengths[i]);
+		}
+	}
+
+	// returns: total seconds of content if i==-1
+	// seconds in that logical bitstream for i==0 to n
+	// -1 if the stream is not seekable (we can't know the length)
+	public float time_total(int i) {
+		if (!seekable || i >= links)
+			return (-1);
+		if (i < 0) {
+			float acc = 0;
+			for (int j = 0; j < links; j++) {
+				acc += time_total(j);
+			}
+			return (acc);
+		} else {
+			return ((float) (pcmlengths[i]) / vi[i].rate);
+		}
+	}
+
+	// seek to an offset relative to the *compressed* data. This also
+	// immediately sucks in and decodes pages to update the PCM cursor. It
+	// will cross a logical bitstream boundary, but only if it can't get
+	// any packets out of the tail of the bitstream we seek to (so no
+	// surprises).
+	//
+	// returns zero on success, nonzero on failure
+
+	public int raw_seek(int pos) {
+		if (!seekable)
+			return (-1); // don't dump machine if we can't seek
+		if (pos < 0 || pos > offsets[links]) {
+			// goto seek_error;
+			pcm_offset = -1;
+			decode_clear();
+			return -1;
+		}
+
+		// clear out decoding machine state
+		pcm_offset = -1;
+		decode_clear();
+
+		// seek
+		seek_helper(pos);
+
+		// we need to make sure the pcm_offset is set. We use the
+		// _fetch_packet helper to process one packet with readp set, then
+		// call it until it returns '0' with readp not set (the last packet
+		// from a page has the 'granulepos' field set, and that's how the
+		// helper updates the offset
+
+		switch (process_packet(1)) {
+		case 0:
+			// oh, eof. There are no packets remaining. Set the pcm offset to
+			// the end of file
+			pcm_offset = pcm_total(-1);
+			return (0);
+		case -1:
+			// error! missing data or invalid bitstream structure
+			// goto seek_error;
+			pcm_offset = -1;
+			decode_clear();
+			return -1;
+		default:
+			// all OK
+			break;
+		}
+		while (true) {
+			switch (process_packet(0)) {
+			case 0:
+				// the offset is set. If it's a bogus bitstream with no offset
+				// information, it's not but that's not our fault. We still run
+				// gracefully, we're just missing the offset
+				return (0);
+			case -1:
+				// error! missing data or invalid bitstream structure
+				// goto seek_error;
+				pcm_offset = -1;
+				decode_clear();
+				return -1;
+			default:
+				// continue processing packets
+				break;
+			}
+		}
+
+		// seek_error:
+		// dump the machine so we're in a known state
+		// pcm_offset=-1;
+		// decode_clear();
+		// return -1;
+	}
+
+	// seek to a sample offset relative to the decompressed pcm stream
+	// returns zero on success, nonzero on failure
+
+	public int pcm_seek(long pos) {
+		int link = -1;
+		long total = pcm_total(-1);
+
+		if (!seekable)
+			return (-1); // don't dump machine if we can't seek
+		if (pos < 0 || pos > total) {
+			// goto seek_error;
+			pcm_offset = -1;
+			decode_clear();
+			return -1;
+		}
+
+		// which bitstream section does this pcm offset occur in?
+		for (link = links - 1; link >= 0; link--) {
+			total -= pcmlengths[link];
+			if (pos >= total)
+				break;
+		}
+
+		// search within the logical bitstream for the page with the highest
+		// pcm_pos preceeding (or equal to) pos. There is a danger here;
+		// missing pages or incorrect frame number information in the
+		// bitstream could make our task impossible. Account for that (it
+		// would be an error condition)
+		{
+			long target = pos - total;
+			long end = offsets[link + 1];
+			long begin = offsets[link];
+			int best = (int) begin;
+
+			Page og = new Page();
+			while (begin < end) {
+				long bisect;
+				int ret;
+
+				if (end - begin < CHUNKSIZE) {
+					bisect = begin;
+				} else {
+					bisect = (end + begin) / 2;
+				}
+
+				seek_helper(bisect);
+				ret = get_next_page(og, end - bisect);
+
+				if (ret == -1) {
+					end = bisect;
+				} else {
+					long granulepos = og.granulepos();
+					if (granulepos < target) {
+						best = ret; // raw offset of packet with granulepos
+						begin = offset; // raw offset of next packet
+					} else {
+						end = bisect;
+					}
+				}
+			}
+			// found our page. seek to it (call raw_seek).
+			if (raw_seek(best) != 0) {
+				// goto seek_error;
+				pcm_offset = -1;
+				decode_clear();
+				return -1;
+			}
+		}
+
+		// verify result
+		if (pcm_offset >= pos) {
+			// goto seek_error;
+			pcm_offset = -1;
+			decode_clear();
+			return -1;
+		}
+		if (pos > pcm_total(-1)) {
+			// goto seek_error;
+			pcm_offset = -1;
+			decode_clear();
+			return -1;
+		}
+
+		// discard samples until we reach the desired position. Crossing a
+		// logical bitstream boundary with abandon is OK.
+		while (pcm_offset < pos) {
+			int target = (int) (pos - pcm_offset);
+			float[][][] _pcm = new float[1][][];
+			int[] _index = new int[getInfo(-1).channels];
+			int samples = vd.synthesis_pcmout(_pcm, _index);
+
+			if (samples > target)
+				samples = target;
+			vd.synthesis_read(samples);
+			pcm_offset += samples;
+
+			if (samples < target)
+				if (process_packet(1) == 0) {
+					pcm_offset = pcm_total(-1); // eof
+				}
+		}
+		return 0;
+
+		// seek_error:
+		// dump machine so we're in a known state
+		// pcm_offset=-1;
+		// decode_clear();
+		// return -1;
+	}
+
+	// seek to a playback time relative to the decompressed pcm stream
+	// returns zero on success, nonzero on failure
+	int time_seek(float seconds) {
+		// translate time to PCM position and call pcm_seek
+
+		int link = -1;
+		long pcm_total = pcm_total(-1);
+		float time_total = time_total(-1);
+
+		if (!seekable)
+			return (-1); // don't dump machine if we can't seek
+		if (seconds < 0 || seconds > time_total) {
+			// goto seek_error;
+			pcm_offset = -1;
+			decode_clear();
+			return -1;
+		}
+
+		// which bitstream section does this time offset occur in?
+		for (link = links - 1; link >= 0; link--) {
+			pcm_total -= pcmlengths[link];
+			time_total -= time_total(link);
+			if (seconds >= time_total)
+				break;
+		}
+
+		// enough information to convert time offset to pcm offset
+		{
+			long target = (long) (pcm_total + (seconds - time_total) * vi[link].rate);
+			return (pcm_seek(target));
+		}
+
+		// seek_error:
+		// dump machine so we're in a known state
+		// pcm_offset=-1;
+		// decode_clear();
+		// return -1;
+	}
+
+	// tell the current stream offset cursor. Note that seek followed by
+	// tell will likely not give the set offset due to caching
+	public long raw_tell() {
+		return (offset);
+	}
+
+	// return PCM offset (sample) of next PCM sample to be read
+	public long pcm_tell() {
+		return (pcm_offset);
+	}
+
+	// return time offset (seconds) of next PCM sample to be read
+	public float time_tell() {
+		// translate time to PCM position and call pcm_seek
+
+		int link = -1;
+		long pcm_total = 0;
+		float time_total = 0.f;
+
+		if (seekable) {
+			pcm_total = pcm_total(-1);
+			time_total = time_total(-1);
+
+			// which bitstream section does this time offset occur in?
+			for (link = links - 1; link >= 0; link--) {
+				pcm_total -= pcmlengths[link];
+				time_total -= time_total(link);
+				if (pcm_offset >= pcm_total)
+					break;
+			}
+		}
+
+		return ((float) time_total + (float) (pcm_offset - pcm_total) / vi[link].rate);
+	}
+
+	// link: -1) return the vorbis_info struct for the bitstream section
+	// currently being decoded
+	// 0-n) to request information for a specific bitstream section
+	//
+	// In the case of a non-seekable bitstream, any call returns the
+	// current bitstream. NULL in the case that the machine is not
+	// initialized
+
+	public Info getInfo(int link) {
+		if (seekable) {
+			if (link < 0) {
+				if (decode_ready) {
+					return vi[current_link];
+				} else {
+					return null;
+				}
+			} else {
+				if (link >= links) {
+					return null;
+				} else {
+					return vi[link];
+				}
+			}
+		} else {
+			if (decode_ready) {
+				return vi[0];
+			} else {
+				return null;
+			}
+		}
+	}
+
+	public Comment getComment(int link) {
+		if (seekable) {
+			if (link < 0) {
+				if (decode_ready) {
+					return vc[current_link];
+				} else {
+					return null;
+				}
+			} else {
+				if (link >= links) {
+					return null;
+				} else {
+					return vc[link];
+				}
+			}
+		} else {
+			if (decode_ready) {
+				return vc[0];
+			} else {
+				return null;
+			}
+		}
+	}
+
+	int host_is_big_endian() {
+		return 1;
+		// short pattern = 0xbabe;
+		// unsigned char *bytewise = (unsigned char *)&pattern;
+		// if (bytewise[0] == 0xba) return 1;
+		// assert(bytewise[0] == 0xbe);
+		// return 0;
+	}
+
+	// up to this point, everything could more or less hide the multiple
+	// logical bitstream nature of chaining from the toplevel application
+	// if the toplevel application didn't particularly care. However, at
+	// the point that we actually read audio back, the multiple-section
+	// nature must surface: Multiple bitstream sections do not necessarily
+	// have to have the same number of channels or sampling rate.
+	//
+	// read returns the sequential logical bitstream number currently
+	// being decoded along with the PCM data in order that the toplevel
+	// application can take action on channel/sample rate changes. This
+	// number will be incremented even for streamed (non-seekable) streams
+	// (for seekable streams, it represents the actual logical bitstream
+	// index within the physical bitstream. Note that the accessor
+	// functions above are aware of this dichotomy).
+	//
+	// input values: buffer) a buffer to hold packed PCM data for return
+	// length) the byte length requested to be placed into buffer
+	// bigendianp) should the data be packed LSB first (0) or
+	// MSB first (1)
+	// word) word size for output. currently 1 (byte) or
+	// 2 (16 bit short)
+	//
+	// return values: -1) error/hole in data
+	// 0) EOF
+	// n) number of bytes of PCM actually returned. The
+	// below works on a packet-by-packet basis, so the
+	// return length is not related to the 'length' passed
+	// in, just guaranteed to fit.
+	//
+	// *section) set to the logical bitstream number
+
+	int read(byte[] buffer, int length, int bigendianp, int word, int sgned, int[] bitstream) {
+		int host_endian = host_is_big_endian();
+		int index = 0;
+
+		while (true) {
+			if (decode_ready) {
+				float[][] pcm;
+				float[][][] _pcm = new float[1][][];
+				int[] _index = new int[getInfo(-1).channels];
+				int samples = vd.synthesis_pcmout(_pcm, _index);
+				pcm = _pcm[0];
+				if (samples != 0) {
+					// yay! proceed to pack data into the byte buffer
+					int channels = getInfo(-1).channels;
+					int bytespersample = word * channels;
+					if (samples > length / bytespersample)
+						samples = length / bytespersample;
+
+					// a tight loop to pack each size
+					{
+						int val;
+						if (word == 1) {
+							int off = (sgned != 0 ? 0 : 128);
+							for (int j = 0; j < samples; j++) {
+								for (int i = 0; i < channels; i++) {
+									val = (int) (pcm[i][_index[i] + j] * 128. + 0.5);
+									if (val > 127)
+										val = 127;
+									else if (val < -128)
+										val = -128;
+									buffer[index++] = (byte) (val + off);
+								}
+							}
+						} else {
+							int off = (sgned != 0 ? 0 : 32768);
+
+							if (host_endian == bigendianp) {
+								if (sgned != 0) {
+									for (int i = 0; i < channels; i++) { // It's faster in this order
+										int src = _index[i];
+										int dest = i;
+										for (int j = 0; j < samples; j++) {
+											val = (int) (pcm[i][src + j] * 32768. + 0.5);
+											if (val > 32767)
+												val = 32767;
+											else if (val < -32768)
+												val = -32768;
+											buffer[dest] = (byte) (val >>> 8);
+											buffer[dest + 1] = (byte) (val);
+											dest += channels * 2;
+										}
+									}
+								} else {
+									for (int i = 0; i < channels; i++) {
+										float[] src = pcm[i];
+										int dest = i;
+										for (int j = 0; j < samples; j++) {
+											val = (int) (src[j] * 32768. + 0.5);
+											if (val > 32767)
+												val = 32767;
+											else if (val < -32768)
+												val = -32768;
+											buffer[dest] = (byte) ((val + off) >>> 8);
+											buffer[dest + 1] = (byte) (val + off);
+											dest += channels * 2;
+										}
+									}
+								}
+							} else if (bigendianp != 0) {
+								for (int j = 0; j < samples; j++) {
+									for (int i = 0; i < channels; i++) {
+										val = (int) (pcm[i][j] * 32768. + 0.5);
+										if (val > 32767)
+											val = 32767;
+										else if (val < -32768)
+											val = -32768;
+										val += off;
+										buffer[index++] = (byte) (val >>> 8);
+										buffer[index++] = (byte) val;
+									}
+								}
+							} else {
+								// int val;
+								for (int j = 0; j < samples; j++) {
+									for (int i = 0; i < channels; i++) {
+										val = (int) (pcm[i][j] * 32768. + 0.5);
+										if (val > 32767)
+											val = 32767;
+										else if (val < -32768)
+											val = -32768;
+										val += off;
+										buffer[index++] = (byte) val;
+										buffer[index++] = (byte) (val >>> 8);
+									}
+								}
+							}
+						}
+					}
+
+					vd.synthesis_read(samples);
+					pcm_offset += samples;
+					if (bitstream != null)
+						bitstream[0] = current_link;
+					return (samples * bytespersample);
+				}
+			}
+
+			// suck in another packet
+			switch (process_packet(1)) {
+			case 0:
+				return (0);
+			case -1:
+				return -1;
+			default:
+				break;
+			}
+		}
+	}
+
+	public Info[] getInfo() {
+		return vi;
+	}
+
+	public Comment[] getComment() {
+		return vc;
+	}
+
+	public void close() throws java.io.IOException {
+		datasource.close();
+	}
+
+	class SeekableInputStream extends InputStream {
+		java.io.RandomAccessFile raf = null;
+		final String mode = "r";
+
+		SeekableInputStream(String file) throws java.io.IOException {
+			raf = new java.io.RandomAccessFile(file, mode);
+		}
+
+		public int read() throws java.io.IOException {
+			return raf.read();
+		}
+
+		public int read(byte[] buf) throws java.io.IOException {
+			return raf.read(buf);
+		}
+
+		public int read(byte[] buf, int s, int len) throws java.io.IOException {
+			return raf.read(buf, s, len);
+		}
+
+		public long skip(long n) throws java.io.IOException {
+			return (long) (raf.skipBytes((int) n));
+		}
+
+		public long getLength() throws java.io.IOException {
+			return raf.length();
+		}
+
+		public long tell() throws java.io.IOException {
+			return raf.getFilePointer();
+		}
+
+		public int available() throws java.io.IOException {
+			return (raf.length() == raf.getFilePointer()) ? 0 : 1;
+		}
+
+		public void close() throws java.io.IOException {
+			raf.close();
+		}
+
+		public synchronized void mark(int m) {
+		}
+
+		public synchronized void reset() throws java.io.IOException {
+		}
+
+		public boolean markSupported() {
+			return false;
+		}
+
+		public void seek(long pos) throws java.io.IOException {
+			raf.seek(pos);
+		}
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/OpenGLObjects.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/OpenGLObjects.java
index ebbad3e..623014d 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/OpenGLObjects.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/OpenGLObjects.java
@@ -29,85 +29,127 @@ import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGLVertexArray;
 class OpenGLObjects {
 
 	static class BufferGL implements IBufferGL {
-		
+
+		private static int hashGen = 0;
 		final WebGLBuffer ptr;
-		
+		final int hash;
+
 		BufferGL(WebGLBuffer ptr) {
 			this.ptr = ptr;
+			this.hash = ++hashGen;
+		}
+
+		public int hashCode() {
+			return hash;
 		}
 
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteBuffers(this);
 		}
-		
+
 	}
 
 	static class BufferArrayGL implements IBufferArrayGL {
-		
+
+		private static int hashGen = 0;
 		final WebGLVertexArray ptr;
-		
+		final int hash;
+
 		BufferArrayGL(WebGLVertexArray ptr) {
 			this.ptr = ptr;
+			this.hash = ++hashGen;
+		}
+
+		public int hashCode() {
+			return hash;
 		}
 
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteVertexArrays(this);
 		}
-		
+
 	}
 
 	static class TextureGL implements ITextureGL {
-		
+
+		private static int hashGen = 0;
 		final WebGLTexture ptr;
-		
+		final int hash;
+
 		TextureGL(WebGLTexture ptr) {
 			this.ptr = ptr;
+			this.hash = ++hashGen;
+		}
+
+		public int hashCode() {
+			return hash;
 		}
 
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteTextures(this);
 		}
-		
+
 	}
 
 	static class ProgramGL implements IProgramGL {
-		
+
+		private static int hashGen = 0;
 		final WebGLProgram ptr;
-		
+		final int hash;
+
 		ProgramGL(WebGLProgram ptr) {
 			this.ptr = ptr;
+			this.hash = ++hashGen;
+		}
+
+		public int hashCode() {
+			return hash;
 		}
 
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteProgram(this);
 		}
-		
+
 	}
 
 	static class UniformGL implements IUniformGL {
-		
+
+		private static int hashGen = 0;
 		final WebGLUniformLocation ptr;
-		
+		final int hash;
+
 		UniformGL(WebGLUniformLocation ptr) {
 			this.ptr = ptr;
+			this.hash = ++hashGen;
+		}
+
+		public int hashCode() {
+			return hash;
 		}
 
 		@Override
 		public void free() {
 		}
-		
+
 	}
 
 	static class ShaderGL implements IShaderGL {
-		
+
+		private static int hashGen = 0;
 		final WebGLShader ptr;
+		final int hash;
 		
 		ShaderGL(WebGLShader ptr) {
 			this.ptr = ptr;
+			this.hash = ++hashGen;
+		}
+
+		public int hashCode() {
+			return hash;
 		}
 
 		@Override
@@ -118,48 +160,69 @@ class OpenGLObjects {
 	}
 
 	static class FramebufferGL implements IFramebufferGL {
-		
+
+		private static int hashGen = 0;
 		final WebGLFramebuffer ptr;
+		final int hash;
 		
 		FramebufferGL(WebGLFramebuffer ptr) {
 			this.ptr = ptr;
+			this.hash = ++hashGen;
+		}
+
+		public int hashCode() {
+			return hash;
 		}
 
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteFramebuffer(this);
 		}
-		
+
 	}
 
 	static class RenderbufferGL implements IRenderbufferGL {
-		
+
+		private static int hashGen = 0;
 		final WebGLRenderbuffer ptr;
-		
+		final int hash;
+
 		RenderbufferGL(WebGLRenderbuffer ptr) {
 			this.ptr = ptr;
+			this.hash = ++hashGen;
+		}
+
+		public int hashCode() {
+			return hash;
 		}
 
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteRenderbuffer(this);
 		}
-		
+
 	}
 
 	static class QueryGL implements IQueryGL {
-		
+
+		private static int hashGen = 0;
 		final WebGLQuery ptr;
-		
+		final int hash;
+
 		QueryGL(WebGLQuery ptr) {
 			this.ptr = ptr;
+			this.hash = ++hashGen;
+		}
+
+		public int hashCode() {
+			return hash;
 		}
 
 		@Override
 		public void free() {
 			PlatformOpenGL._wglDeleteQueries(this);
 		}
-		
+
 	}
-	
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
index 98427d5..2e73745 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
@@ -1,5 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.internal;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -13,20 +15,25 @@ import org.teavm.jso.browser.Storage;
 import org.teavm.jso.browser.TimerHandler;
 import org.teavm.jso.browser.Window;
 import org.teavm.jso.canvas.CanvasRenderingContext2D;
+import org.teavm.jso.dom.css.CSSStyleDeclaration;
 import org.teavm.jso.dom.events.Event;
 import org.teavm.jso.dom.events.EventListener;
 import org.teavm.jso.dom.html.HTMLCanvasElement;
 import org.teavm.jso.dom.html.HTMLDocument;
+import org.teavm.jso.dom.html.HTMLElement;
 import org.teavm.jso.dom.html.HTMLInputElement;
 import org.teavm.jso.typedarrays.ArrayBuffer;
 
 import net.lax1dude.eaglercraft.v1_8.Base64;
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.EaglerArrayBufferAllocator;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.DebugConsoleWindow;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMBlobURLHandle;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMBlobURLManager;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
 
 /**
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -46,7 +53,18 @@ public class PlatformApplication {
 		if(url.indexOf(':') == -1) {
 			url = "http://" + url;
 		}
-		Window.current().open(url, "_blank", "noopener,noreferrer");
+		URI parsedURL;
+		try {
+			parsedURL = new URI(url);
+		}catch(URISyntaxException ex) {
+			PlatformRuntime.logger.error("Refusing to open invalid URL: {}", url);
+			return;
+		}
+		try {
+			Window.current().open(parsedURL.toString(), "_blank", "noopener,noreferrer");
+		}catch(Throwable t) {
+			PlatformRuntime.logger.error("Exception opening link!");
+		}
 	}
 
 	public static void setClipboard(String text) {
@@ -54,6 +72,10 @@ public class PlatformApplication {
 			setClipboard0(text);
 		}catch(Throwable t) {
 			PlatformRuntime.logger.error("Exception setting clipboard data");
+			try {
+				Window.prompt("Here is the text you're trying to copy:", text);
+			}catch(Throwable t2) {
+			}
 		}
 	}
 	
@@ -62,7 +84,12 @@ public class PlatformApplication {
 			return getClipboard0();
 		}catch(Throwable t) {
 			PlatformRuntime.logger.error("Exception getting clipboard data");
-			return "";
+			try {
+				String ret = Window.prompt("Please enter the text to paste:");
+				return ret != null ? ret : "";
+			}catch(Throwable t2) {
+				return "";
+			}
 		}
 	}
 
@@ -75,11 +102,11 @@ public class PlatformApplication {
 	private static native String getClipboard0();
 	
 	private static void getClipboard0(final AsyncCallback<String> cb) {
-		final long start = System.currentTimeMillis();
+		final long start = PlatformRuntime.steadyTimeMillis();
 		getClipboard1(new StupidFunctionResolveString() {
 			@Override
 			public void resolveStr(String s) {
-				if(System.currentTimeMillis() - start > 500l) {
+				if(PlatformRuntime.steadyTimeMillis() - start > 500l) {
 					PlatformInput.unpressCTRL = true;
 				}
 				cb.complete(s);
@@ -87,10 +114,10 @@ public class PlatformApplication {
 		});
 	}
 	
-	@JSBody(params = { "cb" }, script = "if(!window.navigator.clipboard || !window.navigator.clipboard.readText) cb(\"\"); else window.navigator.clipboard.readText().then(function(s) { cb(s); }, function(s) { cb(\"\"); });")
+	@JSBody(params = { "cb" }, script = "if(!navigator.clipboard) { cb(prompt(\"Please enter the text to paste:\") || \"\"); } else if (!navigator.clipboard.readText) cb(\"\"); else navigator.clipboard.readText().then(function(s) { cb(s); }, function(s) { cb(\"\"); });")
 	private static native void getClipboard1(StupidFunctionResolveString cb);
 	
-	@JSBody(params = { "str" }, script = "if(window.navigator.clipboard) window.navigator.clipboard.writeText(str);")
+	@JSBody(params = { "str" }, script = "if(navigator.clipboard) clipboard.writeText(str);")
 	private static native void setClipboard0(String str);
 	
 	public static void setLocalStorage(String name, byte[] data) {
@@ -100,11 +127,11 @@ public class PlatformApplication {
 	public static void setLocalStorage(String name, byte[] data, boolean hooks) {
 		IClientConfigAdapter adapter = PlatformRuntime.getClientConfigAdapter();
 		String eagName = adapter.getLocalStorageNamespace() + "." + name;
-		String b64 = Base64.encodeBase64String(data);
+		String b64 = data != null ? Base64.encodeBase64String(data) : null;
 		try {
 			Storage s = Window.current().getLocalStorage();
 			if(s != null) {
-				if(data != null) {
+				if(b64 != null) {
 					s.setItem(eagName, b64);
 				}else {
 					s.removeItem(eagName);
@@ -157,24 +184,49 @@ public class PlatformApplication {
 		}
 	}
 	
-	private static final DateFormat dateFormatSS = EagRuntime.fixDateFormat(new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss"));
+	private static final DateFormat dateFormatSS = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss");
 	
 	public static String saveScreenshot() {
+		PlatformOpenGL._wglBindFramebuffer(0x8D40, null);
+		int w = PlatformInput.getWindowWidth();
+		int h = PlatformInput.getWindowHeight();
+		ByteBuffer buf = PlatformRuntime.allocateByteBuffer(w * h * 4);
+		PlatformOpenGL._wglReadPixels(0, 0, w, h, 6408, 5121, buf);
+		for(int i = 3, l = buf.remaining(); i < l; i += 4) {
+			buf.put(i, (byte)0xFF);
+		}
 		String name = "screenshot_" + dateFormatSS.format(new Date()).toString() + ".png";
-		int w = PlatformRuntime.canvas.getWidth();
-		int h = PlatformRuntime.canvas.getHeight();
 		HTMLCanvasElement copyCanvas = (HTMLCanvasElement) Window.current().getDocument().createElement("canvas");
 		copyCanvas.setWidth(w);
 		copyCanvas.setHeight(h);
-		CanvasRenderingContext2D ctx = (CanvasRenderingContext2D) copyCanvas.getContext("2d");
-		ctx.drawImage(PlatformRuntime.canvas, 0, 0);
-		saveScreenshot(name, copyCanvas);
+		CanvasRenderingContext2D ctx = (CanvasRenderingContext2D) copyCanvas.getContext("2d", PlatformAssets.youEagler());
+		putImageData(ctx, EaglerArrayBufferAllocator.getDataView8(buf).getBuffer(), w, h);
+		PlatformRuntime.freeByteBuffer(buf);
+		downloadScreenshot(copyCanvas, name, PlatformRuntime.parent);
 		return name;
 	}
-	
-	@JSBody(params = { "name", "cvs" }, script = "var a=document.createElement(\"a\");a.href=cvs.toDataURL(\"image/png\");a.download=name;a.click();")
-	private static native void saveScreenshot(String name, HTMLCanvasElement cvs);
-	
+
+	@JSBody(params = { "ctx", "buffer", "w", "h" }, script = "var imgData = ctx.createImageData(w, h); var ww = w * 4; for(var i = 0; i < h; ++i) { imgData.data.set(new Uint8ClampedArray(buffer, (h - i - 1) * ww, ww), i * ww); } ctx.putImageData(imgData, 0, 0);")
+	private static native JSObject putImageData(CanvasRenderingContext2D ctx, ArrayBuffer buffer, int w, int h);
+
+	@JSBody(params = { "cvs", "name", "parentElement" }, script =
+			"var vigg = function(el, url){" +
+			"el.style.position = \"absolute\";" +
+			"el.style.left = \"0px\";" +
+			"el.style.top = \"0px\";" +
+			"el.style.zIndex = \"-100\";" +
+			"el.style.color = \"transparent\";" +
+			"el.innerText = \"Download Screenshot\";" +
+			"el.href = url;" +
+			"el.target = \"_blank\";" +
+			"el.download = name;" +
+			"parentElement.appendChild(el);" +
+			"setTimeout(function() { el.click();" +
+			"setTimeout(function() { parentElement.removeChild(el); }, 50);" +
+			"}, 50);" +
+			"}; setTimeout(function() { vigg(document.createElement(\"a\"), cvs.toDataURL(\"image/png\")); }, 50);")
+	private static native void downloadScreenshot(HTMLCanvasElement cvs, String name, HTMLElement parentElement);
+
 	public static void showPopup(final String msg) {
 		Window.setTimeout(new TimerHandler() {
 			@Override
@@ -205,16 +257,52 @@ public class PlatformApplication {
 
 	}
 
-	private static volatile boolean fileChooserHasResult = false;
-	private static volatile FileChooserResult fileChooserResultObject = null;
+	private static final int FILE_CHOOSER_IMPL_CORE = 0;
+	private static final int FILE_CHOOSER_IMPL_LEGACY = 1;
+	private static int fileChooserImpl = -1;
+	private static boolean fileChooserHasResult = false;
+	private static FileChooserResult fileChooserResultObject = null;
+	private static HTMLInputElement fileChooserElement = null;
+	private static HTMLElement fileChooserMobileElement = null;
 
 	@JSBody(params = { "inputElement", "callback" }, script = 
 			"if(inputElement.files.length > 0) {"
-			+ "const value = inputElement.files[0];"
+			+ "var eag = function(value){"
 			+ "value.arrayBuffer().then(function(arr){ callback(value.name, arr); })"
 			+ ".catch(function(){ callback(null, null); });"
-			+ "} else callback(null, null);")
-	private static native void getFileChooserResult(HTMLInputElement inputElement, FileChooserCallback callback);
+			+ "}; eag(inputElement.files[0]); } else callback(null, null);")
+	private static native void getFileChooserResultNew(HTMLInputElement inputElement, FileChooserCallback callback);
+
+	@JSBody(params = { "inputElement", "callback" }, script = 
+			"if(inputElement.files.length > 0) {"
+			+ "var eag = function(value, reader){"
+			+ "reader.addEventListener(\"loadend\",function(evt){ callback(value.name, reader.result); });"
+			+ "reader.addEventListener(\"error\",function(evt){ callback(null, null); });"
+			+ "reader.readAsArrayBuffer(value);"
+			+ "}; eag(inputElement.files[0], new FileReader()); } else callback(null, null);")
+	private static native void getFileChooserResultLegacy(HTMLInputElement inputElement, FileChooserCallback callback);
+
+	private static void getFileChooserResult(HTMLInputElement inputElement, FileChooserCallback callback) {
+		if(fileChooserImpl == -1) {
+			fileChooserImpl = getFileChooserImpl();
+			if(fileChooserImpl == FILE_CHOOSER_IMPL_LEGACY) {
+				PlatformRuntime.logger.info("Note: using legacy FileReader implementation because File.prototype.arrayBuffer() is not supported");
+			}
+		}
+		switch(fileChooserImpl) {
+		case FILE_CHOOSER_IMPL_CORE:
+			getFileChooserResultNew(inputElement, callback);
+			break;
+		case FILE_CHOOSER_IMPL_LEGACY:
+			getFileChooserResultLegacy(inputElement, callback);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	@JSBody(params = { }, script = "return (typeof File.prototype.arrayBuffer === \"function\") ? 0 : 1;")
+	private static native int getFileChooserImpl();
 
 	@JSBody(params = { "inputElement", "value" }, script = "inputElement.accept = value;")
 	private static native void setAcceptSelection(HTMLInputElement inputElement, String value);
@@ -223,21 +311,106 @@ public class PlatformApplication {
 	private static native void setMultipleSelection(HTMLInputElement inputElement, boolean enable);
 
 	public static void displayFileChooser(String mime, String ext) {
-		final HTMLInputElement inputElement = (HTMLInputElement) Window.current().getDocument().createElement("input");
-		inputElement.setType("file");
-		if(mime == null) {
-			setAcceptSelection(inputElement, "." + ext);
-		}else {
-			setAcceptSelection(inputElement, mime);
-		}
-		setMultipleSelection(inputElement, false);
-		inputElement.addEventListener("change", new EventListener<Event>() {
-			@Override
-			public void handleEvent(Event evt) {
-				getFileChooserResult(inputElement, FileChooserCallbackImpl.instance);
+		clearFileChooserResult();
+		final HTMLDocument doc = PlatformRuntime.doc != null ? PlatformRuntime.doc : Window.current().getDocument();
+		if(PlatformInput.isLikelyMobileBrowser) {
+			final HTMLElement element = fileChooserMobileElement = doc.createElement("div");
+			element.getClassList().add("_eaglercraftX_mobile_file_chooser_popup");
+			CSSStyleDeclaration decl = element.getStyle();
+			decl.setProperty("position", "absolute");
+			decl.setProperty("background-color", "white");
+			decl.setProperty("font-family", "sans-serif");
+			decl.setProperty("top", "10%");
+			decl.setProperty("left", "10%");
+			decl.setProperty("right", "10%");
+			decl.setProperty("border", "5px double black");
+			decl.setProperty("padding", "15px");
+			decl.setProperty("text-align", "left");
+			decl.setProperty("font-size", "20px");
+			decl.setProperty("user-select", "none");
+			decl.setProperty("z-index", "150");
+			final HTMLElement fileChooserTitle = doc.createElement("h3");
+			fileChooserTitle.appendChild(doc.createTextNode("File Chooser"));
+			element.appendChild(fileChooserTitle);
+			final HTMLElement inputElementContainer = doc.createElement("p");
+			final HTMLInputElement inputElement = fileChooserElement = (HTMLInputElement) doc.createElement("input");
+			inputElement.setType("file");
+			if(mime == null) {
+				setAcceptSelection(inputElement, "." + ext);
+			}else {
+				setAcceptSelection(inputElement, mime);
 			}
-		});
-		inputElement.click();
+			setMultipleSelection(inputElement, false);
+			inputElementContainer.appendChild(inputElement);
+			element.appendChild(inputElementContainer);
+			final HTMLElement fileChooserButtons = doc.createElement("p");
+			final HTMLElement fileChooserButtonCancel = doc.createElement("button");
+			fileChooserButtonCancel.getClassList().add("_eaglercraftX_mobile_file_chooser_btn_cancel");
+			fileChooserButtonCancel.getStyle().setProperty("font-size", "1.0em");
+			fileChooserButtonCancel.addEventListener("click", new EventListener<Event>() {
+				@Override
+				public void handleEvent(Event evt) {
+					if(fileChooserMobileElement == element) {
+						PlatformRuntime.parent.removeChild(element);
+						fileChooserMobileElement = null;
+						fileChooserElement = null;
+					}
+				}
+			});
+			fileChooserButtonCancel.appendChild(doc.createTextNode("Cancel"));
+			fileChooserButtons.appendChild(fileChooserButtonCancel);
+			fileChooserButtons.appendChild(doc.createTextNode(" "));
+			final HTMLElement fileChooserButtonDone = doc.createElement("button");
+			fileChooserButtonDone.getClassList().add("_eaglercraftX_mobile_file_chooser_btn_done");
+			fileChooserButtonDone.getStyle().setProperty("font-size", "1.0em");
+			fileChooserButtonDone.getStyle().setProperty("font-weight", "bold");
+			fileChooserButtonDone.addEventListener("click", new EventListener<Event>() {
+				@Override
+				public void handleEvent(Event evt) {
+					if(fileChooserMobileElement == element) {
+						getFileChooserResult(inputElement, FileChooserCallbackImpl.instance);
+						PlatformRuntime.parent.removeChild(element);
+						fileChooserMobileElement = null;
+						fileChooserElement = null;
+					}
+				}
+			});
+			fileChooserButtonDone.appendChild(doc.createTextNode("Done"));
+			fileChooserButtons.appendChild(fileChooserButtonDone);
+			element.appendChild(fileChooserButtons);
+			PlatformRuntime.parent.appendChild(element);
+		}else {
+			final HTMLInputElement inputElement = fileChooserElement = (HTMLInputElement) doc.createElement("input");
+			inputElement.setType("file");
+			CSSStyleDeclaration decl = inputElement.getStyle();
+			decl.setProperty("position", "absolute");
+			decl.setProperty("left", "0px");
+			decl.setProperty("top", "0px");
+			decl.setProperty("z-index", "-100");
+			if(mime == null) {
+				setAcceptSelection(inputElement, "." + ext);
+			}else {
+				setAcceptSelection(inputElement, mime);
+			}
+			setMultipleSelection(inputElement, false);
+			inputElement.addEventListener("change", new EventListener<Event>() {
+				@Override
+				public void handleEvent(Event evt) {
+					if(fileChooserElement == inputElement) {
+						getFileChooserResult(inputElement, FileChooserCallbackImpl.instance);
+						PlatformRuntime.parent.removeChild(inputElement);
+						fileChooserElement = null;
+					}
+				}
+			});
+			PlatformRuntime.parent.appendChild(inputElement);
+			Window.setTimeout(new TimerHandler() {
+				@Override
+				public void onTimer() {
+					inputElement.click();
+				}
+			}, 50);
+		}
 	}
 
 	public static boolean fileChooserHasResult() {
@@ -261,16 +434,16 @@ public class PlatformApplication {
 	private static native void documentWrite(HTMLDocument doc, String str);
 
 	public static void openCreditsPopup(String text) {
-		Window currentWin = Window.current();
+		Window currentWin = PlatformRuntime.win;
 		
-		int w = (int)(850 * currentWin.getDevicePixelRatio());
-		int h = (int)(700 * currentWin.getDevicePixelRatio());
+		int w = (int)(850 * PlatformInput.getDPI());
+		int h = (int)(700 * PlatformInput.getDPI());
 		
 		int x = (currentWin.getScreen().getWidth() - w) / 2;
 		int y = (currentWin.getScreen().getHeight() - h) / 2;
 		
 		Window newWin = Window.current().open("", "_blank", "top=" + y + ",left=" + x + ",width=" + w + ",height=" + h + ",menubar=0,status=0,titlebar=0,toolbar=0");
-		if(newWin == null) {
+		if(newWin == null || TeaVMUtils.isNotTruthy(newWin)) {
 			Window.alert("ERROR: Popup blocked!\n\nPlease make sure you have popups enabled for this site!");
 			return;
 		}
@@ -285,17 +458,48 @@ public class PlatformApplication {
 	public static void clearFileChooserResult() {
 		fileChooserHasResult = false;
 		fileChooserResultObject = null;
+		if(fileChooserMobileElement != null) {
+			PlatformRuntime.parent.removeChild(fileChooserMobileElement);
+			fileChooserMobileElement = null;
+			fileChooserElement = null;
+		}else if(fileChooserElement != null) {
+			PlatformRuntime.parent.removeChild(fileChooserElement);
+			fileChooserElement = null;
+		}
 	}
 
-	@JSBody(params = { "name", "buf" }, script =
-			"var hr = window.URL.createObjectURL(new Blob([buf], {type: \"octet/stream\"}));" +
-			"var a = document.createElement(\"a\");" +
-			"a.href = hr; a.download = name; a.click();" +
-			"window.URL.revokeObjectURL(hr);")
-	private static final native void downloadBytesImpl(String str, ArrayBuffer buf);
+	@JSFunctor
+	private static interface DownloadBytesBlobURLRevoke extends JSObject {
+		void call();
+	}
 
-	public static final void downloadFileWithName(String str, byte[] dat) {
-		downloadBytesImpl(str, TeaVMUtils.unwrapArrayBuffer(dat));
+	@JSBody(params = { "name", "url", "revokeFunc", "parentElement" }, script =
+			"var vigg = function(el){" +
+			"el.style.position = \"absolute\";" +
+			"el.style.left = \"0px\";" +
+			"el.style.top = \"0px\";" +
+			"el.style.zIndex = \"-100\";" +
+			"el.style.color = \"transparent\";" +
+			"el.innerText = \"Download File\";" +
+			"el.href = url;" +
+			"el.target = \"_blank\";" +
+			"el.download = name;" +
+			"parentElement.appendChild(el);" +
+			"setTimeout(function() { el.click();" +
+			"setTimeout(function() { parentElement.removeChild(el); }, 50);" +
+			"setTimeout(function() { revokeFunc(); }, 60000);" +
+			"}, 50);" +
+			"}; vigg(document.createElement(\"a\"));")
+	private static native void downloadBytesImpl(String str, String url, DownloadBytesBlobURLRevoke revokeFunc, HTMLElement parentElement);
+
+	public static void downloadFileWithName(String str, byte[] dat) {
+		TeaVMBlobURLHandle blobHandle = TeaVMBlobURLManager.registerNewURLByte(dat, "application/octet-stream");
+		downloadBytesImpl(str, blobHandle.toExternalForm(), blobHandle::release, PlatformRuntime.parent);
+	}
+
+	public static void downloadFileWithNameTeaVM(String str, ArrayBuffer dat) {
+		TeaVMBlobURLHandle blobHandle = TeaVMBlobURLManager.registerNewURLArrayBuffer(dat, "application/octet-stream");
+		downloadBytesImpl(str, blobHandle.toExternalForm(), blobHandle::release, PlatformRuntime.parent);
 	}
 
 	public static void showDebugConsole() {
@@ -312,4 +516,5 @@ public class PlatformApplication {
 
 	@JSBody(params = { "str" }, script = "window.minecraftServer = str;")
 	public static native void setMCServerWindowGlobal(String str);
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAssets.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAssets.java
index 6d139ce..96b6774 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAssets.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAssets.java
@@ -20,6 +20,8 @@ import org.teavm.jso.typedarrays.Uint8ClampedArray;
 
 import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMBlobURLHandle;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMBlobURLManager;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
 import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
@@ -41,10 +43,34 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 public class PlatformAssets {
 	
 	private static final byte[] MISSING_FILE = new byte[0];
+
+	static Map<String,byte[]> assets = new HashMap<>();
+
+	public static boolean getResourceExists(String path) {
+		if(path.startsWith("/")) {
+			path = path.substring(1);
+		}
+		byte[] ret = assets.get(path);
+		if(ret != null && ret != MISSING_FILE) {
+			return true;
+		}else {
+			if(path.startsWith("assets/minecraft/lang/") && !path.endsWith(".mcmeta")) {
+				ArrayBuffer file = PlatformRuntime.downloadRemoteURI(
+						ClientMain.configLocalesFolder + "/" + path.substring(22));
+				if(file != null) {
+					assets.put(path, TeaVMUtils.wrapByteArrayBuffer(file));
+					return true;
+				}else {
+					assets.put(path, MISSING_FILE);
+					return false;
+				}
+			}else {
+				return false;
+			}
+		}
+	}
 	
-	static final Map<String,byte[]> assets = new HashMap();
-	
-	public static final byte[] getResourceBytes(String path) {
+	public static byte[] getResourceBytes(String path) {
 		if(path.startsWith("/")) {
 			path = path.substring(1);
 		}
@@ -52,7 +78,7 @@ public class PlatformAssets {
 		if(data == null && path.startsWith("assets/minecraft/lang/") && !path.endsWith(".mcmeta")) {
 			ArrayBuffer file = PlatformRuntime.downloadRemoteURI(
 					ClientMain.configLocalesFolder + "/" + path.substring(22));
-			if(file != null && file.getByteLength() > 0) {
+			if(file != null) {
 				data = TeaVMUtils.wrapByteArrayBuffer(file);
 				assets.put(path, data);
 				return data;
@@ -65,10 +91,14 @@ public class PlatformAssets {
 		}
 	}
 	
-	public static final ImageData loadImageFile(InputStream data) {
+	public static ImageData loadImageFile(InputStream data) {
+		return loadImageFile(data, "image/png");
+	}
+	
+	public static ImageData loadImageFile(InputStream data, String mime) {
 		byte[] b = EaglerInputStream.inputStreamToBytesQuiet(data);
 		if(b != null) {
-			return loadImageFile(b);
+			return loadImageFile(b, mime);
 		}else {
 			return null;
 		}
@@ -78,21 +108,22 @@ public class PlatformAssets {
 	private static CanvasRenderingContext2D imageLoadContext = null;
 	
 	public static ImageData loadImageFile(byte[] data) {
-		return loadImageFile(TeaVMUtils.unwrapArrayBuffer(data));
+		return loadImageFile(data, "image/png");
 	}
 	
 	@JSBody(params = { }, script = "return { willReadFrequently: true };")
-	public static native JSObject youEagler();
+	static native JSObject youEagler();
 	
 	@JSBody(params = { "ctx" }, script = "ctx.imageSmoothingEnabled = false;")
 	private static native void disableImageSmoothing(CanvasRenderingContext2D ctx);
 	
 	@Async
-	private static native ImageData loadImageFile(ArrayBuffer data);
+	public static native ImageData loadImageFile(byte[] data, String mime);
 	
-	private static void loadImageFile(ArrayBuffer data, final AsyncCallback<ImageData> ret) {
+	private static void loadImageFile(byte[] data, String mime, final AsyncCallback<ImageData> ret) {
 		final Document doc = Window.current().getDocument();
 		final HTMLImageElement toLoad = (HTMLImageElement) doc.createElement("img");
+		final TeaVMBlobURLHandle[] src = new TeaVMBlobURLHandle[1];
 		toLoad.addEventListener("load", new EventListener<Event>() {
 			@Override
 			public void handleEvent(Event evt) {
@@ -114,7 +145,7 @@ public class PlatformAssets {
 				org.teavm.jso.canvas.ImageData pxlsDat = imageLoadContext.getImageData(0, 0, toLoad.getWidth(), toLoad.getHeight());
 				Uint8ClampedArray pxls = pxlsDat.getData();
 				int totalPixels = pxlsDat.getWidth() * pxlsDat.getHeight();
-				TeaVMUtils.freeDataURL(toLoad.getSrc());
+				TeaVMBlobURLManager.releaseURL(src[0]);
 				if(pxls.getByteLength() < totalPixels << 2) {
 					ret.complete(null);
 					return;
@@ -125,16 +156,19 @@ public class PlatformAssets {
 		toLoad.addEventListener("error", new EventListener<Event>() {
 			@Override
 			public void handleEvent(Event evt) {
-				TeaVMUtils.freeDataURL(toLoad.getSrc());
+				TeaVMBlobURLManager.releaseURL(src[0]);
 				ret.complete(null);
 			}
 		});
-		String src = TeaVMUtils.getDataURL(data, "image/png");
-		if(src != null) {
-			toLoad.setSrc(src);
+		src[0] = TeaVMBlobURLManager.registerNewURLByte(data, mime);
+		if(src[0] != null) {
+			toLoad.setSrc(src[0].toExternalForm());
 		}else {
 			ret.complete(null);
 		}
 	}
-	
+
+	public static void freeAssetRepoTeaVM() {
+		assets = new HashMap<>();
+	}
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java
index e240656..fa1c9a6 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java
@@ -2,16 +2,17 @@ package net.lax1dude.eaglercraft.v1_8.internal;
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.SoundCategory;
 import org.teavm.interop.Async;
 import org.teavm.interop.AsyncCallback;
+import org.teavm.jso.JSBody;
 import org.teavm.jso.JSObject;
 import org.teavm.jso.dom.events.EventListener;
 import org.teavm.jso.typedarrays.ArrayBuffer;
-import org.teavm.jso.typedarrays.Uint8Array;
+import org.teavm.jso.typedarrays.Int8Array;
 import org.teavm.jso.webaudio.AudioBuffer;
 import org.teavm.jso.webaudio.AudioBufferSourceNode;
 import org.teavm.jso.webaudio.AudioContext;
@@ -24,13 +25,16 @@ import org.teavm.jso.webaudio.MediaStream;
 import org.teavm.jso.webaudio.MediaStreamAudioDestinationNode;
 import org.teavm.jso.webaudio.PannerNode;
 
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.JOrbisAudioBufferDecoder;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMClientConfigAdapter;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.minecraft.util.MathHelper;
 
 /**
- * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -49,10 +53,21 @@ public class PlatformAudio {
 	static final Logger logger = LogManager.getLogger("BrowserAudio");
 	
 	static AudioContext audioctx = null;
-	static MediaStreamAudioDestinationNode recDest = null;
-	private static final Map<String, BrowserAudioResource> soundCache = new HashMap();
-	
+	static MediaStreamAudioDestinationNode recDestNode = null;
+	static MediaStream recDestMediaStream = null;
+	static AudioBuffer silence = null;
+	static AudioBufferSourceNode recDestSilenceNode = null;
+	static GainNode micRecGain = null;
+	static GainNode gameRecGain = null;
+	private static final Map<String, BrowserAudioResource> soundCache = new HashMap<>();
+	private static final List<BrowserAudioHandle> activeSounds = new LinkedList<>();
+
 	private static long cacheFreeTimer = 0l;
+	private static long activeFreeTimer = 0l;
+	private static boolean oggSupport = false;
+	private static boolean loadViaAudioBufferSupport = false;
+	private static boolean loadViaWAV32FSupport = false;
+	private static boolean loadViaWAV16Support = false;
 	
 	protected static class BrowserAudioResource implements IAudioResource {
 		
@@ -105,7 +120,7 @@ public class PlatformAudio {
 			if(isEnded) {
 				isEnded = false;
 				AudioBufferSourceNode src = audioctx.createBufferSource();
-				resource.cacheHit = System.currentTimeMillis();
+				resource.cacheHit = PlatformRuntime.steadyTimeMillis();
 				src.setBuffer(resource.buffer);
 				src.getPlaybackRate().setValue(pitch);
 				source.disconnect();
@@ -166,44 +181,183 @@ public class PlatformAudio {
 	}
 	
 	static void initialize() {
+		oggSupport = false;
+		loadViaAudioBufferSupport = false;
+		loadViaWAV32FSupport = false;
+		loadViaWAV16Support = false;
 		
 		try {
 			audioctx = AudioContext.create();
-			recDest = audioctx.createMediaStreamDestination();
 		}catch(Throwable t) {
-			throw new PlatformRuntime.RuntimeInitializationFailureException("Could not initialize audio context!", t);
+			audioctx = null;
+			logger.error("Could not initialize audio context!");
+			logger.error(t);
+			return;
+		}
+		
+		detectOGGSupport();
+		
+		if(!oggSupport) {
+			loadViaAudioBufferSupport = detectLoadViaAudioBufferSupport(audioctx);
+			if(!loadViaAudioBufferSupport) {
+				logger.warn("Missing AudioContext buffer from Float32Array support, attempting to use WAV files as a container to load raw PCM data");
+				detectWAVFallbackSupport();
+				if(!loadViaWAV32FSupport && !loadViaWAV16Support) {
+					try {
+						audioctx.close();
+					}catch(Throwable t) {
+					}
+					audioctx = null;
+					logger.error("Audio context is missing some required features!");
+				}
+			}
 		}
 		
 		PlatformInput.clearEvenBuffers();
 		
 	}
 
-	private static GainNode micGain;
+	@JSBody(params = { "ctx" }, script = "var tmpBuf = ctx.createBuffer(2, 16, 16000); return (typeof tmpBuf.copyToChannel === \"function\");")
+	private static native boolean detectLoadViaAudioBufferSupport(AudioContext ctx);
 
-	public static void setMicVol(float vol) {
-		if (micGain == null) return;
-		micGain.getGain().setValue(vol);
-	}
+	private static void detectOGGSupport() {
+		byte[] fileData = EagRuntime.getRequiredResourceBytes("/assets/eagler/audioctx_test_ogg.dat");
 
-	protected static void initRecDest() {
-		AudioBufferSourceNode absn = audioctx.createBufferSource();
-		AudioBuffer ab = audioctx.createBuffer(1, 1, 48000);
-		ab.copyToChannel(new float[] { 0 }, 0);
-		absn.setBuffer(ab);
-		absn.setLoop(true);
-		absn.start();
-		absn.connect(recDest);
-		MediaStream mic = PlatformRuntime.getMic();
-		if (mic != null) {
-			micGain = audioctx.createGain();
-			micGain.getGain().setValue(Minecraft.getMinecraft().gameSettings.getSoundLevel(SoundCategory.VOICE));
-			audioctx.createMediaStreamSource(mic).connect(micGain);
-			micGain.connect(recDest);
+		if(((TeaVMClientConfigAdapter)PlatformRuntime.getClientConfigAdapter()).isUseJOrbisAudioDecoderTeaVM()) {
+			logger.info("Note: Using embedded JOrbis OGG decoder");
+			oggSupport = false;
+		}else {
+			try {
+				Int8Array arr = Int8Array.create(fileData.length);
+				arr.set(TeaVMUtils.unwrapByteArray(fileData), 0);
+				AudioBuffer buffer = decodeAudioBrowserAsync(arr.getBuffer(), null);
+				if(buffer == null || buffer.getLength() == 0) {
+					throw new RuntimeException();
+				}
+				oggSupport = true;
+			}catch(Throwable t) {
+				oggSupport = false;
+				logger.error("OGG file support detected as false! Using embedded JOrbis OGG decoder");
+			}
 		}
 	}
 
-	protected static MediaStream getRecStream() {
-		return recDest.getStream();
+	private static void detectWAVFallbackSupport() {
+		byte[] fileData = EagRuntime.getRequiredResourceBytes("/assets/eagler/audioctx_test_wav32f.dat");
+		
+		try {
+			Int8Array arr = Int8Array.create(fileData.length);
+			arr.set(TeaVMUtils.unwrapByteArray(fileData), 0);
+			AudioBuffer buffer = decodeAudioBrowserAsync(arr.getBuffer(), null);
+			if(buffer == null || buffer.getLength() == 0) {
+				throw new RuntimeException();
+			}
+			loadViaWAV32FSupport = true;
+			return;
+		}catch(Throwable t) {
+			loadViaWAV32FSupport = false;
+			logger.error("Could not load a 32-bit floating point WAV file, trying to use 16-bit integers");
+		}
+		
+		fileData = EagRuntime.getRequiredResourceBytes("/assets/eagler/audioctx_test_wav16.dat");
+		
+		try {
+			Int8Array arr = Int8Array.create(fileData.length);
+			arr.set(TeaVMUtils.unwrapByteArray(fileData), 0);
+			AudioBuffer buffer = decodeAudioBrowserAsync(arr.getBuffer(), null);
+			if(buffer == null || buffer.getLength() == 0) {
+				throw new RuntimeException();
+			}
+			loadViaWAV16Support = true;
+			return;
+		}catch(Throwable t) {
+			loadViaWAV16Support = false;
+			logger.error("Could not load a 16-bit integer WAV file, this browser is not supported");
+		}
+	}
+
+	static MediaStream initRecordingStream(float gameVol, float micVol) {
+		if(recDestMediaStream != null) {
+			return recDestMediaStream;
+		}
+		try {
+			if(silence == null) {
+				silence = audioctx.createBuffer(1, 1, 48000);
+				silence.copyToChannel(new float[] { 0 }, 0);
+			}
+			recDestNode = audioctx.createMediaStreamDestination();
+			recDestSilenceNode = audioctx.createBufferSource();
+			recDestSilenceNode.setBuffer(silence);
+			recDestSilenceNode.setLoop(true);
+			recDestSilenceNode.start();
+			recDestSilenceNode.connect(recDestNode);
+			if(micVol > 0.0f) {
+				MediaStream mic = PlatformScreenRecord.getMic();
+				if (mic != null) {
+					micRecGain = audioctx.createGain();
+					micRecGain.getGain().setValue(micVol);
+					audioctx.createMediaStreamSource(mic).connect(micRecGain);
+					micRecGain.connect(recDestNode);
+				}
+			}
+			gameRecGain = audioctx.createGain();
+			gameRecGain.getGain().setValue(gameVol);
+			synchronized(activeSounds) {
+				for(BrowserAudioHandle handle : activeSounds) {
+					if(handle.panner != null) {
+						handle.panner.connect(gameRecGain);
+					}else {
+						handle.gain.connect(gameRecGain);
+					}
+				}
+			}
+			PlatformVoiceClient.addRecordingDest(gameRecGain);
+			gameRecGain.connect(recDestNode);
+			recDestMediaStream = recDestNode.getStream();
+			return recDestMediaStream;
+		}catch(Throwable t) {
+			destroyRecordingStream();
+			throw t;
+		}
+	}
+
+	static void destroyRecordingStream() {
+		if(recDestSilenceNode != null) {
+			try {
+				recDestSilenceNode.disconnect();
+			}catch(Throwable t) {
+			}
+			recDestSilenceNode = null;
+		}
+		if(micRecGain != null) {
+			try {
+				micRecGain.disconnect();
+			}catch(Throwable t) {
+			}
+			micRecGain = null;
+		}
+		if(gameRecGain != null) {
+			try {
+				gameRecGain.disconnect();
+			}catch(Throwable t) {
+			}
+			synchronized(activeSounds) {
+				for(BrowserAudioHandle handle : activeSounds) {
+					try {
+						if(handle.panner != null) {
+							handle.panner.disconnect(gameRecGain);
+						}else {
+							handle.gain.disconnect(gameRecGain);
+						}
+					}catch(Throwable t) {
+					}
+				}
+			}
+			PlatformVoiceClient.removeRecordingDest(gameRecGain);
+			gameRecGain = null;
+		}
+		recDestNode = null;
+		recDestMediaStream = null;
 	}
 
 	public static IAudioResource loadAudioData(String filename, boolean holdInCache) {
@@ -214,7 +368,7 @@ public class PlatformAudio {
 		if(buffer == null) {
 			byte[] file = PlatformAssets.getResourceBytes(filename);
 			if(file == null) return null;
-			buffer = new BrowserAudioResource(decodeAudioAsync(TeaVMUtils.unwrapArrayBuffer(file), filename));
+			buffer = new BrowserAudioResource(decodeAudioData(file, filename));
 			if(holdInCache) {
 				synchronized(soundCache) {
 					soundCache.put(filename, buffer);
@@ -222,7 +376,7 @@ public class PlatformAudio {
 			}
 		}
 		if(buffer.buffer != null) {
-			buffer.cacheHit = System.currentTimeMillis();
+			buffer.cacheHit = PlatformRuntime.steadyTimeMillis();
 			return buffer;
 		}else {
 			return null;
@@ -241,9 +395,7 @@ public class PlatformAudio {
 		if(buffer == null) {
 			byte[] file = loader.loadFile(filename);
 			if(file == null) return null;
-			Uint8Array buf = Uint8Array.create(file.length);
-			buf.set(file);
-			buffer = new BrowserAudioResource(decodeAudioAsync(buf.getBuffer(), filename));
+			buffer = new BrowserAudioResource(decodeAudioData(file, filename));
 			if(holdInCache) {
 				synchronized(soundCache) {
 					soundCache.put(filename, buffer);
@@ -251,17 +403,40 @@ public class PlatformAudio {
 			}
 		}
 		if(buffer.buffer != null) {
-			buffer.cacheHit = System.currentTimeMillis();
+			buffer.cacheHit = PlatformRuntime.steadyTimeMillis();
 			return buffer;
 		}else {
 			return null;
 		}
 	}
 	
-	@Async
-	public static native AudioBuffer decodeAudioAsync(ArrayBuffer buffer, String errorFileName);
+	private static AudioBuffer decodeAudioData(byte[] data, String errorFileName) {
+		if(data == null) {
+			return null;
+		}
+		if(oggSupport) {
+			// browsers complain if we don't copy the array
+			Int8Array arr = Int8Array.create(data.length);
+			arr.set(TeaVMUtils.unwrapByteArray(data), 0);
+			return decodeAudioBrowserAsync(arr.getBuffer(), errorFileName);
+		}else {
+			if(data.length > 4 && data[0] == (byte)0x4F && data[1] == (byte)0x67 && data[2] == (byte)0x67 && data[3] == (byte)0x53) {
+				return JOrbisAudioBufferDecoder.decodeAudioJOrbis(audioctx, data, errorFileName,
+						loadViaAudioBufferSupport ? JOrbisAudioBufferDecoder.LOAD_VIA_AUDIOBUFFER
+								: (loadViaWAV32FSupport ? JOrbisAudioBufferDecoder.LOAD_VIA_WAV32F
+										: JOrbisAudioBufferDecoder.LOAD_VIA_WAV16));
+			} else {
+				Int8Array arr = Int8Array.create(data.length);
+				arr.set(TeaVMUtils.unwrapByteArray(data), 0);
+				return decodeAudioBrowserAsync(arr.getBuffer(), errorFileName);
+			}
+		}
+	}
 	
-	private static void decodeAudioAsync(ArrayBuffer buffer, final String errorFileName, final AsyncCallback<AudioBuffer> cb) {
+	@Async
+	public static native AudioBuffer decodeAudioBrowserAsync(ArrayBuffer buffer, String errorFileName);
+	
+	private static void decodeAudioBrowserAsync(ArrayBuffer buffer, final String errorFileName, final AsyncCallback<AudioBuffer> cb) {
 		audioctx.decodeAudioData(buffer, new DecodeSuccessCallback() {
 			@Override
 			public void onSuccess(AudioBuffer decodedData) {
@@ -270,14 +445,16 @@ public class PlatformAudio {
 		}, new DecodeErrorCallback() {
 			@Override
 			public void onError(JSObject error) {
-				logger.error("Could not load audio: {}", errorFileName);
+				if(errorFileName != null) {
+					logger.error("Could not load audio: {}", errorFileName);
+				}
 				cb.complete(null);
 			}
 		});
 	}
 
 	public static void clearAudioCache() {
-		long millis = System.currentTimeMillis();
+		long millis = PlatformRuntime.steadyTimeMillis();
 		if(millis - cacheFreeTimer > 30000l) {
 			cacheFreeTimer = millis;
 			synchronized(soundCache) {
@@ -289,22 +466,36 @@ public class PlatformAudio {
 				}
 			}
 		}
+		if(millis - activeFreeTimer > 700l) {
+			activeFreeTimer = millis;
+			synchronized(activeSounds) {
+				Iterator<BrowserAudioHandle> itr = activeSounds.iterator();
+				while(itr.hasNext()) {
+					if(itr.next().shouldFree()) {
+						itr.remove();
+					}
+				}
+			}
+		}
 	}
 
 	public static void flushAudioCache() {
 		synchronized(soundCache) {
 			soundCache.clear();
 		}
+		synchronized(activeSounds) {
+			activeSounds.clear();
+		}
 	}
 	
 	public static boolean available() {
-		return true; // this is not used
+		return audioctx != null;
 	}
 	
 	public static IAudioHandle beginPlayback(IAudioResource track, float x, float y, float z,
 			float volume, float pitch) {
 		BrowserAudioResource internalTrack = (BrowserAudioResource) track;
-		internalTrack.cacheHit = System.currentTimeMillis();
+		internalTrack.cacheHit = PlatformRuntime.steadyTimeMillis();
 		
 		AudioBufferSourceNode src = audioctx.createBufferSource();
 		src.setBuffer(internalTrack.buffer);
@@ -331,16 +522,22 @@ public class PlatformAudio {
 		src.connect(panner);
 		panner.connect(gain);
 		gain.connect(audioctx.getDestination());
-		gain.connect(recDest);
+		if(gameRecGain != null) {
+			gain.connect(gameRecGain);
+		}
 
 		src.start();
 		
-		return new BrowserAudioHandle(internalTrack, src, panner, gain, pitch);
+		BrowserAudioHandle ret = new BrowserAudioHandle(internalTrack, src, panner, gain, pitch);
+		synchronized(activeSounds) {
+			activeSounds.add(ret);
+		}
+		return ret;
 	}
 
 	public static IAudioHandle beginPlaybackStatic(IAudioResource track, float volume, float pitch) {
 		BrowserAudioResource internalTrack = (BrowserAudioResource) track;
-		internalTrack.cacheHit = System.currentTimeMillis();
+		internalTrack.cacheHit = PlatformRuntime.steadyTimeMillis();
 		
 		AudioBufferSourceNode src = audioctx.createBufferSource();
 		src.setBuffer(internalTrack.buffer);
@@ -353,11 +550,17 @@ public class PlatformAudio {
 		
 		src.connect(gain);
 		gain.connect(audioctx.getDestination());
-		gain.connect(recDest);
+		if(gameRecGain != null) {
+			gain.connect(gameRecGain);
+		}
 		
 		src.start();
 		
-		return new BrowserAudioHandle(internalTrack, src, null, gain, pitch);
+		BrowserAudioHandle ret = new BrowserAudioHandle(internalTrack, src, null, gain, pitch);
+		synchronized(activeSounds) {
+			activeSounds.add(ret);
+		}
+		return ret;
 	}
 
 	public static void setListener(float x, float y, float z, float pitchDegrees, float yawDegrees) {
@@ -369,5 +572,19 @@ public class PlatformAudio {
 		l.setPosition(x, y, z);
 		l.setOrientation(-var3 * var4, -var5, -var2 * var4, 0.0f, 1.0f, 0.0f);
 	}
+
+	static void destroy() {
+		soundCache.clear();
+		if(audioctx != null) {
+			audioctx.close();
+			audioctx = null;
+			recDestNode = null;
+			recDestMediaStream = null;
+			silence = null;
+			recDestSilenceNode = null;
+			micRecGain = null;
+			gameRecGain = null;
+		}
+	}
 	
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
index cf1eea9..439b002 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
@@ -1,29 +1,9 @@
 package net.lax1dude.eaglercraft.v1_8.internal;
 
-import org.teavm.interop.Async;
-import org.teavm.interop.AsyncCallback;
-import org.teavm.jso.JSBody;
-import org.teavm.jso.JSObject;
-import org.teavm.jso.dom.events.EventListener;
-import org.teavm.jso.indexeddb.EventHandler;
-import org.teavm.jso.indexeddb.IDBCountRequest;
-import org.teavm.jso.indexeddb.IDBCursor;
-import org.teavm.jso.indexeddb.IDBCursorRequest;
-import org.teavm.jso.indexeddb.IDBDatabase;
-import org.teavm.jso.indexeddb.IDBFactory;
-import org.teavm.jso.indexeddb.IDBGetRequest;
-import org.teavm.jso.indexeddb.IDBObjectStoreParameters;
-import org.teavm.jso.indexeddb.IDBOpenDBRequest;
-import org.teavm.jso.indexeddb.IDBRequest;
-import org.teavm.jso.indexeddb.IDBTransaction;
-import org.teavm.jso.indexeddb.IDBVersionChangeEvent;
-import org.teavm.jso.typedarrays.ArrayBuffer;
-import org.teavm.jso.typedarrays.Int8Array;
-
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.EaglerArrayBufferAllocator;
-import net.lax1dude.eaglercraft.v1_8.internal.teavm.BooleanResult;
-import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFSIterator2;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.IndexedDBFilesystem;
+import net.lax1dude.eaglercraft.v1_8.internal.vfs2.EaglerFileSystemException;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
 /**
  * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
@@ -42,311 +22,28 @@ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFSIterator2;
  */
 public class PlatformFilesystem {
 
-	private static String filesystemDB = null;
-	private static IDBDatabase database = null;
+	private static final Logger logger = LogManager.getLogger("PlatformFilesystem");
 
-	public static void initialize(String dbName) {
-		filesystemDB = "_net_lax1dude_eaglercraft_v1_8_internal_PlatformFilesystem_1_8_8_" + dbName;
-		DatabaseOpen dbOpen = AsyncHandlers.openDB(filesystemDB);
-		
-		if(dbOpen.failedLocked) {
-			throw new FilesystemDatabaseLockedException(dbOpen.failedError);
+	public static IEaglerFilesystem initializePersist(String dbName) {
+		try {
+			return IndexedDBFilesystem.createFilesystem(dbName);
+		}catch(Throwable t) {
+			logger.error("Could not open IndexedDB filesystem: {}", dbName);
+			logger.error(t);
+			return null;
 		}
-		
-		if(dbOpen.failedInit) {
-			throw new FilesystemDatabaseInitializationException(dbOpen.failedError);
-		}
-		
-		if(dbOpen.database == null) {
-			throw new NullPointerException("IDBDatabase is null!");
-		}
-		
-		database = dbOpen.database;
 	}
 
-	public static class FilesystemDatabaseLockedException extends RuntimeException {
+	public static class FilesystemDatabaseLockedException extends EaglerFileSystemException {
 		public FilesystemDatabaseLockedException(String message) {
 			super(message);
 		}
 	}
 
-	public static class FilesystemDatabaseInitializationException extends RuntimeException {
+	public static class FilesystemDatabaseInitializationException extends EaglerFileSystemException {
 		public FilesystemDatabaseInitializationException(String message) {
 			super(message);
 		}
 	}
 
-	public static boolean eaglerDelete(String pathName) {
-		return AsyncHandlers.deleteFile(database, pathName).bool;
-	}
-
-	public static ByteBuffer eaglerRead(String pathName) {
-		ArrayBuffer ar = AsyncHandlers.readWholeFile(database, pathName);
-		if(ar == null) {
-			return null;
-		}
-		return EaglerArrayBufferAllocator.wrapByteBufferTeaVM(Int8Array.create(ar));
-	}
-
-	public static void eaglerWrite(String pathName, ByteBuffer data) {
-		if(!AsyncHandlers.writeWholeFile(database, pathName, EaglerArrayBufferAllocator.getDataView8Unsigned(data).getBuffer()).bool) {
-			throw new RuntimeException("Failed to write " + data.remaining() + " byte file to indexeddb table: " + pathName);
-		}
-	}
-
-	public static boolean eaglerExists(String pathName) {
-		return AsyncHandlers.fileExists(database, pathName).bool;
-	}
-
-	public static boolean eaglerMove(String pathNameOld, String pathNameNew) {
-		ArrayBuffer old = AsyncHandlers.readWholeFile(database, pathNameOld);
-		return old != null && AsyncHandlers.writeWholeFile(database, pathNameNew, old).bool && AsyncHandlers.deleteFile(database, pathNameOld).bool;
-	}
-
-	public static int eaglerCopy(String pathNameOld, String pathNameNew) {
-		ArrayBuffer old = AsyncHandlers.readWholeFile(database, pathNameOld);
-		if(old != null && AsyncHandlers.writeWholeFile(database, pathNameNew, old).bool) {
-			return old.getByteLength();
-		}else {
-			return -1;
-		}
-	}
-
-	public static int eaglerSize(String pathName) {
-		ArrayBuffer old = AsyncHandlers.readWholeFile(database, pathName);
-		return old == null ? -1 : old.getByteLength();
-	}
-
-	private static class VFSFilenameIteratorNonRecursive implements VFSFilenameIterator {
-
-		private final VFSFilenameIterator child;
-		private final int pathCount;
-
-		private VFSFilenameIteratorNonRecursive(VFSFilenameIterator child, int pathCount) {
-			this.child = child;
-			this.pathCount = pathCount;
-		}
-
-		@Override
-		public void next(String entry) {
-			if(countSlashes(entry) == pathCount) {
-				child.next(entry);
-			}
-		}
-
-	}
-
-	private static int countSlashes(String str) {
-		int j = 0;
-		for(int i = 0, l = str.length(); i < l; ++i) {
-			if(str.charAt(i) == '/') {
-				++j;
-			}
-		}
-		return j;
-	}
-
-	public static void eaglerIterate(String pathName, VFSFilenameIterator itr, boolean recursive) {
-		if(recursive) {
-			AsyncHandlers.iterateFiles(database, pathName, false, itr);
-		}else {
-			AsyncHandlers.iterateFiles(database, pathName, false, new VFSFilenameIteratorNonRecursive(itr, countSlashes(pathName) + 1));
-		}
-	}
-
-	protected static class DatabaseOpen {
-		
-		protected final boolean failedInit;
-		protected final boolean failedLocked;
-		protected final String failedError;
-		
-		protected final IDBDatabase database;
-		
-		protected DatabaseOpen(boolean init, boolean locked, String error, IDBDatabase db) {
-			failedInit = init;
-			failedLocked = locked;
-			failedError = error;
-			database = db;
-		}
-		
-	}
-
-	@JSBody(script = "return ((typeof indexedDB) !== 'undefined') ? indexedDB : null;")
-	protected static native IDBFactory createIDBFactory();
-	
-	protected static class AsyncHandlers {
-		
-		@Async
-		protected static native DatabaseOpen openDB(String name);
-		
-		private static void openDB(String name, final AsyncCallback<DatabaseOpen> cb) {
-			IDBFactory i = createIDBFactory();
-			if(i == null) {
-				cb.complete(new DatabaseOpen(false, false, "window.indexedDB was null or undefined", null));
-				return;
-			}
-			final IDBOpenDBRequest f = i.open(name, 1);
-			f.setOnBlocked(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(new DatabaseOpen(false, true, null, null));
-				}
-			});
-			f.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(new DatabaseOpen(false, false, null, f.getResult()));
-				}
-			});
-			f.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(new DatabaseOpen(false, false, "open error", null));
-				}
-			});
-			f.setOnUpgradeNeeded(new EventListener<IDBVersionChangeEvent>() {
-				@Override
-				public void handleEvent(IDBVersionChangeEvent evt) {
-					f.getResult().createObjectStore("filesystem", IDBObjectStoreParameters.create().keyPath("path"));
-				}
-			});
-		}
-		
-		@Async
-		protected static native BooleanResult deleteFile(IDBDatabase db, String name);
-		
-		private static void deleteFile(IDBDatabase db, String name, final AsyncCallback<BooleanResult> cb) {
-			IDBTransaction tx = db.transaction("filesystem", "readwrite");
-			final IDBRequest r = tx.objectStore("filesystem").delete(makeTheFuckingKeyWork(name));
-			
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult.TRUE);
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult.FALSE);
-				}
-			});
-		}
-		
-		@JSBody(params = { "obj" }, script = "return (typeof obj === \"undefined\") ? null : ((typeof obj.data === \"undefined\") ? null : obj.data);")
-		protected static native ArrayBuffer readRow(JSObject obj);
-		
-		@JSBody(params = { "obj" }, script = "return [obj];")
-		private static native JSObject makeTheFuckingKeyWork(String k);
-		
-		@Async
-		protected static native ArrayBuffer readWholeFile(IDBDatabase db, String name);
-		
-		private static void readWholeFile(IDBDatabase db, String name, final AsyncCallback<ArrayBuffer> cb) {
-			IDBTransaction tx = db.transaction("filesystem", "readonly");
-			final IDBGetRequest r = tx.objectStore("filesystem").get(makeTheFuckingKeyWork(name));
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(readRow(r.getResult()));
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(null);
-				}
-			});
-			
-		}
-		
-		@JSBody(params = { "k" }, script = "return ((typeof k) === \"string\") ? k : (((typeof k) === \"undefined\") ? null : (((typeof k[0]) === \"string\") ? k[0] : null));")
-		private static native String readKey(JSObject k);
-		
-		@JSBody(params = { "k" }, script = "return ((typeof k) === \"undefined\") ? null : (((typeof k.path) === \"undefined\") ? null : (((typeof k.path) === \"string\") ? k[0] : null));")
-		private static native String readRowKey(JSObject r);
-		
-		@Async
-		protected static native Integer iterateFiles(IDBDatabase db, final String prefix, boolean rw, final VFSFilenameIterator itr);
-		
-		private static void iterateFiles(IDBDatabase db, final String prefix, boolean rw, final VFSFilenameIterator itr, final AsyncCallback<Integer> cb) {
-			IDBTransaction tx = db.transaction("filesystem", rw ? "readwrite" : "readonly");
-			final IDBCursorRequest r = tx.objectStore("filesystem").openCursor();
-			final int[] res = new int[1];
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					IDBCursor c = r.getResult();
-					if(c == null || c.getKey() == null || c.getValue() == null) {
-						cb.complete(res[0]);
-						return;
-					}
-					String k = readKey(c.getKey());
-					if(k != null) {
-						if(k.startsWith(prefix)) {
-							int ci = res[0]++;
-							try {
-								itr.next(k);
-							}catch(VFSIterator2.BreakLoop ex) {
-								cb.complete(res[0]);
-								return;
-							}
-						}
-					}
-					c.doContinue();
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(res[0] > 0 ? res[0] : -1);
-				}
-			});
-		}
-		
-		@Async
-		protected static native BooleanResult fileExists(IDBDatabase db, String name);
-		
-		private static void fileExists(IDBDatabase db, String name, final AsyncCallback<BooleanResult> cb) {
-			IDBTransaction tx = db.transaction("filesystem", "readonly");
-			final IDBCountRequest r = tx.objectStore("filesystem").count(makeTheFuckingKeyWork(name));
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult._new(r.getResult() > 0));
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult.FALSE);
-				}
-			});
-		}
-		
-		@JSBody(params = { "pat", "dat" }, script = "return { path: pat, data: dat };")
-		protected static native JSObject writeRow(String name, ArrayBuffer data);
-		
-		@Async
-		protected static native BooleanResult writeWholeFile(IDBDatabase db, String name, ArrayBuffer data);
-		
-		private static void writeWholeFile(IDBDatabase db, String name, ArrayBuffer data, final AsyncCallback<BooleanResult> cb) {
-			IDBTransaction tx = db.transaction("filesystem", "readwrite");
-			final IDBRequest r = tx.objectStore("filesystem").put(writeRow(name, data));
-			
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult.TRUE);
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult.FALSE);
-				}
-			});
-		}
-		
-	}
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
index f9a5baf..7633de9 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
@@ -1,34 +1,53 @@
 package net.lax1dude.eaglercraft.v1_8.internal;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.Touch;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TouchEvent;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.VisualViewport;
 
 import org.teavm.interop.Async;
 import org.teavm.interop.AsyncCallback;
 import org.teavm.jso.JSBody;
+import org.teavm.jso.JSFunctor;
 import org.teavm.jso.JSObject;
+import org.teavm.jso.browser.Navigator;
 import org.teavm.jso.browser.TimerHandler;
 import org.teavm.jso.browser.Window;
+import org.teavm.jso.core.JSNumber;
+import org.teavm.jso.dom.css.CSSStyleDeclaration;
 import org.teavm.jso.dom.events.Event;
 import org.teavm.jso.dom.events.EventListener;
 import org.teavm.jso.dom.events.KeyboardEvent;
 import org.teavm.jso.dom.events.MouseEvent;
 import org.teavm.jso.dom.events.WheelEvent;
 import org.teavm.jso.dom.html.HTMLCanvasElement;
+import org.teavm.jso.dom.html.HTMLDocument;
 import org.teavm.jso.dom.html.HTMLElement;
-import org.teavm.jso.webgl.WebGLFramebuffer;
-import org.teavm.jso.webgl.WebGLRenderbuffer;
+import org.teavm.jso.dom.html.HTMLFormElement;
+import org.teavm.jso.dom.html.HTMLInputElement;
+import org.teavm.jso.dom.html.TextRectangle;
+import org.teavm.jso.gamepad.Gamepad;
+import org.teavm.jso.gamepad.GamepadButton;
+import org.teavm.jso.gamepad.GamepadEvent;
 
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.EarlyLoadScreen;
-import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGL2RenderingContext;
-
-import static net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGL2RenderingContext.*;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.InputEvent;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.LegacyKeycodeTranslator;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.OffsetTouch;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.SortedTouchEvent;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGLBackBuffer;
 
 /**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -45,75 +64,257 @@ import static net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGL2RenderingContex
 public class PlatformInput {
 
 	private static Window win = null;
+	private static HTMLElement parent = null;
 	private static HTMLCanvasElement canvas = null;
-	static WebGL2RenderingContext context = null;
+	private static HTMLElement touchKeyboardOpenZone = null;
+	private static int touchOpenZoneX = 0;
+	private static int touchOpenZoneY = 0;
+	private static int touchOpenZoneW = 0;
+	private static int touchOpenZoneH = 0;
+	private static HTMLFormElement touchKeyboardForm = null;
+	private static HTMLInputElement touchKeyboardField = null;
+	private static boolean shownTouchKeyboardEventWarning = false;
+	private static boolean shownLegacyTouchKeyboardWarning = false;
+	private static boolean showniOSReturnTouchKeyboardWarning = false;
+	private static double lastTouchKeyboardEvtA = 0.0;
+	private static double lastTouchKeyboardEvtB = 0.0;
+	private static double lastTouchKeyboardEvtC = 0.0;
 
-	static WebGLFramebuffer mainFramebuffer = null;
-	static WebGLRenderbuffer mainColorRenderbuffer = null;
-	static WebGLRenderbuffer mainDepthRenderbuffer = null;
-	private static int framebufferWidth = -1;
-	private static int framebufferHeight = -1;
-	
-	private static EventListener contextmenu = null;
-	private static EventListener mousedown = null;
-	private static EventListener mouseup = null;
-	private static EventListener mousemove = null;
-	private static EventListener mouseenter = null;
-	private static EventListener mouseleave = null;
-	private static EventListener keydown = null;
-	private static EventListener keyup = null;
-	private static EventListener keypress = null;
-	private static EventListener wheel = null;
-	private static EventListener pointerlock = null;
+	private static EventListener<?> contextmenu = null;
+	private static EventListener<?> mousedown = null;
+	private static EventListener<?> mouseup = null;
+	private static EventListener<?> mousemove = null;
+	private static EventListener<?> mouseenter = null;
+	private static EventListener<?> mouseleave = null;
+	private static EventListener<?> touchstart = null;
+	private static EventListener<?> touchend = null;
+	private static EventListener<?> touchmove = null;
+	private static EventListener<?> touchcancel = null;
+	private static EventListener<?> gamepadconnected = null;
+	private static EventListener<?> gamepaddisconnected = null;
+	private static EventListener<?> keydown = null;
+	private static EventListener<?> keyup = null;
+	private static EventListener<?> touchKeyboardOpenZone_touchstart = null;
+	private static EventListener<?> touchKeyboardOpenZone_touchend = null;
+	private static EventListener<?> touchKeyboardOpenZone_touchmove = null;
+	private static EventListener<?> wheel = null;
+	private static EventListener<?> focus = null;
+	private static EventListener<?> blur = null;
+	private static EventListener<?> pointerlock = null;
 
-	private static List<MouseEvent> mouseEvents = new LinkedList();
-	private static List<KeyboardEvent> keyEvents = new LinkedList();
+	private static Map<String,LegacyKeycodeTranslator.LegacyKeycode> keyCodeTranslatorMap = null;
+
+	public static Map<String,LegacyKeycodeTranslator.LegacyKeycode> getKeyCodeTranslatorMapTeaVM() {
+		return keyCodeTranslatorMap;
+	}
+
+	private static final List<String> pastedStrings = new LinkedList<>();
+
+	private static final int EVENT_KEY_DOWN = 0;
+	private static final int EVENT_KEY_UP = 1;
+	private static final int EVENT_KEY_REPEAT = 2;
+
+	private static class VKeyEvent {
+
+		private final int keyCode;
+		private final int location;
+		private final int eagKey;
+		private final char keyChar;
+		private final int type;
+
+		private VKeyEvent(int keyCode, int location, int eagKey, char keyChar, int type) {
+			this.keyCode = keyCode;
+			this.location = location;
+			this.eagKey = eagKey;
+			this.keyChar = keyChar;
+			this.type = type;
+		}
+
+	}
+
+	private static final int EVENT_MOUSE_DOWN = 0;
+	private static final int EVENT_MOUSE_UP = 1;
+	private static final int EVENT_MOUSE_MOVE = 2;
+	private static final int EVENT_MOUSE_WHEEL = 3;
+
+	private static class VMouseEvent {
+
+		private final int posX;
+		private final int posY;
+		private final int button;
+		private final float wheel;
+		private final int type;
+
+		private VMouseEvent(int posX, int posY, int button, float wheel, int type) {
+			this.posX = posX;
+			this.posY = posY;
+			this.button = button;
+			this.wheel = wheel;
+			this.type = type;
+		}
+
+	}
+
+	private static final List<VMouseEvent> mouseEvents = new LinkedList<>();
+	private static final List<VKeyEvent> keyEvents = new LinkedList<>();
+	private static final List<SortedTouchEvent> touchEvents = new LinkedList<>();
+
+	private static boolean hasShownPressAnyKey = false;
+	private static boolean isOnMobilePressAnyKey = false;
+
+	private static interface MobilePressAnyKeyHandler {
+		void call(boolean enterBootMenu);
+	}
+
+	private static HTMLElement mobilePressAnyKeyScreen = null;
+	private static MobilePressAnyKeyHandler mobilePressAnyKey = null;
+	static boolean isLikelyMobileBrowser = false;
 
 	private static int mouseX = 0;
 	private static int mouseY = 0;
 	private static double mouseDX = 0.0D;
 	private static double mouseDY = 0.0D;
 	private static double mouseDWheel = 0.0D;
-	private static int width = 0;
-	private static int height = 0;
 	private static boolean enableRepeatEvents = true;
 	private static boolean isWindowFocused = true;
 	private static boolean isMouseOverWindow = true;
 	static boolean unpressCTRL = false;
 
+	private static SortedTouchEvent currentTouchState = null;
+	private static SortedTouchEvent currentTouchEvent = null;
+
+	public static int touchOffsetXTeaVM = 0;
+	public static int touchOffsetYTeaVM = 0;
+
+	private static boolean gamepadSupported = false;
+	private static final List<Gamepad> gamepadList = new ArrayList<>();
+	private static Gamepad selectedGamepad = null;
+	private static String selectedGamepadName = null;
+	private static double gamepadTimestamp = -1.0;
+	private static final boolean[] gamepadButtonStates = new boolean[24];
+	private static final float[] gamepadAxisStates = new float[4];
+
 	private static int windowWidth = -1;
 	private static int windowHeight = -1;
+	private static float windowDPI = 1.0f;
+	private static int visualViewportX = -1;
+	private static int visualViewportY = -1;
+	private static int visualViewportW = -1;
+	private static int visualViewportH = -1;
 	private static int lastWasResizedWindowWidth = -2;
 	private static int lastWasResizedWindowHeight = -2;
-	
-	private static MouseEvent currentEvent = null;
-	private static KeyboardEvent currentEventK = null;
+	private static float lastWasResizedWindowDPI = -2.0f;
+	private static int lastWasResizedVisualViewportX = -2;
+	private static int lastWasResizedVisualViewportY = -2;
+	private static int lastWasResizedVisualViewportW = -2;
+	private static int lastWasResizedVisualViewportH = -2;
+
+	private static VMouseEvent currentEvent = null;
+	private static VKeyEvent currentEventK = null;
 	private static boolean[] buttonStates = new boolean[8];
 	private static boolean[] keyStates = new boolean[256];
 
 	private static int functionKeyModifier = KeyboardConstants.KEY_F;
 
+	// Can't support webkit vendor prefix since there's no document.pointerLockElement
+	private static final int POINTER_LOCK_NONE = 0;
+	private static final int POINTER_LOCK_CORE = 1;
+	private static final int POINTER_LOCK_MOZ = 2;
+	private static int pointerLockSupported = POINTER_LOCK_NONE;
 	private static long mouseUngrabTimer = 0l;
 	private static long mouseGrabTimer = 0l;
 	private static int mouseUngrabTimeout = -1;
 	private static boolean pointerLockFlag = false;
 
+	private static final int FULLSCREEN_NONE = 0;
+	private static final int FULLSCREEN_CORE = 1;
+	private static final int FULLSCREEN_WEBKIT = 2;
+	private static final int FULLSCREEN_MOZ = 3;
+	private static int fullscreenSupported = FULLSCREEN_NONE;
+
 	private static JSObject fullscreenQuery = null;
 
 	public static boolean keyboardLockSupported = false;
 	public static boolean lockKeys = false;
 
-	private static boolean vsync = true;
-	private static boolean vsyncSupport = false;
+	static boolean vsync = true;
+	static boolean vsyncSupport = false;
+
+	private static long vsyncWaiting = -1l;
+	private static AsyncCallback<Void> vsyncAsyncCallback = null;
+	private static int vsyncTimeout = -1;
 	
-	@JSBody(params = { }, script = "window.onbeforeunload = () => {return false;};")
-	private static native void onBeforeCloseRegister();
-	
-	static void initHooks(Window window, HTMLCanvasElement canvaz) {
+	// hack to fix occasional freeze on iOS
+	private static int vsyncSaveLockInterval = -1;
+
+	@JSFunctor
+	private static interface UnloadCallback extends JSObject {
+		void call();
+	}
+
+	@JSBody(params = { "win", "cb" }, script = "win.__curEaglerX188UnloadListenerCB = cb; if((typeof win.__isEaglerX188UnloadListenerSet === \"string\") && win.__isEaglerX188UnloadListenerSet === \"yes\") return; win.onbeforeunload = function(evt) { if(win.__curEaglerX188UnloadListenerCB) win.__curEaglerX188UnloadListenerCB(); return false; }; win.__isEaglerX188UnloadListenerSet = \"yes\";")
+	private static native void onBeforeCloseRegister(Window win, UnloadCallback cb);
+
+	static void initHooks(Window window, HTMLElement parent_, HTMLCanvasElement canvaz) {
 		win = window;
+		parent = parent_;
 		canvas = canvaz;
 		canvas.getStyle().setProperty("cursor", "default");
-		win.addEventListener("contextmenu", contextmenu = new EventListener<MouseEvent>() {
+		updateTouchOffset();
+		lastWasResizedWindowWidth = -2;
+		lastWasResizedWindowHeight = -2;
+		lastWasResizedWindowDPI = -2.0f;
+		lastWasResizedVisualViewportX = -2;
+		lastWasResizedVisualViewportY = -2;
+		lastWasResizedVisualViewportW = -2;
+		lastWasResizedVisualViewportH = -2;
+		hasShownPressAnyKey = false;
+		touchOpenZoneX = 0;
+		touchOpenZoneY = 0;
+		touchOpenZoneW = 0;
+		touchOpenZoneH = 0;
+		touchKeyboardForm = null;
+		touchKeyboardField = null;
+		shownLegacyTouchKeyboardWarning = false;
+		shownTouchKeyboardEventWarning = false;
+		showniOSReturnTouchKeyboardWarning = false;
+		lastTouchKeyboardEvtA = 0.0;
+		lastTouchKeyboardEvtB = 0.0;
+		lastTouchKeyboardEvtC = 0.0;
+		touchKeyboardOpenZone = win.getDocument().createElement("div");
+		touchKeyboardOpenZone.getClassList().add("_eaglercraftX_keyboard_open_zone");
+		CSSStyleDeclaration decl = touchKeyboardOpenZone.getStyle();
+		decl.setProperty("display", "none");
+		decl.setProperty("position", "absolute");
+		decl.setProperty("background-color", "transparent");
+		decl.setProperty("top", "0px");
+		decl.setProperty("left", "0px");
+		decl.setProperty("width", "0px");
+		decl.setProperty("height", "0px");
+		decl.setProperty("z-index", "100");
+		decl.setProperty("touch-action", "pan-x pan-y");
+		decl.setProperty("-webkit-touch-callout", "none");
+		decl.setProperty("-webkit-tap-highlight-color", "rgba(255, 255, 255, 0)");
+		parent.appendChild(touchKeyboardOpenZone);
+		
+		PlatformRuntime.logger.info("Loading keyboard layout data");
+		
+		LegacyKeycodeTranslator keycodeTranslator = new LegacyKeycodeTranslator();
+		if(checkKeyboardLayoutSupported()) {
+			try {
+				iterateKeyboardLayout(keycodeTranslator::addBrowserLayoutMapping);
+			}catch(Throwable t) {
+				PlatformRuntime.logger.error("Caught exception querying keyboard layout from browser, using the default layout instead");
+				PlatformRuntime.logger.error(t);
+			}
+			int cnt = keycodeTranslator.getRemappedKeyCount();
+			if(cnt > 0) {
+				PlatformRuntime.logger.info("KeyboardLayoutMap remapped {} keys from their default codes", cnt);
+			}
+		}
+		keyCodeTranslatorMap = keycodeTranslator.buildLayoutTable();
+		
+		parent.addEventListener("contextmenu", contextmenu = new EventListener<MouseEvent>() {
 			@Override
 			public void handleEvent(MouseEvent evt) {
 				evt.preventDefault();
@@ -125,9 +326,18 @@ public class PlatformInput {
 			public void handleEvent(MouseEvent evt) {
 				evt.preventDefault();
 				evt.stopPropagation();
+				if(tryGrabCursorHook()) return;
 				int b = evt.getButton();
-				buttonStates[b == 1 ? 2 : (b == 2 ? 1 : b)] = true;
-				mouseEvents.add(evt);
+				b = b == 1 ? 2 : (b == 2 ? 1 : b);
+				buttonStates[b] = true;
+				int eventX = (int)(getOffsetX(evt) * windowDPI);
+				int eventY = windowHeight - (int)(getOffsetY(evt) * windowDPI) - 1;
+				synchronized(mouseEvents) {
+					mouseEvents.add(new VMouseEvent(eventX, eventY, b, 0.0f, EVENT_MOUSE_DOWN));
+					if(mouseEvents.size() > 64) {
+						mouseEvents.remove(0);
+					}
+				}
 			}
 		});
 		canvas.addEventListener("mouseup", mouseup = new EventListener<MouseEvent>() {
@@ -136,8 +346,16 @@ public class PlatformInput {
 				evt.preventDefault();
 				evt.stopPropagation();
 				int b = evt.getButton();
-				buttonStates[b == 1 ? 2 : (b == 2 ? 1 : b)] = false;
-				mouseEvents.add(evt);
+				b = b == 1 ? 2 : (b == 2 ? 1 : b);
+				buttonStates[b] = false;
+				int eventX = (int)(getOffsetX(evt) * windowDPI);
+				int eventY = windowHeight - (int)(getOffsetY(evt) * windowDPI) - 1;
+				synchronized(mouseEvents) {
+					mouseEvents.add(new VMouseEvent(eventX, eventY, b, 0.0f, EVENT_MOUSE_UP));
+					if(mouseEvents.size() > 64) {
+						mouseEvents.remove(0);
+					}
+				}
 			}
 		});
 		canvas.addEventListener("mousemove", mousemove = new EventListener<MouseEvent>() {
@@ -145,12 +363,19 @@ public class PlatformInput {
 			public void handleEvent(MouseEvent evt) {
 				evt.preventDefault();
 				evt.stopPropagation();
-				mouseX = (int)(getOffsetX(evt) * win.getDevicePixelRatio());
-				mouseY = (int)((canvas.getClientHeight() - getOffsetY(evt)) * win.getDevicePixelRatio());
+				mouseX = (int)(getOffsetX(evt) * windowDPI);
+				mouseY = windowHeight - (int)(getOffsetY(evt) * windowDPI) - 1;
 				mouseDX += evt.getMovementX();
 				mouseDY += -evt.getMovementY();
-				if(hasBeenActive()) {
-					mouseEvents.add(evt);
+				if(hasShownPressAnyKey) {
+					int eventX = (int)(getOffsetX(evt) * windowDPI);
+					int eventY = windowHeight - (int)(getOffsetY(evt) * windowDPI) - 1;
+					synchronized(mouseEvents) {
+						mouseEvents.add(new VMouseEvent(eventX, eventY, -1, 0.0f, EVENT_MOUSE_MOVE));
+						if(mouseEvents.size() > 64) {
+							mouseEvents.remove(0);
+						}
+					}
 				}
 			}
 		});
@@ -166,45 +391,205 @@ public class PlatformInput {
 				isMouseOverWindow = false;
 			}
 		});
+		canvas.addEventListener("touchstart", touchstart = new EventListener<TouchEvent>() {
+			@Override
+			public void handleEvent(TouchEvent evt) {
+				evt.preventDefault();
+				evt.stopPropagation();
+				SortedTouchEvent sorted = new SortedTouchEvent(evt, touchUIDMapperCreate);
+				currentTouchState = sorted;
+				List<OffsetTouch> lst = sorted.getEventTouches();
+				synchronized(touchEvents) {
+					touchEvents.add(sorted);
+					if(touchEvents.size() > 64) {
+						touchEvents.remove(0);
+					}
+				}
+				touchCloseDeviceKeyboard0(false);
+			}
+		});
+		canvas.addEventListener("touchend", touchend = new EventListener<TouchEvent>() {
+			@Override
+			public void handleEvent(TouchEvent evt) {
+				evt.preventDefault();
+				evt.stopPropagation();
+				SortedTouchEvent sorted = new SortedTouchEvent(evt, touchUIDMapper);
+				currentTouchState = sorted;
+				List<OffsetTouch> lst = sorted.getEventTouches();
+				int len = lst.size();
+				for (int i = 0; i < len; ++i) {
+					touchIDtoUID.remove(lst.get(i).touch.getIdentifier());
+				}
+				synchronized(touchEvents) {
+					touchEvents.add(sorted);
+					if(touchEvents.size() > 64) {
+						touchEvents.remove(0);
+					}
+				}
+			}
+		});
+		canvas.addEventListener("touchmove", touchmove = new EventListener<TouchEvent>() {
+			@Override
+			public void handleEvent(TouchEvent evt) {
+				evt.preventDefault();
+				evt.stopPropagation();
+				SortedTouchEvent sorted = new SortedTouchEvent(evt, touchUIDMapperCreate);
+				currentTouchState = sorted;
+				if(hasShownPressAnyKey) {
+					synchronized(touchEvents) {
+						touchEvents.add(sorted);
+						if(touchEvents.size() > 64) {
+							touchEvents.remove(0);
+						}
+					}
+				}
+			}
+		});
+		canvas.addEventListener("touchcancel", touchcancel = new EventListener<TouchEvent>() {
+			@Override
+			public void handleEvent(TouchEvent evt) {
+				SortedTouchEvent sorted = new SortedTouchEvent(evt, touchUIDMapper);
+				currentTouchState = sorted;
+				List<OffsetTouch> lst = sorted.getEventTouches();
+				int len = lst.size();
+				for (int i = 0; i < len; ++i) {
+					touchIDtoUID.remove(lst.get(i).touch.getIdentifier());
+				}
+				if(hasShownPressAnyKey) {
+					synchronized(touchEvents) {
+						touchEvents.add(sorted);
+						if(touchEvents.size() > 64) {
+							touchEvents.remove(0);
+						}
+					}
+				}
+			}
+		});
 		win.addEventListener("keydown", keydown = new EventListener<KeyboardEvent>() {
 			@Override
 			public void handleEvent(KeyboardEvent evt) {
-				int w = getWhich(evt);
-				if (w == 122) { // F11
-					toggleFullscreen();
-				}
 				evt.preventDefault();
 				evt.stopPropagation();
 				if(!enableRepeatEvents && evt.isRepeat()) return;
+				LegacyKeycodeTranslator.LegacyKeycode keyCode = null;
+				if(keyCodeTranslatorMap != null && hasCodeVar(evt)) {
+					keyCode = keyCodeTranslatorMap.get(evt.getCode());
+				}
+				int w;
+				int loc;
+				if(keyCode != null) {
+					w = keyCode.keyCode;
+					loc = keyCode.location;
+				}else {
+					w = getWhich(evt);
+					loc = getLocationSafe(evt);
+				}
+				if (w == 122 && !evt.isRepeat()) { // F11
+					toggleFullscreen();
+				}
 				int ww = processFunctionKeys(w);
-				keyStates[KeyboardConstants.getEaglerKeyFromBrowser(ww, ww == w ? evt.getLocation() : 0)] = true;
-				keyEvents.add(evt);
+				int eag = KeyboardConstants.getEaglerKeyFromBrowser(ww, ww == w ? loc : 0);
+				if(isOnMobilePressAnyKey && mobilePressAnyKey != null) {
+					if(eag == KeyboardConstants.KEY_DELETE) {
+						mobilePressAnyKey.call(true);
+						return;
+					}
+				}
+				if(eag != 0) {
+					keyStates[eag] = true;
+				}
+				String s = getCharOrNull(evt);
+				int l = s.length();
+				char c;
+				if(l == 1) {
+					c = s.charAt(0);
+				}else if(l == 0) {
+					c = keyToAsciiLegacy(w, evt.isShiftKey());
+				}else if(s.equals("Unidentified")) {
+					return;
+				}else {
+					c = '\0';
+				}
+				synchronized(keyEvents) {
+					keyEvents.add(new VKeyEvent(ww, loc, eag, c, EVENT_KEY_DOWN));
+					if(keyEvents.size() > 64) {
+						keyEvents.remove(0);
+					}
+				}
+				JSObject obj = evt.getTimeStamp();
+				if(TeaVMUtils.isTruthy(obj)) {
+					lastTouchKeyboardEvtA = ((JSNumber)obj).doubleValue();
+				}
 			}
 		});
 		win.addEventListener("keyup", keyup = new EventListener<KeyboardEvent>() {
 			@Override
 			public void handleEvent(KeyboardEvent evt) {
-				int w = getWhich(evt);
 				evt.preventDefault();
 				evt.stopPropagation();
-				if(!enableRepeatEvents && evt.isRepeat()) return;
+				LegacyKeycodeTranslator.LegacyKeycode keyCode = null;
+				if(keyCodeTranslatorMap != null && hasCodeVar(evt)) {
+					keyCode = keyCodeTranslatorMap.get(evt.getCode());
+				}
+				int w;
+				int loc;
+				if(keyCode != null) {
+					w = keyCode.keyCode;
+					loc = keyCode.location;
+				}else {
+					w = getWhich(evt);
+					loc = getLocationSafe(evt);
+				}
 				int ww = processFunctionKeys(w);
-				int eagKey = KeyboardConstants.getEaglerKeyFromBrowser(ww, ww == w ? evt.getLocation() : 0);
-				keyStates[eagKey] = false;
-				if(eagKey == functionKeyModifier) {
-					for(int key = KeyboardConstants.KEY_F1; key <= KeyboardConstants.KEY_F10; ++key) {
-						keyStates[key] = false;
+				int eag = KeyboardConstants.getEaglerKeyFromBrowser(ww, ww == w ? loc : 0);
+				if(eag != 0) {
+					keyStates[eag] = false;
+					if(eag == functionKeyModifier) {
+						for(int key = KeyboardConstants.KEY_F1; key <= KeyboardConstants.KEY_F10; ++key) {
+							keyStates[key] = false;
+						}
+					}
+				}
+				String s = getCharOrNull(evt);
+				int l = s.length();
+				char c;
+				if(l == 1) {
+					c = s.charAt(0);
+				}else if(l == 0) {
+					c = keyToAsciiLegacy(w, evt.isShiftKey());
+				}else if(s.equals("Unidentified")) {
+					return;
+				}else {
+					c = '\0';
+				}
+				synchronized(keyEvents) {
+					keyEvents.add(new VKeyEvent(ww, loc, eag, c, EVENT_KEY_UP));
+					if(keyEvents.size() > 64) {
+						keyEvents.remove(0);
 					}
 				}
-				keyEvents.add(evt);
 			}
 		});
-		win.addEventListener("keypress", keypress = new EventListener<KeyboardEvent>() {
+		touchKeyboardOpenZone.addEventListener("touchstart", touchKeyboardOpenZone_touchstart = new EventListener<TouchEvent>() {
 			@Override
-			public void handleEvent(KeyboardEvent evt) {
+			public void handleEvent(TouchEvent evt) {
+				evt.preventDefault();
+				evt.stopPropagation();
+			}
+		});
+		touchKeyboardOpenZone.addEventListener("touchend", touchKeyboardOpenZone_touchend = new EventListener<TouchEvent>() {
+			@Override
+			public void handleEvent(TouchEvent evt) {
+				evt.preventDefault();
+				evt.stopPropagation();
+				touchOpenDeviceKeyboard();
+			}
+		});
+		touchKeyboardOpenZone.addEventListener("touchmove", touchKeyboardOpenZone_touchmove = new EventListener<TouchEvent>() {
+			@Override
+			public void handleEvent(TouchEvent evt) {
 				evt.preventDefault();
 				evt.stopPropagation();
-				if(enableRepeatEvents && evt.isRepeat()) keyEvents.add(evt);
 			}
 		});
 		canvas.addEventListener("wheel", wheel = new EventListener<WheelEvent>() {
@@ -212,13 +597,23 @@ public class PlatformInput {
 			public void handleEvent(WheelEvent evt) {
 				evt.preventDefault();
 				evt.stopPropagation();
-				mouseEvents.add(evt);
-				mouseDWheel += evt.getDeltaY();
+				double delta = evt.getDeltaY();
+				mouseDWheel += delta;
+				if(hasShownPressAnyKey) {
+					int eventX = (int)(getOffsetX(evt) * windowDPI);
+					int eventY = windowHeight - (int)(getOffsetY(evt) * windowDPI) - 1;
+					synchronized(mouseEvents) {
+						mouseEvents.add(new VMouseEvent(eventX, eventY, -1, (float)delta, EVENT_MOUSE_WHEEL));
+						if(mouseEvents.size() > 64) {
+							mouseEvents.remove(0);
+						}
+					}
+				}
 			}
 		});
-		win.addEventListener("blur", new EventListener<WheelEvent>() {
+		win.addEventListener("blur", blur = new EventListener<Event>() {
 			@Override
-			public void handleEvent(WheelEvent evt) {
+			public void handleEvent(Event evt) {
 				isWindowFocused = false;
 				for(int i = 0; i < buttonStates.length; ++i) {
 					buttonStates[i] = false;
@@ -228,37 +623,94 @@ public class PlatformInput {
 				}
 			}
 		});
-		win.addEventListener("focus", new EventListener<WheelEvent>() {
+		win.addEventListener("focus", focus = new EventListener<Event>() {
 			@Override
-			public void handleEvent(WheelEvent evt) {
+			public void handleEvent(Event evt) {
 				isWindowFocused = true;
 			}
 		});
-		win.getDocument().addEventListener("pointerlockchange", pointerlock = new EventListener<WheelEvent>() {
-			@Override
-			public void handleEvent(WheelEvent evt) {
-				Window.setTimeout(new TimerHandler() {
-					@Override
-					public void onTimer() {
-						boolean grab = isPointerLocked();
-						if(!grab) {
-							if(pointerLockFlag) {
-								mouseUngrabTimer = System.currentTimeMillis();
+		
+		try {
+			pointerLockSupported = getSupportedPointerLock(win.getDocument());
+		}catch(Throwable t) {
+			pointerLockSupported = POINTER_LOCK_NONE;
+		}
+		if(pointerLockSupported != POINTER_LOCK_NONE) {
+			win.getDocument().addEventListener(pointerLockSupported == POINTER_LOCK_MOZ ? "mozpointerlockchange" : "pointerlockchange", pointerlock = new EventListener<Event>() {
+				@Override
+				public void handleEvent(Event evt) {
+					Window.setTimeout(new TimerHandler() {
+						@Override
+						public void onTimer() {
+							boolean grab = isPointerLocked();
+							if(!grab) {
+								if(pointerLockFlag) {
+									mouseUngrabTimer = PlatformRuntime.steadyTimeMillis();
+								}
 							}
+							pointerLockFlag = grab;
 						}
-						pointerLockFlag = grab;
-					}
-				}, 60);
-				mouseDX = 0.0D;
-				mouseDY = 0.0D;
+					}, 60);
+					mouseDX = 0.0D;
+					mouseDY = 0.0D;
+				}
+			});
+			if(pointerLockSupported == POINTER_LOCK_MOZ) {
+				PlatformRuntime.logger.info("Using moz- vendor prefix for pointer lock");
 			}
-		});
+		}else {
+			PlatformRuntime.logger.error("Pointer lock is not supported on this browser");
+		}
+
+		if(pointerLockSupported != POINTER_LOCK_NONE) {
+			String ua = PlatformRuntime.getUserAgentString();
+			if(ua != null) {
+				ua = ua.toLowerCase();
+				isLikelyMobileBrowser = ua.contains("mobi") || ua.contains("tablet");
+			}else {
+				isLikelyMobileBrowser = false;
+			}
+		}else {
+			isLikelyMobileBrowser = true;
+		}
 
 		try {
-			onBeforeCloseRegister();
+			fullscreenSupported = getSupportedFullScreen(win.getDocument());
+		}catch(Throwable t) {
+			fullscreenSupported = FULLSCREEN_NONE;
+		}
+		if(fullscreenSupported != FULLSCREEN_NONE) {
+			fullscreenQuery = fullscreenMediaQuery();
+			if(fullscreenSupported == FULLSCREEN_CORE && (keyboardLockSupported = checkKeyboardLockSupported())) {
+				TeaVMUtils.addEventListener(fullscreenQuery, "change", new EventListener<Event>() {
+					@Override
+					public void handleEvent(Event evt) {
+						if (!mediaQueryMatches(evt)) {
+							unlockKeys();
+							lockKeys = false;
+						}
+					}
+				});
+			}
+			if(pointerLockSupported == FULLSCREEN_WEBKIT) {
+				PlatformRuntime.logger.info("Using webkit- vendor prefix for fullscreen");
+			}else if(pointerLockSupported == FULLSCREEN_MOZ) {
+				PlatformRuntime.logger.info("Using moz- vendor prefix for fullscreen");
+			}
+		}else {
+			PlatformRuntime.logger.error("Fullscreen is not supported on this browser");
+		}
+
+		try {
+			onBeforeCloseRegister(window, () -> PlatformRuntime.beforeUnload());
 		}catch(Throwable t) {
 		}
 
+		vsyncWaiting = -1l;
+		vsyncAsyncCallback = null;
+		vsyncTimeout = -1;
+		vsyncSupport = false;
+
 		try {
 			asyncRequestAnimationFrame();
 			vsyncSupport = true;
@@ -266,22 +718,112 @@ public class PlatformInput {
 			PlatformRuntime.logger.error("VSync is not supported on this browser!");
 		}
 
-		fullscreenQuery = fullscreenMediaQuery();
-		if (keyboardLockSupported = checkKeyboardLockSupported()) {
-			TeaVMUtils.addEventListener(fullscreenQuery, "change", new EventListener<Event>() {
-				@Override
-				public void handleEvent(Event evt) {
-					if (!mediaQueryMatches(evt)) {
-						unlockKeys();
-						lockKeys = false;
+		if(vsyncSupport) {
+			if(vsyncSaveLockInterval != -1) {
+				try {
+					Window.clearInterval(vsyncSaveLockInterval);
+				}catch(Throwable t) {
+				}
+				vsyncSaveLockInterval = -1;
+			}
+			// fix for iOS freezing randomly...?
+			vsyncSaveLockInterval =  Window.setInterval(() -> {
+				if(vsyncWaiting != -1l) {
+					long steadyTime = PlatformRuntime.steadyTimeMillis();
+					if(steadyTime - vsyncWaiting > 1000) {
+						PlatformRuntime.logger.error("VSync lockup detected! Attempting to recover...");
+						vsyncWaiting = -1l;
+						if(vsyncTimeout != -1) {
+							try {
+								Window.clearTimeout(vsyncTimeout);
+							}catch(Throwable t) {
+							}
+							vsyncTimeout = -1;
+						}
+						if(vsyncAsyncCallback != null) {
+							AsyncCallback<Void> cb = vsyncAsyncCallback;
+							vsyncAsyncCallback = null;
+							cb.complete(null);
+						}else {
+							PlatformRuntime.logger.error("Async callback is null!");
+						}
 					}
 				}
-			});
+			}, 1000);
 		}
+
+		try {
+			gamepadSupported = gamepadSupported();
+			if(gamepadSupported) {
+				win.addEventListener("gamepadconnected", gamepadconnected = new EventListener<GamepadEvent>() {
+					@Override
+					public void handleEvent(GamepadEvent evt) {
+						enumerateGamepads();
+					}
+				});
+				win.addEventListener("gamepaddisconnected", gamepaddisconnected = new EventListener<GamepadEvent>() {
+					@Override
+					public void handleEvent(GamepadEvent evt) {
+						if(evt.getGamepad() == selectedGamepad) {
+							selectedGamepad = null;
+						}
+						enumerateGamepads();
+					}
+				});
+			}
+		}catch(Throwable t) {
+			gamepadSupported = false;
+			PlatformRuntime.logger.error("Gamepad detected as unsupported!");
+		}
+
+		enumerateGamepads();
 	}
 
-	@JSBody(params = { }, script = "if(window.navigator.userActivation){return window.navigator.userActivation.hasBeenActive;}else{return false;}")
-	public static native boolean hasBeenActive();
+	@JSFunctor
+	private static interface KeyboardLayoutIterator extends JSObject {
+		void call(String key, String val);
+	}
+
+	@JSFunctor
+	private static interface KeyboardLayoutDone extends JSObject {
+		void call();
+	}
+
+	@JSBody(params = { "cb", "cbDone" }, script = "return navigator.keyboard.getLayoutMap()"
+			+ ".then(function(layoutMap) { if(layoutMap && layoutMap.forEach) layoutMap.forEach(cb); cbDone(); })"
+			+ ".catch(function() { cbDone(); });")
+	private static native void iterateKeyboardLayout0(KeyboardLayoutIterator cb, KeyboardLayoutDone cbDone);
+
+	@Async
+	private static native void iterateKeyboardLayout(KeyboardLayoutIterator cb);
+
+	private static void iterateKeyboardLayout(KeyboardLayoutIterator cb, final AsyncCallback<Void> complete) {
+		iterateKeyboardLayout0(cb, () -> complete.complete(null));
+	}
+
+	@JSBody(params = { }, script = "return !!(navigator.keyboard && navigator.keyboard.getLayoutMap);")
+	private static native boolean checkKeyboardLayoutSupported();
+
+	@JSBody(params = { "doc" }, script = "return (typeof doc.exitPointerLock === \"function\") ? 1"
+			+ ": ((typeof doc.mozExitPointerLock === \"function\") ? 2 : -1);")
+	private static native int getSupportedPointerLock(HTMLDocument doc);
+
+	@JSBody(params = { "doc" }, script = "return (typeof doc.exitFullscreen === \"function\") ? 1"
+			+ ": ((typeof doc.webkitExitFullscreen === \"function\") ? 2"
+			+ ": ((typeof doc.mozExitFullscreen === \"function\") ? 3 : -1));")
+	private static native int getSupportedFullScreen(HTMLDocument doc);
+
+	@JSBody(params = { "evt" }, script = "return (typeof evt.key === \"string\");")
+	private static native boolean hasKeyVar(KeyboardEvent evt);
+
+	@JSBody(params = { "evt" }, script = "return (typeof evt.code === \"string\");")
+	private static native boolean hasCodeVar(KeyboardEvent evt);
+
+	@JSBody(params = { "evt" }, script = "return evt.keyIdentifier;")
+	private static native String getKeyIdentifier(KeyboardEvent evt);
+
+	@JSBody(params = { "fallback" }, script = "if(window.navigator.userActivation){return window.navigator.userActivation.hasBeenActive;}else{return fallback;}")
+	public static native boolean hasBeenActiveTeaVM(boolean fallback);
 	
 	@JSBody(params = { "m" }, script = "return m.offsetX;")
 	private static native int getOffsetX(MouseEvent m);
@@ -289,9 +831,15 @@ public class PlatformInput {
 	@JSBody(params = { "m" }, script = "return m.offsetY;")
 	private static native int getOffsetY(MouseEvent m);
 	
-	@JSBody(params = { "e" }, script = "return e.which;")
+	@JSBody(params = { "e" }, script = "return (typeof e.which === \"number\") ? e.which : ((typeof e.keyCode === \"number\") ? e.keyCode : 0);")
 	private static native int getWhich(KeyboardEvent e);
-	
+
+	@JSBody(params = { "e" }, script = "return (typeof e.location === \"number\") ? e.location : 0;")
+	private static native int getLocationSafe(KeyboardEvent e);
+
+	@JSBody(params = { "el", "i", "j" }, script = "el.setSelectionRange(el, i, j)")
+	private static native boolean setSelectionRange(HTMLElement el, int i, int j);
+
 	public static int getWindowWidth() {
 		return windowWidth;
 	}
@@ -300,6 +848,22 @@ public class PlatformInput {
 		return windowHeight;
 	}
 
+	public static int getVisualViewportX() {
+		return visualViewportX;
+	}
+
+	public static int getVisualViewportY() {
+		return visualViewportY;
+	}
+
+	public static int getVisualViewportW() {
+		return visualViewportW;
+	}
+
+	public static int getVisualViewportH() {
+		return visualViewportH;
+	}
+
 	public static boolean getWindowFocused() {
 		return isWindowFocused || isPointerLocked();
 	}
@@ -312,34 +876,67 @@ public class PlatformInput {
 		vsync = enable;
 	}
 
-	@JSBody(params = { "doc" }, script = "return (doc.visibilityState === \"visible\");")
+	@JSBody(params = { "doc" }, script = "return (typeof doc.visibilityState !== \"string\") || (doc.visibilityState === \"visible\");")
 	private static native boolean getVisibilityState(JSObject doc);
 
+	@JSBody(params = { "win" }, script = "return (typeof win.devicePixelRatio === \"number\") ? win.devicePixelRatio : 1.0;")
+	static native double getDevicePixelRatio(Window win);
+
 	public static void update() {
-		double r = win.getDevicePixelRatio();
-		int w = PlatformRuntime.parent.getClientWidth();
-		int h = PlatformRuntime.parent.getClientHeight();
+		double r = getDevicePixelRatio(win);
+		if(r < 0.01) r = 1.0;
+		windowDPI = (float)r;
+		updateTouchOffset();
+		int w = parent.getClientWidth();
+		int h = parent.getClientHeight();
 		int w2 = windowWidth = (int)(w * r);
 		int h2 = windowHeight = (int)(h * r);
+		if(PlatformRuntime.useVisualViewport) {
+			VisualViewport vv = PlatformRuntime.getVisualViewport();
+			double scale = vv.getScale();
+			visualViewportX = (int)(vv.getPageLeft() * r * scale);
+			visualViewportY = (int)(vv.getPageTop() * r * scale);
+			visualViewportW = (int)(vv.getWidth() * r * scale);
+			visualViewportH = (int)(vv.getHeight() * r * scale);
+			if(visualViewportW < 1) visualViewportW = 1;
+			if(visualViewportH < 1) visualViewportH = 1;
+			if(visualViewportX < 0) {
+				visualViewportW += visualViewportX;
+				visualViewportX = 0;
+			}else if(visualViewportX >= windowWidth) {
+				visualViewportX = windowWidth - 1;
+			}
+			if(visualViewportY < 0) {
+				visualViewportH += visualViewportY;
+				visualViewportY = 0;
+			}else if(visualViewportY >= windowHeight) {
+				visualViewportY = windowHeight - 1;
+			}
+			if((visualViewportX + visualViewportW) > windowWidth) {
+				visualViewportW = windowWidth - visualViewportX;
+			}
+			if((visualViewportY + visualViewportH) > windowHeight) {
+				visualViewportH = windowHeight - visualViewportY;
+			}
+		}else {
+			visualViewportX = 0;
+			visualViewportY = 0;
+			visualViewportW = w2;
+			visualViewportH = h2;
+		}
 		if(canvas.getWidth() != w2) {
 			canvas.setWidth(w2);
 		}
 		if(canvas.getHeight() != h2) {
 			canvas.setHeight(h2);
 		}
-		flipBuffer();
-		if (PlatformRuntime.recording) {
-			long t = System.currentTimeMillis();
-			if(t - PlatformRuntime.lastFrame > (1000 / 30)) {
-				PlatformRuntime.recFrame();
-				PlatformRuntime.lastFrame = t;
-			}
-		}
+		WebGLBackBuffer.flipBuffer(w2, h2);
+		PlatformScreenRecord.captureFrameHook();
 		if(getVisibilityState(win.getDocument())) {
 			if(vsyncSupport && vsync) {
 				asyncRequestAnimationFrame();
 			}else {
-				EagUtils.sleep(0l);
+				PlatformRuntime.swapDelayTeaVM();
 			}
 		}else {
 			EagUtils.sleep(50l);
@@ -350,19 +947,40 @@ public class PlatformInput {
 	private static native void asyncRequestAnimationFrame();
 
 	private static void asyncRequestAnimationFrame(AsyncCallback<Void> cb) {
-		final boolean[] hasCompleted = new boolean[1];
+		if(vsyncWaiting != -1l) {
+			cb.error(new IllegalStateException("Already waiting for vsync!"));
+			return;
+		}
+		vsyncWaiting = PlatformRuntime.steadyTimeMillis();
+		vsyncAsyncCallback = cb;
+		final boolean[] hasTimedOut = new boolean[] { false };
 		final int[] timeout = new int[] { -1 };
 		Window.requestAnimationFrame((d) -> {
-			if(!hasCompleted[0]) {
-				hasCompleted[0] = true;
-				Window.clearTimeout(timeout[0]);
-				cb.complete(null);
+			if(!hasTimedOut[0]) {
+				hasTimedOut[0] = true;
+				if(vsyncWaiting != -1l) {
+					vsyncWaiting = -1l;
+					if(vsyncTimeout != -1 && vsyncTimeout == timeout[0]) {
+						try {
+							Window.clearTimeout(vsyncTimeout);
+						}catch(Throwable t) {
+						}
+						vsyncTimeout = -1;
+					}
+					vsyncAsyncCallback = null;
+					cb.complete(null);
+				}
 			}
 		});
-		timeout[0] = Window.setTimeout(() -> {
-			if(!hasCompleted[0]) {
-				hasCompleted[0] = true;
-				cb.complete(null);
+		vsyncTimeout = timeout[0] = Window.setTimeout(() -> {
+			if(!hasTimedOut[0]) {
+				hasTimedOut[0] = true;
+				if(vsyncWaiting != -1l) {
+					vsyncTimeout = -1;
+					vsyncWaiting = -1l;
+					vsyncAsyncCallback = null;
+					cb.complete(null);
+				}
 			}
 		}, 50);
 	}
@@ -371,89 +989,173 @@ public class PlatformInput {
 		return vsyncSupport;
 	}
 
-	static void initFramebuffer(WebGL2RenderingContext ctx, WebGLFramebuffer fbo, int sw, int sh) {
-		context = ctx;
-		mainFramebuffer = fbo;
-		
-		framebufferWidth = windowWidth = sw;
-		framebufferHeight = windowHeight = sh;
-		
-		ctx.bindFramebuffer(FRAMEBUFFER, fbo);
-
-		mainColorRenderbuffer = ctx.createRenderbuffer();
-		mainDepthRenderbuffer = ctx.createRenderbuffer();
-		
-		ctx.bindRenderbuffer(RENDERBUFFER, mainColorRenderbuffer);
-		ctx.renderbufferStorage(RENDERBUFFER, RGBA8, sw, sh);
-		ctx.framebufferRenderbuffer(FRAMEBUFFER, COLOR_ATTACHMENT0, RENDERBUFFER, mainColorRenderbuffer);
-		
-		ctx.bindRenderbuffer(RENDERBUFFER, mainDepthRenderbuffer);
-		ctx.renderbufferStorage(RENDERBUFFER, DEPTH_COMPONENT32F, sw, sh);
-		ctx.framebufferRenderbuffer(FRAMEBUFFER, DEPTH_ATTACHMENT, RENDERBUFFER, mainDepthRenderbuffer);
-		
-		ctx.drawBuffers(new int[] { COLOR_ATTACHMENT0 });
-	}
-	
-	private static void flipBuffer() {
-		
-		context.bindFramebuffer(READ_FRAMEBUFFER, mainFramebuffer);
-		context.bindFramebuffer(DRAW_FRAMEBUFFER, null);
-		context.blitFramebuffer(0, 0, framebufferWidth, framebufferHeight, 0, 0, windowWidth, windowHeight, COLOR_BUFFER_BIT, NEAREST);
-		
-		context.bindFramebuffer(FRAMEBUFFER, mainFramebuffer);
-		
-		if(windowWidth != framebufferWidth || windowHeight != framebufferHeight) {
-			framebufferWidth = windowWidth;
-			framebufferHeight = windowHeight;
-			
-			context.bindRenderbuffer(RENDERBUFFER, mainColorRenderbuffer);
-			context.renderbufferStorage(RENDERBUFFER, RGBA8, framebufferWidth, framebufferHeight);
-			
-			context.bindRenderbuffer(RENDERBUFFER, mainDepthRenderbuffer);
-			context.renderbufferStorage(RENDERBUFFER, DEPTH_COMPONENT32F, framebufferWidth, framebufferHeight);
-		}
-		
-	}
-	
 	public static boolean wasResized() {
-		if(windowWidth != lastWasResizedWindowWidth || windowHeight != lastWasResizedWindowHeight) {
+		if (windowWidth != lastWasResizedWindowWidth || windowHeight != lastWasResizedWindowHeight
+				|| windowDPI != lastWasResizedWindowDPI) {
 			lastWasResizedWindowWidth = windowWidth;
 			lastWasResizedWindowHeight = windowHeight;
+			lastWasResizedWindowDPI = windowDPI;
 			return true;
 		}else {
 			return false;
 		}
 	}
-	
-	public static boolean keyboardNext() {
-		if(unpressCTRL) { //un-press ctrl after copy/paste permission
-			keyEvents.clear();
-			currentEventK = null;
-			keyStates[29] = false;
-			keyStates[157] = false;
-			keyStates[28] = false;
-			keyStates[219] = false;
-			keyStates[220] = false;
-			unpressCTRL = false;
+
+	public static boolean wasVisualViewportResized() {
+		if (visualViewportX != lastWasResizedVisualViewportX || visualViewportY != lastWasResizedVisualViewportY
+				|| visualViewportW != lastWasResizedVisualViewportW
+				|| visualViewportH != lastWasResizedVisualViewportH) {
+			lastWasResizedVisualViewportX = visualViewportX;
+			lastWasResizedVisualViewportY = visualViewportY;
+			lastWasResizedVisualViewportW = visualViewportW;
+			lastWasResizedVisualViewportH = visualViewportH;
+			return true;
+		}else {
 			return false;
 		}
-		currentEventK = null;
-		return !keyEvents.isEmpty() && (currentEventK = keyEvents.remove(0)) != null;
+	}
+
+	public static boolean keyboardNext() {
+		synchronized(keyEvents) {
+			if(unpressCTRL) { //un-press ctrl after copy/paste permission
+				keyEvents.clear();
+				currentEventK = null;
+				keyStates[29] = false;
+				keyStates[157] = false;
+				keyStates[28] = false;
+				keyStates[219] = false;
+				keyStates[220] = false;
+				unpressCTRL = false;
+				return false;
+			}
+			currentEventK = null;
+			return !keyEvents.isEmpty() && (currentEventK = keyEvents.remove(0)) != null;
+		}
+	}
+
+	public static void keyboardFireEvent(EnumFireKeyboardEvent eventType, int eagKey, char keyChar) {
+		synchronized(keyEvents) {
+			switch(eventType) {
+			case KEY_DOWN:
+				keyEvents.add(new VKeyEvent(-1, 0, eagKey, keyChar, EVENT_KEY_DOWN));
+				break;
+			case KEY_UP:
+				keyEvents.add(new VKeyEvent(-1, 0, eagKey, '\0', EVENT_KEY_UP));
+				break;
+			case KEY_REPEAT:
+				keyEvents.add(new VKeyEvent(-1, 0, eagKey, keyChar, EVENT_KEY_REPEAT));
+				break;
+			default:
+				throw new UnsupportedOperationException();
+			}
+			if(keyEvents.size() > 64) {
+				keyEvents.remove(0);
+			}
+		}
 	}
 
 	public static boolean keyboardGetEventKeyState() {
-		return currentEventK == null? false : !currentEventK.getType().equals("keyup");
+		return currentEventK == null ? false : (currentEventK.type != EVENT_KEY_UP);
 	}
 
 	public static int keyboardGetEventKey() {
-		int w = processFunctionKeys(getWhich(currentEventK));
-		return currentEventK == null ? -1 : KeyboardConstants.getEaglerKeyFromBrowser(w, currentEventK.getLocation());
+		return currentEventK == null ? -1 : currentEventK.eagKey;
+	}
+
+	@JSBody(params = { "evt" }, script = "return (typeof evt.key === \"string\") ? evt.key : \"\";")
+	private static native String getCharOrNull(KeyboardEvent evt);
+
+	private static char keyToAsciiLegacy(int whichIn, boolean shiftUp) {
+		switch(whichIn) {
+		case 188: whichIn = 44; break;
+		case 109: whichIn = 45; break;
+		case 190: whichIn = 46; break;
+		case 191: whichIn = 47; break;
+		case 192: whichIn = 96; break;
+		case 220: whichIn = 92; break;
+		case 222: whichIn = 39; break;
+		case 221: whichIn = 93; break;
+		case 219: whichIn = 91; break;
+		case 173: whichIn = 45; break;
+		case 187: whichIn = 61; break;
+		case 186: whichIn = 59; break;
+		case 189: whichIn = 45; break;
+		default: break;
+		}
+		if(shiftUp) {
+			switch(whichIn) {
+			case 96: return '~';
+			case 49: return '!';
+			case 50: return '@';
+			case 51: return '#';
+			case 52: return '$';
+			case 53: return '%';
+			case 54: return '^';
+			case 55: return '&';
+			case 56: return '*';
+			case 57: return '(';
+			case 48: return ')';
+			case 45: return '_';
+			case 61: return '+';
+			case 91: return '{';
+			case 93: return '}';
+			case 92: return '|';
+			case 59: return ':';
+			case 39: return '\"';
+			case 44: return '<';
+			case 46: return '>';
+			case 47: return '?';
+			default: return (char)whichIn;
+			}
+		}else {
+			if(whichIn >= 65 && whichIn <= 90) {
+				return (char)(whichIn + 32);
+			}else {
+				return (char)whichIn;
+			}
+		}
+	}
+
+	private static int asciiUpperToKeyLegacy(char charIn) {
+		switch(charIn) {
+		case '\n': return 17;
+		case '~': return 192;
+		case '!': return 49;
+		case '@': return 50;
+		case '#': return 51;
+		case '$': return 52;
+		case '%': return 53;
+		case '^': return 54;
+		case '&': return 55;
+		case '*': return 56;
+		case '(': return 57;
+		case ')': return 48;
+		case '_': return 173;
+		case '+': return 187;
+		case '{': return 219;
+		case '}': return 221;
+		case '|': return 220;
+		case ':': return 186;
+		case '\"': return 222;
+		case '<': return 188;
+		case '>': return 190;
+		case '?': return 191;
+		case '.': return 190;
+		case '\'': return 222;
+		case ';': return 186;
+		case '[': return 219;
+		case ']': return 221;
+		case ',': return 188;
+		case '/': return 191;
+		case '\\': return 220;
+		case '-': return 189;
+		case '`': return 192;
+		default: return (int)charIn;
+		}
 	}
 
 	public static char keyboardGetEventCharacter() {
-		if(currentEventK == null) return '\0';
-		String s = currentEventK.getKey();
-		return currentEventK == null ? ' ' : (char) (s.length() > 1 ? '\0' : s.charAt(0));
+		return currentEventK == null ? '\0' : currentEventK.keyChar;
 	}
 
 	public static boolean keyboardIsKeyDown(int key) {
@@ -468,7 +1170,7 @@ public class PlatformInput {
 	}
 
 	public static boolean keyboardIsRepeatEvent() {
-		return currentEventK == null ? false : currentEventK.isRepeat();
+		return currentEventK == null ? false : (currentEventK.type == EVENT_KEY_REPEAT);
 	}
 
 	public static void keyboardEnableRepeatEvents(boolean b) {
@@ -477,29 +1179,74 @@ public class PlatformInput {
 
 	public static boolean mouseNext() {
 		currentEvent = null;
-		return !mouseEvents.isEmpty() && (currentEvent = mouseEvents.remove(0)) != null;
+		synchronized(mouseEvents) {
+			return !mouseEvents.isEmpty() && (currentEvent = mouseEvents.remove(0)) != null;
+		}
+	}
+
+	public static void mouseFireMoveEvent(EnumFireMouseEvent eventType, int posX, int posY) {
+		if(eventType == EnumFireMouseEvent.MOUSE_MOVE) {
+			synchronized(mouseEvents) {
+				mouseEvents.add(new VMouseEvent(posX, posY, -1, 0.0f, EVENT_MOUSE_MOVE));
+				if(mouseEvents.size() > 64) {
+					mouseEvents.remove(0);
+				}
+			}
+		}else {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	public static void mouseFireButtonEvent(EnumFireMouseEvent eventType, int posX, int posY, int button) {
+		synchronized(mouseEvents) {
+			switch(eventType) {
+			case MOUSE_DOWN:
+				mouseEvents.add(new VMouseEvent(posX, posY, button, 0.0f, EVENT_MOUSE_DOWN));
+				break;
+			case MOUSE_UP:
+				mouseEvents.add(new VMouseEvent(posX, posY, button, 0.0f, EVENT_MOUSE_UP));
+				break;
+			default:
+				throw new UnsupportedOperationException();
+			}
+			if(mouseEvents.size() > 64) {
+				mouseEvents.remove(0);
+			}
+		}
+	}
+
+	public static void mouseFireWheelEvent(EnumFireMouseEvent eventType, int posX, int posY, float wheel) {
+		if(eventType == EnumFireMouseEvent.MOUSE_WHEEL) {
+			synchronized(mouseEvents) {
+				mouseEvents.add(new VMouseEvent(posX, posY, -1, wheel, EVENT_MOUSE_WHEEL));
+				if(mouseEvents.size() > 64) {
+					mouseEvents.remove(0);
+				}
+			}
+		}else {
+			throw new UnsupportedOperationException();
+		}
 	}
 
 	public static boolean mouseGetEventButtonState() {
-		return currentEvent == null ? false : currentEvent.getType().equals(MouseEvent.MOUSEDOWN);
+		return currentEvent == null ? false : (currentEvent.type == EVENT_MOUSE_DOWN);
 	}
 
 	public static int mouseGetEventButton() {
-		if(currentEvent == null || currentEvent.getType().equals(MouseEvent.MOUSEMOVE)) return -1;
-		int b = currentEvent.getButton();
-		return b == 1 ? 2 : (b == 2 ? 1 : b);
+		if(currentEvent == null || (currentEvent.type == EVENT_MOUSE_MOVE)) return -1;
+		return currentEvent.button;
 	}
 
 	public static int mouseGetEventX() {
-		return currentEvent == null ? -1 : (int)(currentEvent.getClientX() * win.getDevicePixelRatio());
+		return currentEvent == null ? -1 : currentEvent.posX;
 	}
 
 	public static int mouseGetEventY() {
-		return currentEvent == null ? -1 : (int)((canvas.getClientHeight() - currentEvent.getClientY()) * win.getDevicePixelRatio());
+		return currentEvent == null ? -1 : currentEvent.posY;
 	}
 
 	public static int mouseGetEventDWheel() {
-		return ("wheel".equals(currentEvent.getType())) ? (((WheelEvent)currentEvent).getDeltaY() == 0.0D ? 0 : (((WheelEvent)currentEvent).getDeltaY() > 0.0D ? -1 : 1)) : 0;
+		return (currentEvent.type == EVENT_MOUSE_WHEEL) ? (currentEvent.wheel == 0.0f ? 0 : (currentEvent.wheel > 0.0f ? -1 : 1)) : 0;
 	}
 
 	public static int mouseGetX() {
@@ -521,36 +1268,114 @@ public class PlatformInput {
 	}
 
 	public static void mouseSetGrabbed(boolean grab) {
-		long t = System.currentTimeMillis();
+		if(pointerLockSupported == POINTER_LOCK_NONE) {
+			return;
+		}
+		long t = PlatformRuntime.steadyTimeMillis();
 		pointerLockFlag = grab;
 		mouseGrabTimer = t;
 		if(grab) {
-			canvas.requestPointerLock();
+			callRequestPointerLock(canvas);
 			if(mouseUngrabTimeout != -1) Window.clearTimeout(mouseUngrabTimeout);
 			mouseUngrabTimeout = -1;
 			if(t - mouseUngrabTimer < 3000l) {
 				mouseUngrabTimeout = Window.setTimeout(new TimerHandler() {
 					@Override
 					public void onTimer() {
-						canvas.requestPointerLock();
+						callRequestPointerLock(canvas);
 					}
 				}, 3100 - (int)(t - mouseUngrabTimer));
 			}
 		}else {
 			if(mouseUngrabTimeout != -1) Window.clearTimeout(mouseUngrabTimeout);
 			mouseUngrabTimeout = -1;
-			Window.current().getDocument().exitPointerLock();
+			callExitPointerLock(win.getDocument());
 		}
 		mouseDX = 0.0D;
 		mouseDY = 0.0D;
 	}
 
+	private static boolean tryGrabCursorHook() {
+		if(pointerLockSupported == POINTER_LOCK_NONE) {
+			return false;
+		}
+		if(pointerLockFlag && !isPointerLocked()) {
+			mouseSetGrabbed(true);
+			return true;
+		}
+		return false;
+	}
+
+	private static void callRequestPointerLock(HTMLElement el) {
+		switch(pointerLockSupported) {
+		case POINTER_LOCK_CORE:
+			try {
+				el.requestPointerLock();
+			}catch(Throwable t) {
+			}
+			break;
+		case POINTER_LOCK_MOZ:
+			try {
+				mozRequestPointerLock(el);
+			}catch(Throwable t) {
+			}
+			break;
+		default:
+			PlatformRuntime.logger.warn("Failed to request pointer lock, it is not supported!");
+			break;
+		}
+	}
+
+	@JSBody(params = { "el" }, script = "el.mozRequestPointerLock();")
+	private static native void mozRequestPointerLock(HTMLElement el);
+
+	private static void callExitPointerLock(HTMLDocument doc) {
+		switch(pointerLockSupported) {
+		case POINTER_LOCK_CORE:
+			try {
+				doc.exitPointerLock();
+			}catch(Throwable t) {
+			}
+			break;
+		case POINTER_LOCK_MOZ:
+			try {
+				mozExitPointerLock(doc);
+			}catch(Throwable t) {
+			}
+			break;
+		default:
+			PlatformRuntime.logger.warn("Failed to exit pointer lock, it is not supported!");
+			break;
+		}
+	}
+
+	@JSBody(params = { "doc" }, script = "doc.mozExitPointerLock();")
+	private static native void mozExitPointerLock(HTMLDocument el);
+
+	public static boolean mouseGrabSupported() {
+		return pointerLockSupported != POINTER_LOCK_NONE;
+	}
+
 	public static boolean isMouseGrabbed() {
 		return pointerLockFlag;
 	}
 
-	@JSBody(params = { }, script = "return document.pointerLockElement != null;")
-	public static native boolean isPointerLocked();
+	public static boolean isPointerLocked() {
+		switch(pointerLockSupported) {
+		case POINTER_LOCK_CORE:
+			return isPointerLocked0(win.getDocument(), canvas);
+		case POINTER_LOCK_MOZ:
+			return isMozPointerLocked0(win.getDocument(), canvas);
+		default:
+			return false;
+		}
+	}
+
+	@JSBody(params = { "doc", "canvasEl" }, script = "return doc.pointerLockElement === canvasEl;")
+	private static native boolean isPointerLocked0(HTMLDocument doc, HTMLCanvasElement canvasEl);
+
+	@JSBody(params = { "doc", "canvasEl" }, script = "return doc.mozPointerLockElement === canvasEl;")
+	private static native boolean isMozPointerLocked0(HTMLDocument doc, HTMLCanvasElement canvasEl);
 
 	public static int mouseGetDX() {
 		int ret = (int)mouseDX;
@@ -590,40 +1415,203 @@ public class PlatformInput {
 	}
 
 	public static void removeEventHandlers() {
-		win.removeEventListener("contextmenu", contextmenu);
-		canvas.removeEventListener("mousedown", mousedown);
-		canvas.removeEventListener("mouseup", mouseup);
-		canvas.removeEventListener("mousemove", mousemove);
-		canvas.removeEventListener("mouseenter", mouseenter);
-		canvas.removeEventListener("mouseleave", mouseleave);
-		win.removeEventListener("keydown", keydown);
-		win.removeEventListener("keyup", keyup);
-		win.removeEventListener("keypress", keypress);
-		canvas.removeEventListener("wheel", wheel);
-		win.getDocument().removeEventListener("pointerlockchange", pointerlock);
+		if(contextmenu != null) {
+			parent.removeEventListener("contextmenu", contextmenu);
+			contextmenu = null;
+		}
+		if(mousedown != null) {
+			canvas.removeEventListener("mousedown", mousedown);
+			mousedown = null;
+		}
+		if(mouseup != null) {
+			canvas.removeEventListener("mouseup", mouseup);
+			mouseup = null;
+		}
+		if(mousemove != null) {
+			canvas.removeEventListener("mousemove", mousemove);
+			mousemove = null;
+		}
+		if(mouseenter != null) {
+			canvas.removeEventListener("mouseenter", mouseenter);
+			mouseenter = null;
+		}
+		if(mouseleave != null) {
+			canvas.removeEventListener("mouseleave", mouseleave);
+			mouseleave = null;
+		}
+		if(touchstart != null) {
+			canvas.removeEventListener("touchstart", touchstart);
+			touchstart = null;
+		}
+		if(touchmove != null) {
+			canvas.removeEventListener("touchmove", touchmove);
+			touchmove = null;
+		}
+		if(touchend != null) {
+			canvas.removeEventListener("touchend", touchend);
+			touchend = null;
+		}
+		if(touchcancel != null) {
+			canvas.removeEventListener("touchcancel", touchcancel);
+			touchcancel = null;
+		}
+		if(gamepadconnected != null) {
+			win.removeEventListener("gamepadconnected", gamepadconnected);
+			gamepadconnected = null;
+		}
+		if(gamepaddisconnected != null) {
+			win.removeEventListener("gamepaddisconnected", gamepaddisconnected);
+			gamepaddisconnected = null;
+		}
+		if(keydown != null) {
+			win.removeEventListener("keydown", keydown);
+			keydown = null;
+		}
+		if(keyup != null) {
+			win.removeEventListener("keyup", keyup);
+			keyup = null;
+		}
+		if(focus != null) {
+			win.removeEventListener("focus", focus);
+			focus = null;
+		}
+		if(blur != null) {
+			win.removeEventListener("blur", blur);
+			blur = null;
+		}
+		if(wheel != null) {
+			canvas.removeEventListener("wheel", wheel);
+			wheel = null;
+		}
+		if(pointerlock != null) {
+			win.getDocument().removeEventListener("pointerlockchange", pointerlock);
+			pointerlock = null;
+		}
 		if(mouseUngrabTimeout != -1) {
 			Window.clearTimeout(mouseUngrabTimeout);
 			mouseUngrabTimeout = -1;
 		}
+		if(vsyncSaveLockInterval != -1) {
+			try {
+				Window.clearInterval(vsyncSaveLockInterval);
+			}catch(Throwable t) {
+			}
+			vsyncSaveLockInterval = -1;
+		}
+		if(touchKeyboardField != null) {
+			touchKeyboardField.blur();
+			if(parent != null) {
+				parent.removeChild(touchKeyboardField);
+			}
+			touchKeyboardField = null;
+		}
+		if(touchKeyboardOpenZone != null) {
+			if(touchKeyboardOpenZone_touchstart != null) {
+				touchKeyboardOpenZone.removeEventListener("touchstart", touchKeyboardOpenZone_touchstart);
+				touchKeyboardOpenZone_touchstart = null;
+			}
+			if(touchKeyboardOpenZone_touchend != null) {
+				touchKeyboardOpenZone.removeEventListener("touchend", touchKeyboardOpenZone_touchend);
+				touchKeyboardOpenZone_touchend = null;
+			}
+			if(touchKeyboardOpenZone_touchmove != null) {
+				touchKeyboardOpenZone.removeEventListener("touchmove", touchKeyboardOpenZone_touchmove);
+				touchKeyboardOpenZone_touchmove = null;
+			}
+			if(parent != null) {
+				parent.removeChild(touchKeyboardOpenZone);
+			}
+			touchKeyboardOpenZone = null;
+		}
 		try {
-			win.getDocument().exitPointerLock();
+			callExitPointerLock(win.getDocument());
 		}catch(Throwable t) {
 		}
+		ClientMain.removeErrorHandler(win);
 	}
 
 	public static void pressAnyKeyScreen() {
-		if(mouseEvents.isEmpty() && keyEvents.isEmpty() && !hasBeenActive()) {
-			EarlyLoadScreen.paintEnable();
-			
-			while(mouseEvents.isEmpty() && keyEvents.isEmpty()) {
-				EagUtils.sleep(100l);
+		IClientConfigAdapter cfgAdapter = PlatformRuntime.getClientConfigAdapter();
+		boolean allowBootMenu = cfgAdapter.isAllowBootMenu();
+		if(isLikelyMobileBrowser) {
+			EarlyLoadScreen.paintEnable(PlatformOpenGL.checkVAOCapable(), allowBootMenu);
+			try {
+				isOnMobilePressAnyKey = true;
+				setupAnyKeyScreenMobile(allowBootMenu);
+				if(pressAnyKeyScreenMobile() && allowBootMenu) {
+					PlatformRuntime.enterBootMenu();
+				}
+			}finally {
+				isOnMobilePressAnyKey = false;
+			}
+		}else {
+			if(mouseEvents.isEmpty() && keyEvents.isEmpty() && !hasBeenActiveTeaVM(false)) {
+				EarlyLoadScreen.paintEnable(PlatformOpenGL.checkVAOCapable(), allowBootMenu);
+				
+				while(mouseEvents.isEmpty() && keyEvents.isEmpty() && touchEvents.isEmpty()) {
+					EagUtils.sleep(100l);
+				}
 			}
 		}
+		hasShownPressAnyKey = true;
+	}
+
+	private static void setupAnyKeyScreenMobile(boolean allowBootMenu) {
+		if(mobilePressAnyKeyScreen != null) {
+			parent.removeChild(mobilePressAnyKeyScreen);
+		}
+		mobilePressAnyKeyScreen = win.getDocument().createElement("div");
+		mobilePressAnyKeyScreen.getClassList().add("_eaglercraftX_mobile_press_any_key");
+		mobilePressAnyKeyScreen.setAttribute("style", "position:absolute;background-color:white;font-family:sans-serif;top:10%;left:10%;right:10%;bottom:10%;border:5px double black;padding:calc(5px + 7vh) 15px;text-align:center;font-size:20px;user-select:none;z-index:10;");
+		mobilePressAnyKeyScreen.setInnerHTML("<h3 style=\"margin-block-start:0px;margin-block-end:0px;-webkit-margin-before:0px;-webkit-margin-after:0px;margin:20px 5px;\">Mobile Browser Detected</h3>"
+				+ "<p style=\"margin-block-start:0px;margin-block-end:0px;-webkit-margin-before:0px;-webkit-margin-after:0px;margin:20px 5px;\">You must manually select an option below to continue</p>"
+				+ "<p style=\"margin-block-start:0px;margin-block-end:0px;-webkit-margin-before:0px;-webkit-margin-after:0px;margin:20px 2px;\"><button style=\"font: 24px sans-serif;font-weight:bold;\" class=\"_eaglercraftX_mobile_launch_client\">Launch EaglercraftX</button></p>"
+				+ (allowBootMenu ? "<p style=\"margin-block-start:0px;margin-block-end:0px;-webkit-margin-before:0px;-webkit-margin-after:0px;margin:20px 2px;\"><button style=\"font: 24px sans-serif;\" class=\"_eaglercraftX_mobile_enter_boot_menu\">Enter Boot Menu</button></p>" : "")
+				+ "<p style=\"margin-block-start:0px;margin-block-end:0px;-webkit-margin-before:0px;-webkit-margin-after:0px;margin:25px 5px;\">(Tablets and phones with large screens work best)</p>");
+		mobilePressAnyKeyScreen.querySelector("._eaglercraftX_mobile_launch_client").addEventListener("click", new EventListener<Event>() {
+			@Override
+			public void handleEvent(Event evt) {
+				if(isOnMobilePressAnyKey && mobilePressAnyKey != null) {
+					mobilePressAnyKey.call(false);
+				}
+			}
+		});
+		if(allowBootMenu) {
+			mobilePressAnyKeyScreen.querySelector("._eaglercraftX_mobile_enter_boot_menu").addEventListener("click", new EventListener<Event>() {
+				@Override
+				public void handleEvent(Event evt) {
+					if(isOnMobilePressAnyKey && mobilePressAnyKey != null) {
+						mobilePressAnyKey.call(true);
+					}
+				}
+			});
+		}
+		parent.appendChild(mobilePressAnyKeyScreen);
+	}
+
+	@Async
+	private static native boolean pressAnyKeyScreenMobile();
+
+	private static void pressAnyKeyScreenMobile(final AsyncCallback<Boolean> complete) {
+		mobilePressAnyKey = new MobilePressAnyKeyHandler() {
+			@Override
+			public void call(boolean enterBootMenu) {
+				mobilePressAnyKey = null;
+				if(mobilePressAnyKeyScreen != null && parent != null) {
+					parent.removeChild(mobilePressAnyKeyScreen);
+				}
+				mobilePressAnyKeyScreen = null;
+				complete.complete(enterBootMenu);
+			}
+		};
+		PlatformRuntime.logger.info("Waiting for user to select option on mobile press any key screen");
 	}
 
 	public static void clearEvenBuffers() {
 		mouseEvents.clear();
 		keyEvents.clear();
+		touchEvents.clear();
+		net.lax1dude.eaglercraft.v1_8.Gamepad.clearEventBuffer();
 	}
 
 	@JSBody(params = {}, script = "return window.matchMedia(\"(display-mode: fullscreen)\");")
@@ -632,40 +1620,109 @@ public class PlatformInput {
 	@JSBody(params = { "mediaQuery" }, script = "return mediaQuery.matches;")
 	private static native boolean mediaQueryMatches(JSObject mediaQuery);
 
+	public static boolean supportsFullscreen() {
+		return fullscreenSupported != FULLSCREEN_NONE;
+	}
+
 	public static void toggleFullscreen() {
+		if(fullscreenSupported == FULLSCREEN_NONE) return;
 		if (isFullscreen()) {
 			if (keyboardLockSupported) {
 				unlockKeys();
 				lockKeys = false;
 			}
-			exitFullscreen();
+			callExitFullscreen(win.getDocument());
 		} else {
 			if (keyboardLockSupported) {
 				lockKeys();
 				lockKeys = true;
 			}
-			requestFullscreen(canvas);
+			callRequestFullscreen(canvas);
 		}
 	}
 
 	public static boolean isFullscreen() {
-		return mediaQueryMatches(fullscreenQuery);
+		return fullscreenSupported != FULLSCREEN_NONE && mediaQueryMatches(fullscreenQuery);
 	}
 
-	@JSBody(params = { }, script = "window.navigator.keyboard.lock();")
+	@JSBody(params = { }, script = "navigator.keyboard.lock();")
 	private static native void lockKeys();
 
-	@JSBody(params = { }, script = "window.navigator.keyboard.unlock();")
+	@JSBody(params = { }, script = "navigator.keyboard.unlock();")
 	private static native void unlockKeys();
 
-	@JSBody(params = { }, script = "return !!(window.navigator.keyboard && window.navigator.keyboard.lock);")
+	@JSBody(params = { }, script = "return !!(navigator.keyboard && navigator.keyboard.lock);")
 	private static native boolean checkKeyboardLockSupported();
 
-	@JSBody(params = { }, script = "document.exitFullscreen();")
-	private static native void exitFullscreen();
+	private static void callRequestFullscreen(HTMLElement el) {
+		switch(fullscreenSupported) {
+		case FULLSCREEN_CORE:
+			try {
+				requestFullscreen(el);
+			}catch(Throwable t) {
+			}
+			break;
+		case FULLSCREEN_WEBKIT:
+			try {
+				webkitRequestFullscreen(el);
+			}catch(Throwable t) {
+			}
+			break;
+		case FULLSCREEN_MOZ:
+			try {
+				mozRequestFullscreen(el);
+			}catch(Throwable t) {
+			}
+			break;
+		default:
+			PlatformRuntime.logger.warn("Failed to request fullscreen, it is not supported!");
+			break;
+		}
+	}
 
-	@JSBody(params = { "element" }, script = "element.requestFullscreen();")
-	private	 static native void requestFullscreen(HTMLElement element);
+	@JSBody(params = { "el" }, script = "el.requestFullscreen();")
+	private static native void requestFullscreen(HTMLElement element);
+
+	@JSBody(params = { "el" }, script = "el.webkitRequestFullscreen();")
+	private static native void webkitRequestFullscreen(HTMLElement element);
+
+	@JSBody(params = { "el" }, script = "el.mozRequestFullScreen();")
+	private static native void mozRequestFullscreen(HTMLElement element);
+
+	private static void callExitFullscreen(HTMLDocument doc) {
+		switch(fullscreenSupported) {
+		case FULLSCREEN_CORE:
+			try {
+				exitFullscreen(doc);
+			}catch(Throwable t) {
+			}
+			break;
+		case FULLSCREEN_WEBKIT:
+			try {
+				webkitExitFullscreen(doc);
+			}catch(Throwable t) {
+			}
+			break;
+		case FULLSCREEN_MOZ:
+			try {
+				mozCancelFullscreen(doc);
+			}catch(Throwable t) {
+			}
+			break;
+		default:
+			PlatformRuntime.logger.warn("Failed to exit fullscreen, it is not supported!");
+			break;
+		}
+	}
+
+	@JSBody(params = { "doc" }, script = "doc.exitFullscreen();")
+	private	 static native void exitFullscreen(HTMLDocument doc);
+
+	@JSBody(params = { "doc" }, script = "doc.webkitExitFullscreen();")
+	private	 static native void webkitExitFullscreen(HTMLDocument doc);
+
+	@JSBody(params = { "doc" }, script = "doc.mozCancelFullscreen();")
+	private	 static native void mozCancelFullscreen(HTMLDocument doc);
 
 	public static void showCursor(EnumCursorType cursor) {
 		switch(cursor) {
@@ -681,5 +1738,646 @@ public class PlatformInput {
 			break;
 		}
 	}
-	
+
+	public static boolean touchNext() {
+		currentTouchEvent = null;
+		return !touchEvents.isEmpty() && (currentTouchEvent = touchEvents.remove(0)) != null;
+	}
+
+	public static EnumTouchEvent touchGetEventType() {
+		return currentTouchEvent != null ? currentTouchEvent.type : null;
+	}
+
+	public static int touchGetEventTouchPointCount() {
+		return currentTouchEvent != null ? currentTouchEvent.getEventTouches().size() : 0;
+	}
+
+	public static int touchGetEventTouchX(int pointId) {
+		return currentTouchEvent != null ? currentTouchEvent.getEventTouches().get(pointId).posX : 0;
+	}
+
+	public static int touchGetEventTouchY(int pointId) {
+		return currentTouchEvent != null ? currentTouchEvent.getEventTouches().get(pointId).posY : 0;
+	}
+
+	public static float touchGetEventTouchRadiusX(int pointId) {
+		return currentTouchEvent != null ? (float)currentTouchEvent.getEventTouches().get(pointId).touch.getRadiusXSafe(5.0 * windowDPI) : 1.0f;
+	}
+
+	public static float touchGetEventTouchRadiusY(int pointId) {
+		return currentTouchEvent != null ? (float)currentTouchEvent.getEventTouches().get(pointId).touch.getRadiusYSafe(5.0 * windowDPI) : 1.0f;
+	}
+
+	public static float touchGetEventTouchRadiusMixed(int pointId) {
+		if(currentTouchEvent != null) {
+			Touch t = currentTouchEvent.getEventTouches().get(pointId).touch;
+			double d = 5.0 * windowDPI;
+			return (float)(t.getRadiusXSafe(d) * 0.5 + t.getRadiusYSafe(d) * 0.5);
+		}else {
+			return 1.0f;
+		}
+	}
+
+	public static float touchGetEventTouchForce(int pointId) {
+		return currentTouchEvent != null ? (float)currentTouchEvent.getEventTouches().get(pointId).touch.getForceSafe(0.5) : 0.0f;
+	}
+
+	public static int touchGetEventTouchPointUID(int pointId) {
+		return currentTouchEvent != null ? currentTouchEvent.getEventTouches().get(pointId).eventUID : -1;
+	}
+
+	public static int touchPointCount() {
+		return currentTouchState != null ? currentTouchState.getTargetTouchesSize() : 0;
+	}
+
+	public static int touchPointX(int pointId) {
+		return currentTouchState != null ? currentTouchState.getTargetTouches().get(pointId).posX : -1;
+	}
+
+	public static int touchPointY(int pointId) {
+		return currentTouchState != null ? currentTouchState.getTargetTouches().get(pointId).posY : -1;
+	}
+
+	public static float touchRadiusX(int pointId) {
+		return currentTouchState != null ? (float)currentTouchState.getTargetTouches().get(pointId).touch.getRadiusXSafe(5.0 * windowDPI) : 1.0f;
+	}
+
+	public static float touchRadiusY(int pointId) {
+		return currentTouchState != null ? (float)currentTouchState.getTargetTouches().get(pointId).touch.getRadiusYSafe(5.0 * windowDPI) : 1.0f;
+	}
+
+	public static float touchRadiusMixed(int pointId) {
+		if(currentTouchState != null) {
+			Touch t = currentTouchState.getTargetTouches().get(pointId).touch;
+			return (float)(t.getRadiusX() * 0.5 + t.getRadiusY() * 0.5);
+		}else {
+			return 1.0f;
+		}
+	}
+
+	public static float touchForce(int pointId) {
+		return currentTouchState != null ? (float)currentTouchState.getTargetTouches().get(pointId).touch.getForceSafe(0.5) : 0.0f;
+	}
+
+	public static int touchPointUID(int pointId) {
+		return currentTouchState != null ? currentTouchState.getTargetTouches().get(pointId).eventUID : -1;
+	}
+
+	private static final Map<Integer,Integer> touchIDtoUID = new HashMap<>();
+	private static int touchUIDnum = 0;
+
+	private static final SortedTouchEvent.ITouchUIDMapper touchUIDMapperCreate = (idx) -> {
+		Integer ret = touchIDtoUID.get(idx);
+		if(ret != null) return ret.intValue();
+		int r = touchUIDnum++;
+		touchIDtoUID.put(idx, r);
+		return r;
+	};
+
+	private static final SortedTouchEvent.ITouchUIDMapper touchUIDMapper = (idx) -> {
+		Integer ret = touchIDtoUID.get(idx);
+		return ret != null ? ret.intValue() : -1;
+	};
+
+	public static void touchBufferFlush() {
+		pointerLockSupported = 0;
+		pointerLockFlag = true;
+		currentTouchState = null;
+		touchEvents.clear();
+	}
+
+	// Note: this can't be called from the main loop, don't try
+	private static void touchOpenDeviceKeyboard() {
+		if(!touchIsDeviceKeyboardOpenMAYBE()) {
+			if(touchKeyboardField != null) {
+				touchKeyboardField.blur();
+				touchKeyboardField.setValue("");
+				EagUtils.sleep(10l);
+				if(touchKeyboardForm != null) {
+					touchKeyboardForm.removeChild(touchKeyboardField);
+				}else {
+					touchKeyboardField.delete();
+				}
+				touchKeyboardField = null;
+				if(touchKeyboardForm != null) {
+					parent.removeChild(touchKeyboardForm);
+					touchKeyboardForm = null;
+				}
+				return;
+			}
+			if(touchKeyboardForm != null) {
+				parent.removeChild(touchKeyboardForm);
+				touchKeyboardForm = null;
+			}
+			touchKeyboardForm = (HTMLFormElement) win.getDocument().createElement("form");
+			touchKeyboardForm.setAttribute("autocomplete", "off");
+			touchKeyboardForm.getClassList().add("_eaglercraftX_text_input_wrapper");
+			CSSStyleDeclaration decl = touchKeyboardForm.getStyle();
+			decl.setProperty("position", "absolute");
+			decl.setProperty("top", "0px");
+			decl.setProperty("left", "0px");
+			decl.setProperty("right", "0px");
+			decl.setProperty("bottom", "0px");
+			decl.setProperty("z-index", "-100");
+			decl.setProperty("margin", "0px");
+			decl.setProperty("padding", "0px");
+			decl.setProperty("border", "none");
+			touchKeyboardForm.addEventListener("submit", new EventListener<Event>() {
+				@Override
+				public void handleEvent(Event evt) {
+					evt.preventDefault();
+					evt.stopPropagation();
+					JSObject obj = evt.getTimeStamp();
+					if(TeaVMUtils.isTruthy(obj)) {
+						double d = ((JSNumber)obj).doubleValue();
+						if(lastTouchKeyboardEvtA != 0.0 && (d - lastTouchKeyboardEvtA) < 10.0) {
+							return;
+						}
+						if(lastTouchKeyboardEvtB != 0.0 && (d - lastTouchKeyboardEvtB) < 10.0) {
+							return;
+						}
+						if(lastTouchKeyboardEvtC != 0.0 && (d - lastTouchKeyboardEvtC) < 10.0) {
+							return;
+						}
+						if(!showniOSReturnTouchKeyboardWarning) {
+							PlatformRuntime.logger.info("Note: Generating return keystroke from submit event on form, this browser probably doesn't generate keydown/beforeinput/input when enter/return is pressed on the on-screen keyboard");
+							showniOSReturnTouchKeyboardWarning = true;
+						}
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_DOWN, KeyboardConstants.KEY_RETURN, '\n');
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_UP, KeyboardConstants.KEY_RETURN, '\n');
+					}
+					
+				}
+			});
+			touchKeyboardField = (HTMLInputElement) win.getDocument().createElement("input");
+			touchKeyboardField.setType("password");
+			touchKeyboardField.setValue(" ");
+			touchKeyboardField.getClassList().add("_eaglercraftX_text_input_element");
+			touchKeyboardField.setAttribute("autocomplete", "off");
+			decl = touchKeyboardField.getStyle();
+			decl.setProperty("position", "absolute");
+			decl.setProperty("top", "0px");
+			decl.setProperty("left", "0px");
+			decl.setProperty("right", "0px");
+			decl.setProperty("bottom", "0px");
+			decl.setProperty("z-index", "-100");
+			decl.setProperty("margin", "0px");
+			decl.setProperty("padding", "0px");
+			decl.setProperty("border", "none");
+			decl.setProperty("-webkit-touch-callout", "default");
+			touchKeyboardField.addEventListener("beforeinput", new EventListener<InputEvent>() {
+				@Override
+				public void handleEvent(InputEvent evt) {
+					if(touchKeyboardField != evt.getTarget()) return;
+					if(!shownTouchKeyboardEventWarning) {
+						PlatformRuntime.logger.info("Note: Caught beforeinput event from on-screen keyboard, browser probably does not generate global keydown/keyup events on text fields, or does not respond to cancelling keydown");
+						shownTouchKeyboardEventWarning = true;
+					}
+					JSObject obj = evt.getTimeStamp();
+					if(TeaVMUtils.isTruthy(obj)) {
+						double d = ((JSNumber)obj).doubleValue();
+						if(lastTouchKeyboardEvtA != 0.0 && (d - lastTouchKeyboardEvtA) < 10.0) {
+							return;
+						}
+						lastTouchKeyboardEvtB = d;
+					}
+					evt.preventDefault();
+					evt.stopPropagation();
+					switch(evt.getInputType()) {
+					case "insertParagraph":
+					case "insertLineBreak":
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_DOWN, KeyboardConstants.KEY_RETURN, '\n');
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_UP, KeyboardConstants.KEY_RETURN, '\n');
+						break;
+					case "deleteWordBackward":
+					case "deleteSoftLineBackward":
+					case "deleteHardLineBackward":
+					case "deleteEntireSoftLine":
+					case "deleteContentBackward":
+					case "deleteContent":
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_DOWN, KeyboardConstants.KEY_BACK, '\0');
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_UP, KeyboardConstants.KEY_BACK, '\0');
+						break;
+					case "deleteWordForward":
+					case "deleteSoftLineForward":
+					case "deleteHardLineForward":
+					case "deleteContentForward":
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_DOWN, KeyboardConstants.KEY_DELETE, '\0');
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_UP, KeyboardConstants.KEY_DELETE, '\0');
+						break;
+					case "insertText":
+					case "insertCompositionText":
+					case "insertReplacementText":
+						String eventsToGenerate = evt.getData();
+						for(int i = 0, l = eventsToGenerate.length(); i < l; ++i) {
+							char c = eventsToGenerate.charAt(i);
+							int eag = KeyboardConstants.getEaglerKeyFromBrowser(asciiUpperToKeyLegacy(Character.toUpperCase(c)), 0);
+							keyboardFireEvent(EnumFireKeyboardEvent.KEY_DOWN, eag, c);
+							keyboardFireEvent(EnumFireKeyboardEvent.KEY_UP, eag, c);
+						}
+						break;
+					case "insertFromPaste":
+					case "insertFromPasteAsQuotation":
+					case "insertFromDrop":
+					case "insertFromYank":
+					case "insertLink":
+						synchronized(pastedStrings) {
+							pastedStrings.add(evt.getData());
+							if(pastedStrings.size() > 64) {
+								pastedStrings.remove(0);
+							}
+						}
+						break;
+					case "historyUndo":
+					case "historyRedo":
+					case "deleteByDrag":
+					case "deleteByCut":
+						break;
+					default:
+						PlatformRuntime.logger.info("Ingoring InputEvent.inputType \"{}\" from on-screen keyboard", evt.getInputType());
+						break;
+					}
+				}
+			});
+			touchKeyboardField.addEventListener("input", new EventListener<Event>() {
+				@Override
+				public void handleEvent(Event evt) {
+					if(touchKeyboardField != evt.getTarget()) return;
+					JSObject obj = evt.getTimeStamp();
+					if(!shownLegacyTouchKeyboardWarning) {
+						PlatformRuntime.logger.info("Note: Caught legacy input events from on-screen keyboard, browser could be outdated and doesn't support beforeinput event, or does not respond to cancelling beforeinput");
+						shownLegacyTouchKeyboardWarning = true;
+					}
+					if(TeaVMUtils.isTruthy(obj)) {
+						double d = ((JSNumber)obj).doubleValue();
+						if(lastTouchKeyboardEvtA != 0.0 && (d - lastTouchKeyboardEvtA) < 10.0) {
+							return;
+						}
+						if(lastTouchKeyboardEvtB != 0.0 && (d - lastTouchKeyboardEvtB) < 10.0) {
+							return;
+						}
+						lastTouchKeyboardEvtC = d;
+					}
+					String val = touchKeyboardField.getValue();
+					int l = val.length();
+					if(l == 0) {
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_DOWN, KeyboardConstants.KEY_BACK, '\0');
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_UP, KeyboardConstants.KEY_BACK, '\0');
+					}else if(l == 1) {
+						char c = val.charAt(0);
+						int eag = KeyboardConstants.getEaglerKeyFromBrowser(asciiUpperToKeyLegacy(Character.toUpperCase(c)), 0);
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_DOWN, eag, c);
+						keyboardFireEvent(EnumFireKeyboardEvent.KEY_UP, eag, c);
+					}else {
+						val = val.trim();
+						l = val.length();
+						if(l == 0) {
+							keyboardFireEvent(EnumFireKeyboardEvent.KEY_DOWN, KeyboardConstants.KEY_SPACE, ' ');
+							keyboardFireEvent(EnumFireKeyboardEvent.KEY_UP, KeyboardConstants.KEY_SPACE, ' ');
+						}else {
+							char c = val.charAt(l - 1);
+							int eag = KeyboardConstants.getEaglerKeyFromBrowser(asciiUpperToKeyLegacy(Character.toUpperCase(c)), 0);
+							keyboardFireEvent(EnumFireKeyboardEvent.KEY_DOWN, eag, c);
+							keyboardFireEvent(EnumFireKeyboardEvent.KEY_UP, eag, c);
+						}
+					}
+					touchKeyboardField.setValue(" ");
+					setSelectionRange(touchKeyboardField, 1, 1);
+				}
+			});
+			touchKeyboardField.addEventListener("focus", new EventListener<Event>() {
+				@Override
+				public void handleEvent(Event evt) {
+					if(touchKeyboardField != evt.getTarget()) return;
+					touchKeyboardField.setValue(" ");
+					setSelectionRange(touchKeyboardField, 1, 1);
+				}
+			});
+			touchKeyboardField.addEventListener("select", new EventListener<Event>() {
+				@Override
+				public void handleEvent(Event evt) {
+					if(touchKeyboardField != evt.getTarget()) return;
+					evt.preventDefault();
+					evt.stopPropagation();
+					touchKeyboardField.setValue(" ");
+					setSelectionRange(touchKeyboardField, 1, 1);
+				}
+			});
+			touchKeyboardForm.appendChild(touchKeyboardField);
+			parent.appendChild(touchKeyboardForm);
+			touchKeyboardField.setValue(" ");
+			touchKeyboardField.focus();
+			touchKeyboardField.select();
+			setSelectionRange(touchKeyboardField, 1, 1);
+		}else {
+			touchCloseDeviceKeyboard0(false);
+		}
+	}
+
+	public static String touchGetPastedString() {
+		synchronized(pastedStrings) {
+			return pastedStrings.isEmpty() ? null : pastedStrings.remove(0);
+		}
+	}
+
+	public static void touchSetOpenKeyboardZone(int x, int y, int w, int h) {
+		if(w != 0 && h != 0) {
+			int xx = (int)(x / windowDPI);
+			int yy = (int)((windowHeight - y - h) / windowDPI);
+			int ww = (int)(w / windowDPI);
+			int hh = (int)(h / windowDPI);
+			if(xx != touchOpenZoneX || yy != touchOpenZoneY || ww != touchOpenZoneW || hh != touchOpenZoneH) {
+				CSSStyleDeclaration decl = touchKeyboardOpenZone.getStyle();
+				decl.setProperty("display", "block");
+				decl.setProperty("left", "" + xx + "px");
+				decl.setProperty("top", "" + yy + "px");
+				decl.setProperty("width", "" + ww + "px");
+				decl.setProperty("height", "" + hh + "px");
+				touchOpenZoneX = xx;
+				touchOpenZoneY = yy;
+				touchOpenZoneW = ww;
+				touchOpenZoneH = hh;
+			}
+		}else {
+			if(touchOpenZoneW != 0 || touchOpenZoneH != 0) {
+				CSSStyleDeclaration decl = touchKeyboardOpenZone.getStyle();
+				decl.setProperty("display", "none");
+				decl.setProperty("top", "0px");
+				decl.setProperty("left", "0px");
+				decl.setProperty("width", "0px");
+				decl.setProperty("height", "0px");
+			}
+			touchOpenZoneX = 0;
+			touchOpenZoneY = 0;
+			touchOpenZoneW = 0;
+			touchOpenZoneH = 0;
+		}
+	}
+
+	public static void touchCloseDeviceKeyboard() {
+		touchCloseDeviceKeyboard0(true);
+	}
+
+	private static void touchCloseDeviceKeyboard0(boolean sync) {
+		if(touchKeyboardField != null) {
+			touchKeyboardField.blur();
+			touchKeyboardField.setValue("");
+			if(sync) {
+				EagUtils.sleep(10l);
+				if(touchKeyboardForm != null) {
+					touchKeyboardForm.removeChild(touchKeyboardField);
+				}else {
+					touchKeyboardField.delete();
+				}
+				touchKeyboardField = null;
+			}else {
+				final HTMLInputElement el = touchKeyboardField;
+				final HTMLFormElement el2 = touchKeyboardForm;
+				Window.setTimeout(() -> {
+					if(el2 != null) {
+						el2.removeChild(el);
+						el2.delete();
+					}else {
+						el.delete();
+					}
+				}, 10);
+				touchKeyboardField = null;
+				touchKeyboardForm = null;
+				return;
+			}
+		}
+		if(touchKeyboardForm != null) {
+			if(parent != null) {
+				parent.removeChild(touchKeyboardForm);
+			}else {
+				touchKeyboardForm.delete();
+			}
+			touchKeyboardForm = null;
+		}
+	}
+
+	public static boolean touchIsDeviceKeyboardOpenMAYBE() {
+		return touchKeyboardField != null && isActiveElement(win.getDocument(), touchKeyboardField);
+	}
+
+	@JSBody(params = { "doc", "el" }, script = "return doc.activeElement === el;")
+	private static native boolean isActiveElement(HTMLDocument doc, HTMLElement el);
+
+	private static void enumerateGamepads() {
+		if(!gamepadSupported) return;
+		if(selectedGamepad != null) {
+			selectedGamepad = updateGamepad(selectedGamepad);
+			if(selectedGamepad == null || !TeaVMUtils.isTruthy(selectedGamepad) || !selectedGamepad.isConnected()) {
+				selectedGamepad = null;
+			}
+		}
+		List<Gamepad> oldList = null;
+		if(!gamepadList.isEmpty()) {
+			oldList = new ArrayList<>(gamepadList);
+			gamepadList.clear();
+		}
+		Gamepad[] gamepads = Navigator.getGamepads();
+		if(gamepads != null && gamepads.length > 0) {
+			for(int i = 0; i < gamepads.length; ++i) {
+				Gamepad g = gamepads[i];
+				if(TeaVMUtils.isTruthy(g) && g.isConnected() && "standard".equals(g.getMapping())) {
+					gamepadList.add(g);
+				}
+			}
+		}
+		if(selectedGamepad != null) {
+			selectedGamepadName = selectedGamepad.getId();
+		}
+		if(oldList == null) {
+			if(!gamepadList.isEmpty()) {
+				for(int i = 0, l = gamepadList.size(); i < l; ++i) {
+					PlatformRuntime.logger.info("Found controller: {}", gamepadList.get(i).getId());
+				}
+			}
+		}else {
+			if(gamepadList.isEmpty()) {
+				for(int i = 0, l = oldList.size(); i < l; ++i) {
+					PlatformRuntime.logger.info("Lost controller: {}", oldList.get(i).getId());
+				}
+			}else {
+				Map<String,Integer> oldDevCounts = new HashMap<>();
+				for(Gamepad gg : oldList) {
+					String s = gg.getId();
+					Integer i = oldDevCounts.get(s);
+					if(i != null) {
+						oldDevCounts.put(s, Integer.valueOf(i.intValue() + 1));
+					}else {
+						oldDevCounts.put(s, Integer.valueOf(1));
+					}
+				}
+				Map<String,Integer> newDevCounts = new HashMap<>();
+				for(Gamepad gg : gamepadList) {
+					String s = gg.getId();
+					Integer i = newDevCounts.get(s);
+					if(i != null) {
+						newDevCounts.put(s, Integer.valueOf(i.intValue() + 1));
+					}else {
+						newDevCounts.put(s, Integer.valueOf(1));
+					}
+				}
+				for(Entry<String,Integer> etr : oldDevCounts.entrySet()) {
+					Integer i = newDevCounts.get(etr.getKey());
+					if(i == null) {
+						for(int j = 0, l = etr.getValue().intValue(); j < l; ++j) {
+							PlatformRuntime.logger.info("Lost controller: {}", etr.getKey());
+						}
+					}else {
+						int j = i.intValue();
+						int k = etr.getValue().intValue();
+						if(k != j) {
+							if(k < j) {
+								for(int m = 0, l = j - k; m < l; ++m) {
+									PlatformRuntime.logger.info("Found controller: {}", etr.getKey());
+								}
+							}else {
+								for(int m = 0, l = k - j; m < l; ++m) {
+									PlatformRuntime.logger.info("Lost controller: {}", etr.getKey());
+								}
+							}
+						}
+					}
+				}
+				for(Entry<String,Integer> etr : newDevCounts.entrySet()) {
+					Integer i = oldDevCounts.get(etr.getKey());
+					if(i == null) {
+						for(int j = 0, l = etr.getValue().intValue(); j < l; ++j) {
+							PlatformRuntime.logger.info("Found controller: {}", etr.getKey());
+						}
+					}
+				}
+			}
+			
+		}
+	}
+
+	public static int gamepadGetValidDeviceCount() {
+		if(!gamepadSupported) return 0;
+		return gamepadList.size();
+	}
+
+	public static String gamepadGetDeviceName(int deviceId) {
+		if(gamepadSupported && deviceId >= 0 && deviceId < gamepadList.size()) {
+			return gamepadList.get(deviceId).getId();
+		}else {
+			return "Unknown";
+		}
+	}
+
+	public static void gamepadSetSelectedDevice(int deviceId) {
+		if(!gamepadSupported) return;
+		gamepadReset();
+		if(deviceId >= 0 && deviceId < gamepadList.size()) {
+			selectedGamepad = gamepadList.get(deviceId);
+			gamepadTimestamp = -1.0;
+			if(!TeaVMUtils.isTruthy(selectedGamepad) || !selectedGamepad.isConnected()) {
+				selectedGamepad = null;
+			}
+		}else {
+			selectedGamepad = null;
+		}
+	}
+
+	private static void gamepadReset() {
+		for(int i = 0; i < gamepadButtonStates.length; ++i) {
+			gamepadButtonStates[i] = false;
+		}
+		for(int i = 0; i < gamepadAxisStates.length; ++i) {
+			gamepadAxisStates[i] = 0.0f;
+		}
+	}
+
+	@JSBody(params = { }, script = "return (typeof navigator.getGamepads === \"function\");")
+	private static native boolean gamepadSupported();
+
+	@JSBody(params = { "gp" }, script = "return navigator.getGamepads()[gp.index];")
+	private static native Gamepad updateGamepad(Gamepad gp);
+
+	public static void gamepadUpdate() {
+		if(!gamepadSupported) return;
+		if(selectedGamepad != null) {
+			selectedGamepad = updateGamepad(selectedGamepad);
+			if(selectedGamepad == null || !TeaVMUtils.isTruthy(selectedGamepad) || !selectedGamepad.isConnected()) {
+				gamepadReset();
+				selectedGamepad = null;
+				return;
+			}
+			double ts = selectedGamepad.getTimestamp();
+			if(ts != gamepadTimestamp) {
+				gamepadTimestamp = ts;
+				gamepadReset();
+				GamepadButton[] btns = selectedGamepad.getButtons();
+				for(int i = 0; i < btns.length; ++i) {
+					int j = GamepadConstants.getEaglerButtonFromBrowser(i);
+					if(j >= 0 && j < gamepadButtonStates.length) {
+						gamepadButtonStates[j] = btns[i].isPressed();
+					}
+				}
+				double[] axes = selectedGamepad.getAxes();
+				for(int i = 0; i < axes.length; ++i) {
+					if(i >= 4) {
+						break;
+					}
+					gamepadAxisStates[i] = (float)axes[i];
+				}
+			}
+		}else {
+			gamepadReset();
+		}
+	}
+
+	public static boolean gamepadIsValid() {
+		if(!gamepadSupported) return false;
+		return selectedGamepad != null;
+	}
+
+	public static String gamepadGetName() {
+		return gamepadSupported && selectedGamepad != null ? selectedGamepadName : "Unknown";
+	}
+
+	public static boolean gamepadGetButtonState(int button) {
+		return gamepadSupported && selectedGamepad != null && button >= 0 && button < gamepadButtonStates.length ? gamepadButtonStates[button] : false;
+	}
+
+	public static float gamepadGetAxis(int axis) {
+		return gamepadSupported && selectedGamepad != null && axis >= 0 && axis < gamepadAxisStates.length ? gamepadAxisStates[axis] : 0.0f;
+	}
+
+	public static float getDPI() {
+		return windowDPI;
+	}
+
+	@JSBody(params = { "el" }, script = "var xx = 0; var yy = 0;"
+			+ "while(el && !isNaN(el.offsetLeft) && !isNaN(el.offsetTop)) {"
+			+ "xx += el.offsetLeft - el.scrollLeft;"
+			+ "yy += el.offsetTop - el.scrollTop;"
+			+ "el = el.offsetParent;"
+			+ "} return { left: xx, top: yy };")
+	private static native TextRectangle getPositionOf(HTMLElement el);
+
+	private static void updateTouchOffset() {
+		try {
+			TextRectangle bounds = getPositionOf(canvas);
+			touchOffsetXTeaVM = bounds.getLeft();
+			touchOffsetYTeaVM = bounds.getTop();
+		}catch(Throwable t) {
+			touchOffsetXTeaVM = 0;
+			touchOffsetYTeaVM = 0;
+		}
+	}
+
+	static void initWindowSize(int sw, int sh, float dpi) {
+		windowWidth = sw;
+		windowHeight = sh;
+		windowDPI = dpi;
+		visualViewportX = 0;
+		visualViewportY = 0;
+		visualViewportW = sw;
+		visualViewportH = sh;
+	}
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformNetworking.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformNetworking.java
index 679b4a6..a41cf1d 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformNetworking.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformNetworking.java
@@ -1,26 +1,11 @@
 package net.lax1dude.eaglercraft.v1_8.internal;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.teavm.interop.Async;
-import org.teavm.interop.AsyncCallback;
-import org.teavm.jso.JSBody;
-import org.teavm.jso.JSObject;
-import org.teavm.jso.dom.events.Event;
-import org.teavm.jso.dom.events.EventListener;
-import org.teavm.jso.dom.events.MessageEvent;
-import org.teavm.jso.typedarrays.ArrayBuffer;
-import org.teavm.jso.websocket.WebSocket;
-
-import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMServerQuery;
-import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMWebSocketClient;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
 /**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -36,169 +21,20 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  */
 public class PlatformNetworking {
 	
-	private static WebSocket sock = null;
-	private static boolean sockIsConnecting = false;
-	private static boolean sockIsConnected = false;
-	private static boolean sockIsAlive = false;
-	private static boolean sockIsFailed = false;
-	private static LinkedList<byte[]> readPackets = new LinkedList();
-	private static String currentSockURI = null;
-	private static EnumServerRateLimit serverRateLimit = null;
-	
 	private static final Logger logger = LogManager.getLogger("PlatformNetworking");
 	
-	public static EnumEaglerConnectionState playConnectionState() {
-		return !sockIsConnected ? (sockIsFailed ? EnumEaglerConnectionState.FAILED : EnumEaglerConnectionState.CLOSED)
-				: (sockIsConnecting ? EnumEaglerConnectionState.CONNECTING : EnumEaglerConnectionState.CONNECTED);
-	}
-
-	public static void startPlayConnection(String destination) {
-		sockIsFailed = !connectWebSocket(destination).booleanValue();
-	}
-
-	@JSBody(params = { "obj" }, script = "return typeof obj === \"string\";")
-	private static native boolean isString(JSObject obj);
-
-	@Async
-	public static native Boolean connectWebSocket(String sockURI);
-	
-	private static void connectWebSocket(String sockURI, final AsyncCallback<Boolean> cb) {
-		sockIsConnecting = true;
-		sockIsConnected = false;
-		sockIsAlive = false;
-		currentSockURI = sockURI;
+	public static IWebSocketClient openWebSocket(String socketURI) {
 		try {
-			sock = WebSocket.create(sockURI);
-		} catch(Throwable t) {
-			sockIsFailed = true;
-			sockIsConnecting = false;
-			sockIsAlive = false;
-			cb.complete(Boolean.FALSE);
-			return;
-		}
-		final WebSocket oldSock = sock;
-		sock.setBinaryType("arraybuffer");
-		TeaVMUtils.addEventListener(sock, "open", new EventListener<Event>() {
-			@Override
-			public void handleEvent(Event evt) {
-				if (oldSock != sock) return;
-				sockIsConnecting = false;
-				sockIsAlive = false;
-				sockIsConnected = true;
-				synchronized(readPackets) {
-					readPackets.clear();
-				}
-				cb.complete(Boolean.TRUE);
-			}
-		});
-		TeaVMUtils.addEventListener(sock, "close", new EventListener<Event>() {
-			@Override
-			public void handleEvent(Event evt) {
-				if (oldSock != sock) return;
-				sock = null;
-				boolean b = sockIsConnecting;
-				sockIsConnecting = false;
-				sockIsConnected = false;
-				sockIsAlive = false;
-				if(b) cb.complete(Boolean.FALSE);
-			}
-		});
-		TeaVMUtils.addEventListener(sock, "message", new EventListener<MessageEvent>() {
-			@Override
-			public void handleEvent(MessageEvent evt) {
-				if (oldSock != sock) return;
-				sockIsAlive = true;
-				if(isString(evt.getData())) {
-					String str = evt.getDataAsString();
-					if(str.equalsIgnoreCase("BLOCKED")) {
-						logger.error("Reached full IP ratelimit!");
-						serverRateLimit = EnumServerRateLimit.BLOCKED;
-					}else if(str.equalsIgnoreCase("LOCKED")) {
-						logger.error("Reached full IP ratelimit lockout!");
-						serverRateLimit = EnumServerRateLimit.LOCKED_OUT;
-					}
-				}else {
-					synchronized(readPackets) {
-						readPackets.add(TeaVMUtils.wrapByteArrayBuffer(evt.getDataAsArray()));
-					}
-				}
-			}
-		});
-		TeaVMUtils.addEventListener(sock, "error", new EventListener<Event>() {
-			@Override
-			public void handleEvent(Event evt) {
-				if (oldSock != sock) return;
-				if(sockIsConnecting) {
-					sockIsFailed = true;
-					sockIsConnecting = false;
-					sockIsAlive = false;
-					cb.complete(Boolean.FALSE);
-				}
-			}
-		});
-	}
-
-	public static void playDisconnect() {
-		if(sock != null) sock.close();
-		sockIsConnecting = false;
-	}
-
-	public static byte[] readPlayPacket() {
-		synchronized(readPackets) {
-			if(!readPackets.isEmpty()) {
-				return readPackets.remove(0);
-			}else {
-				return null;
-			}
-		}
-	}
-
-	public static List<byte[]> readAllPacket() {
-		synchronized(readPackets) {
-			if(!readPackets.isEmpty()) {
-				List<byte[]> ret = new ArrayList<>(readPackets);
-				readPackets.clear();
-				return ret;
-			}else {
-				return null;
-			}
-		}
-	}
-
-	public static int countAvailableReadData() {
-		int total = 0;
-		synchronized(readPackets) {
-			for(int i = 0, l = readPackets.size(); i < l; ++i) {
-				total += readPackets.get(i).length;
-			}
-		}
-		return total;
-	}
-
-	@JSBody(params = { "sock", "buffer" }, script = "sock.send(buffer);")
-	protected static native void nativeBinarySend(WebSocket sock, ArrayBuffer buffer);
-
-	public static void writePlayPacket(byte[] pkt) {
-		if(sock != null && !sockIsConnecting) {
-			nativeBinarySend(sock, TeaVMUtils.unwrapArrayBuffer(pkt));
-		}
-	}
-
-	public static IServerQuery sendServerQuery(String uri, String accept) {
-		try {
-			return new TeaVMServerQuery(uri, accept);
+			return new TeaVMWebSocketClient(socketURI);
 		}catch(Throwable t) {
-			logger.error("Could not send query to \"{}\"!", uri);
+			logger.error("Could not open WebSocket to \"{}\"!", socketURI);
 			logger.error(t);
 			return null;
 		}
 	}
-
-	public static EnumServerRateLimit getRateLimit() {
-		return serverRateLimit == null ? EnumServerRateLimit.OK : serverRateLimit;
-	}
-
-	public static String getCurrentURI() {
-		return currentSockURI;
+	
+	public static IWebSocketClient openWebSocketUnsafe(String socketURI) {
+		return new TeaVMWebSocketClient(socketURI);
 	}
+	
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java
index 294b9e8..d1f9396 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java
@@ -1,19 +1,27 @@
 package net.lax1dude.eaglercraft.v1_8.internal;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.teavm.jso.webgl.WebGLUniformLocation;
 
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.EaglerArrayBufferAllocator;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMClientConfigAdapter;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGL2RenderingContext;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGLANGLEInstancedArrays;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGLBackBuffer;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGLOESVertexArrayObject;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGLVertexArray;
 import net.lax1dude.eaglercraft.v1_8.log4j.Level;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 
 /**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -32,19 +40,129 @@ public class PlatformOpenGL {
 	private static final Logger logger = LogManager.getLogger("PlatformOpenGL");
 	
 	static WebGL2RenderingContext ctx = null;
+	static int glesVers = -1;
 
-	static boolean hasDebugRenderInfoExt = false;
-	static boolean hasFramebufferHDR16FSupport = false;
-	static boolean hasFramebufferHDR32FSupport = false;
+	static boolean hasANGLEInstancedArrays = false;
+	static boolean hasEXTColorBufferFloat = false;
+	static boolean hasEXTColorBufferHalfFloat = false;
+	static boolean hasEXTShaderTextureLOD = false;
+	static boolean hasOESFBORenderMipmap = false;
+	static boolean hasOESVertexArrayObject = false;
+	static boolean hasOESTextureFloat = false;
+	static boolean hasOESTextureFloatLinear = false;
+	static boolean hasOESTextureHalfFloat = false;
+	static boolean hasOESTextureHalfFloatLinear = false;
+	static boolean hasEXTTextureFilterAnisotropic = false;
+	static boolean hasWEBGLDebugRendererInfo = false;
+
+	static WebGLANGLEInstancedArrays ANGLEInstancedArrays = null;
+	static WebGLOESVertexArrayObject OESVertexArrayObject = null;
+
+	static boolean hasFBO16FSupport = false;
+	static boolean hasFBO32FSupport = false;
+	static boolean hasLinearHDR16FSupport = false;
 	static boolean hasLinearHDR32FSupport = false;
-	
-	static void setCurrentContext(WebGL2RenderingContext context) {
+
+	static final int VAO_IMPL_NONE = -1;
+	static final int VAO_IMPL_CORE = 0;
+	static final int VAO_IMPL_OES = 1;
+	static int vertexArrayImpl = VAO_IMPL_NONE;
+
+	static final int INSTANCE_IMPL_NONE = -1;
+	static final int INSTANCE_IMPL_CORE = 0;
+	static final int INSTANCE_IMPL_ANGLE = 1;
+	static int instancingImpl = INSTANCE_IMPL_NONE;
+
+	static void setCurrentContext(int glesVersIn, WebGL2RenderingContext context) {
 		ctx = context;
-		hasDebugRenderInfoExt = ctx.getExtension("WEBGL_debug_renderer_info") != null;
-		hasFramebufferHDR16FSupport = ctx.getExtension("EXT_color_buffer_half_float") != null;
-		hasFramebufferHDR32FSupport = ctx.getExtension("EXT_color_buffer_float") != null;
-		hasLinearHDR32FSupport = ctx.getExtension("OES_texture_float_linear") != null;
-		_wglClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+		if(ctx != null) {
+			glesVers = glesVersIn;
+			boolean allowExts = ((TeaVMClientConfigAdapter)PlatformRuntime.getClientConfigAdapter()).isUseWebGLExtTeaVM();
+			if(allowExts) {
+				ANGLEInstancedArrays = glesVersIn == 200 ? (WebGLANGLEInstancedArrays) ctx.getExtension("ANGLE_instanced_arrays") : null;
+				hasANGLEInstancedArrays = glesVersIn == 200 && ANGLEInstancedArrays != null;
+				hasEXTColorBufferFloat = (glesVersIn == 310 || glesVersIn == 300) && ctx.getExtension("EXT_color_buffer_float") != null;
+				hasEXTColorBufferHalfFloat = !hasEXTColorBufferFloat
+						&& (glesVersIn == 310 || glesVersIn == 300 || glesVersIn == 200) && ctx.getExtension("EXT_color_buffer_half_float") != null;
+				hasEXTShaderTextureLOD = glesVersIn == 200 && ctx.getExtension("EXT_shader_texture_lod") != null;
+				hasOESFBORenderMipmap = glesVersIn == 200 && ctx.getExtension("OES_fbo_render_mipmap") != null;
+				OESVertexArrayObject = glesVersIn == 200 ? (WebGLOESVertexArrayObject) ctx.getExtension("OES_vertex_array_object") : null;
+				hasOESVertexArrayObject = glesVersIn == 200 && OESVertexArrayObject != null;
+				hasOESTextureFloat = glesVersIn == 200 && ctx.getExtension("OES_texture_float") != null;
+				hasOESTextureFloatLinear = glesVersIn >= 300 && ctx.getExtension("OES_texture_float_linear") != null;
+				hasOESTextureHalfFloat = glesVersIn == 200 && ctx.getExtension("OES_texture_half_float") != null;
+				hasOESTextureHalfFloatLinear = glesVersIn == 200 && ctx.getExtension("OES_texture_half_float_linear") != null;
+				hasEXTTextureFilterAnisotropic = ctx.getExtension("EXT_texture_filter_anisotropic") != null;
+			}else {
+				hasANGLEInstancedArrays = false;
+				hasEXTColorBufferFloat = false;
+				hasEXTColorBufferHalfFloat = false;
+				hasEXTShaderTextureLOD = false;
+				hasOESFBORenderMipmap = false;
+				hasOESVertexArrayObject = false;
+				hasOESTextureFloat = false;
+				hasOESTextureFloatLinear = false;
+				hasOESTextureHalfFloat = false;
+				hasOESTextureHalfFloatLinear = false;
+				hasEXTTextureFilterAnisotropic = false;
+			}
+			hasWEBGLDebugRendererInfo = ctx.getExtension("WEBGL_debug_renderer_info") != null;
+			
+			hasFBO16FSupport = glesVersIn >= 320 || ((glesVersIn >= 300 || hasOESTextureFloat) && (hasEXTColorBufferFloat || hasEXTColorBufferHalfFloat));
+			hasFBO32FSupport = glesVersIn >= 320 || ((glesVersIn >= 300 || hasOESTextureHalfFloat) && hasEXTColorBufferFloat);
+			hasLinearHDR16FSupport = glesVersIn >= 300 || hasOESTextureHalfFloatLinear;
+			hasLinearHDR32FSupport = glesVersIn >= 300 && hasOESTextureFloatLinear;
+			
+			if(glesVersIn >= 300) {
+				vertexArrayImpl = VAO_IMPL_CORE;
+				instancingImpl = INSTANCE_IMPL_CORE;
+			}else if(glesVersIn == 200) {
+				vertexArrayImpl = hasOESVertexArrayObject ? VAO_IMPL_OES : VAO_IMPL_NONE;
+				instancingImpl = hasANGLEInstancedArrays ? INSTANCE_IMPL_ANGLE : INSTANCE_IMPL_NONE;
+			}else {
+				vertexArrayImpl = VAO_IMPL_NONE;
+				instancingImpl = INSTANCE_IMPL_NONE;
+			}
+			
+			_wglClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+		}else {
+			glesVers = -1;
+			hasANGLEInstancedArrays = false;
+			hasEXTColorBufferFloat = false;
+			hasEXTColorBufferHalfFloat = false;
+			hasEXTShaderTextureLOD = false;
+			hasOESFBORenderMipmap = false;
+			hasOESVertexArrayObject = false;
+			hasOESTextureFloat = false;
+			hasOESTextureFloatLinear = false;
+			hasOESTextureHalfFloat = false;
+			hasOESTextureHalfFloatLinear = false;
+			hasEXTTextureFilterAnisotropic = false;
+			hasWEBGLDebugRendererInfo = false;
+			ANGLEInstancedArrays = null;
+			OESVertexArrayObject = null;
+			hasFBO16FSupport = false;
+			hasFBO32FSupport = false;
+			hasLinearHDR16FSupport = false;
+			hasLinearHDR32FSupport = false;
+		}
+	}
+
+	public static final List<String> dumpActiveExtensions() {
+		List<String> exts = new ArrayList<>();
+		if(hasANGLEInstancedArrays) exts.add("ANGLE_instanced_arrays");
+		if(hasEXTColorBufferFloat) exts.add("EXT_color_buffer_float");
+		if(hasEXTColorBufferHalfFloat) exts.add("EXT_color_buffer_half_float");
+		if(hasEXTShaderTextureLOD) exts.add("EXT_shader_texture_lod");
+		if(hasOESFBORenderMipmap) exts.add("OES_fbo_render_mipmap");
+		if(hasOESVertexArrayObject) exts.add("OES_vertex_array_object");
+		if(hasOESTextureFloat) exts.add("OES_texture_float");
+		if(hasOESTextureFloatLinear) exts.add("OES_texture_float_linear");
+		if(hasOESTextureHalfFloat) exts.add("OES_texture_half_float");
+		if(hasOESTextureHalfFloatLinear) exts.add("OES_texture_half_float_linear");
+		if(hasEXTTextureFilterAnisotropic) exts.add("EXT_texture_filter_anisotropic");
+		if(hasWEBGLDebugRendererInfo) exts.add("WEBGL_debug_renderer_info");
+		return exts;
 	}
 
 	public static final void _wglEnable(int glEnum) {
@@ -105,17 +223,45 @@ public class PlatformOpenGL {
 	}
 	
 	public static final void _wglDrawBuffers(int buffer) {
-		ctx.drawBuffers(new int[] { buffer });
+		if(glesVers == 200) {
+			if(buffer != 0x8CE0) { // GL_COLOR_ATTACHMENT0
+				throw new UnsupportedOperationException();
+			}
+		}else {
+			ctx.drawBuffers(new int[] { buffer });
+		}
 	}
 	
 	public static final void _wglDrawBuffers(int[] buffers) {
-		ctx.drawBuffers(buffers);
+		if(glesVers == 200) {
+			if(buffers.length != 1 || buffers[0] != 0x8CE0) { // GL_COLOR_ATTACHMENT0
+				throw new UnsupportedOperationException();
+			}
+		}else {
+			ctx.drawBuffers(buffers);
+		}
 	}
 	
 	public static final void _wglReadBuffer(int buffer) {
 		ctx.readBuffer(buffer);
 	}
 	
+	public static final void _wglReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer data) {
+		ctx.readPixels(x, y, width, height, format, type, EaglerArrayBufferAllocator.getDataView8Unsigned(data));
+	}
+	
+	public static final void _wglReadPixels_u16(int x, int y, int width, int height, int format, int type, ByteBuffer data) {
+		ctx.readPixels(x, y, width, height, format, type, EaglerArrayBufferAllocator.getDataView16Unsigned(data));
+	}
+	
+	public static final void _wglReadPixels(int x, int y, int width, int height, int format, int type, IntBuffer data) {
+		ctx.readPixels(x, y, width, height, format, type, EaglerArrayBufferAllocator.getDataView32(data));
+	}
+	
+	public static final void _wglReadPixels(int x, int y, int width, int height, int format, int type, FloatBuffer data) {
+		ctx.readPixels(x, y, width, height, format, type, EaglerArrayBufferAllocator.getDataView32F(data));
+	}
+	
 	public static final void _wglPolygonOffset(float f1, float f2) {
 		ctx.polygonOffset(f1, f2);
 	}
@@ -133,7 +279,14 @@ public class PlatformOpenGL {
 	}
 	
 	public static final IBufferArrayGL _wglGenVertexArrays() {
-		return new OpenGLObjects.BufferArrayGL(ctx.createVertexArray());
+		switch(vertexArrayImpl) {
+		case VAO_IMPL_CORE:
+			return new OpenGLObjects.BufferArrayGL(ctx.createVertexArray());
+		case VAO_IMPL_OES:
+			return new OpenGLObjects.BufferArrayGL(OESVertexArrayObject.createVertexArrayOES());
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 	
 	public static final IProgramGL _wglCreateProgram() {
@@ -157,51 +310,61 @@ public class PlatformOpenGL {
 	}
 	
 	public static final void _wglDeleteBuffers(IBufferGL obj) {
-		ctx.deleteBuffer(obj == null ? null : ((OpenGLObjects.BufferGL)obj).ptr);
+		ctx.deleteBuffer(((OpenGLObjects.BufferGL)obj).ptr);
 	}
 	
 	public static final void _wglDeleteTextures(ITextureGL obj) {
-		ctx.deleteTexture(obj == null ? null : ((OpenGLObjects.TextureGL)obj).ptr);
+		ctx.deleteTexture(((OpenGLObjects.TextureGL)obj).ptr);
 	}
 	
 	public static final void _wglDeleteVertexArrays(IBufferArrayGL obj) {
-		ctx.deleteVertexArray(obj == null ? null : ((OpenGLObjects.BufferArrayGL)obj).ptr);
+		WebGLVertexArray ptr = ((OpenGLObjects.BufferArrayGL)obj).ptr;
+		switch(vertexArrayImpl) {
+		case VAO_IMPL_CORE:
+			ctx.deleteVertexArray(ptr);
+			break;
+		case VAO_IMPL_OES:
+			OESVertexArrayObject.deleteVertexArrayOES(ptr);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 	
 	public static final void _wglDeleteProgram(IProgramGL obj) {
-		ctx.deleteProgram(obj == null ? null : ((OpenGLObjects.ProgramGL)obj).ptr);
+		ctx.deleteProgram(((OpenGLObjects.ProgramGL)obj).ptr);
 	}
 	
 	public static final void _wglDeleteShader(IShaderGL obj) {
-		ctx.deleteShader(obj == null ? null : ((OpenGLObjects.ShaderGL)obj).ptr);
+		ctx.deleteShader(((OpenGLObjects.ShaderGL)obj).ptr);
 	}
 	
 	public static final void _wglDeleteFramebuffer(IFramebufferGL obj) {
-		ctx.deleteFramebuffer(obj == null ? null : ((OpenGLObjects.FramebufferGL)obj).ptr);
+		ctx.deleteFramebuffer(((OpenGLObjects.FramebufferGL)obj).ptr);
 	}
 	
 	public static final void _wglDeleteRenderbuffer(IRenderbufferGL obj) {
-		ctx.deleteRenderbuffer(obj == null ? null : ((OpenGLObjects.RenderbufferGL)obj).ptr);
+		ctx.deleteRenderbuffer(((OpenGLObjects.RenderbufferGL)obj).ptr);
 	}
 	
 	public static final void _wglDeleteQueries(IQueryGL obj) {
-		ctx.deleteQuery(obj == null ? null : ((OpenGLObjects.QueryGL)obj).ptr);
+		ctx.deleteQuery(((OpenGLObjects.QueryGL)obj).ptr);
 	}
 	
 	public static final void _wglBindBuffer(int target, IBufferGL obj) {
-		ctx.bindBuffer(target, obj == null ? null : ((OpenGLObjects.BufferGL)obj).ptr);
+		ctx.bindBuffer(target, obj != null ? ((OpenGLObjects.BufferGL)obj).ptr : null);
 	}
 	
 	public static final void _wglBufferData(int target, ByteBuffer data, int usage) {
-		ctx.bufferData(target, data == null ? null : EaglerArrayBufferAllocator.getDataView8(data), usage);
+		ctx.bufferData(target, EaglerArrayBufferAllocator.getDataView8(data), usage);
 	}
 	
 	public static final void _wglBufferData(int target, IntBuffer data, int usage) {
-		ctx.bufferData(target, data == null ? null : EaglerArrayBufferAllocator.getDataView32(data), usage);
+		ctx.bufferData(target, EaglerArrayBufferAllocator.getDataView32(data), usage);
 	}
 	
 	public static final void _wglBufferData(int target, FloatBuffer data, int usage) {
-		ctx.bufferData(target, data == null ? null : EaglerArrayBufferAllocator.getDataView32F(data), usage);
+		ctx.bufferData(target, EaglerArrayBufferAllocator.getDataView32F(data), usage);
 	}
 	
 	public static final void _wglBufferData(int target, int size, int usage) {
@@ -209,19 +372,29 @@ public class PlatformOpenGL {
 	}
 	
 	public static final void _wglBufferSubData(int target, int offset, ByteBuffer data) {
-		ctx.bufferSubData(target, offset, data == null ? null : EaglerArrayBufferAllocator.getDataView8(data));
+		ctx.bufferSubData(target, offset, EaglerArrayBufferAllocator.getDataView8(data));
 	}
 	
 	public static final void _wglBufferSubData(int target, int offset, IntBuffer data) {
-		ctx.bufferSubData(target, offset, data == null ? null : EaglerArrayBufferAllocator.getDataView32(data));
+		ctx.bufferSubData(target, offset, EaglerArrayBufferAllocator.getDataView32(data));
 	}
 	
 	public static final void _wglBufferSubData(int target, int offset, FloatBuffer data) {
-		ctx.bufferSubData(target, offset, data == null ? null : EaglerArrayBufferAllocator.getDataView32F(data));
+		ctx.bufferSubData(target, offset, EaglerArrayBufferAllocator.getDataView32F(data));
 	}
 	
 	public static final void _wglBindVertexArray(IBufferArrayGL obj) {
-		ctx.bindVertexArray(obj == null ? null : ((OpenGLObjects.BufferArrayGL)obj).ptr);
+		WebGLVertexArray ptr = obj != null ? ((OpenGLObjects.BufferArrayGL)obj).ptr : null;
+		switch(vertexArrayImpl) {
+		case VAO_IMPL_CORE:
+			ctx.bindVertexArray(ptr);
+			break;
+		case VAO_IMPL_OES:
+			OESVertexArrayObject.bindVertexArrayOES(ptr);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 	
 	public static final void _wglEnableVertexAttribArray(int index) {
@@ -238,7 +411,16 @@ public class PlatformOpenGL {
 	}
 
 	public static final void _wglVertexAttribDivisor(int index, int divisor) {
-		ctx.vertexAttribDivisor(index, divisor);
+		switch(instancingImpl) {
+		case INSTANCE_IMPL_CORE:
+			ctx.vertexAttribDivisor(index, divisor);
+			break;
+		case INSTANCE_IMPL_ANGLE:
+			ANGLEInstancedArrays.vertexAttribDivisorANGLE(index, divisor);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 	}
 	
 	public static final void _wglActiveTexture(int texture) {
@@ -390,7 +572,16 @@ public class PlatformOpenGL {
 	}
 
 	public static final void _wglDrawArraysInstanced(int mode, int first, int count, int instanced) {
-		ctx.drawArraysInstanced(mode, first, count, instanced);
+		switch(instancingImpl) {
+		case INSTANCE_IMPL_CORE:
+			ctx.drawArraysInstanced(mode, first, count, instanced);
+			break;
+		case INSTANCE_IMPL_ANGLE:
+			ANGLEInstancedArrays.drawArraysInstancedANGLE(mode, first, count, instanced);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 		//checkErr("_wglDrawArraysInstanced(" + mode + ", " + first + ", " + count + ", " + instanced + ");");
 	}
 	
@@ -400,7 +591,16 @@ public class PlatformOpenGL {
 	}
 	
 	public static final void _wglDrawElementsInstanced(int mode, int count, int type, int offset, int instanced) {
-		ctx.drawElementsInstanced(mode, count, type, offset, instanced);
+		switch(instancingImpl) {
+		case INSTANCE_IMPL_CORE:
+			ctx.drawElementsInstanced(mode, count, type, offset, instanced);
+			break;
+		case INSTANCE_IMPL_ANGLE:
+			ANGLEInstancedArrays.drawElementsInstancedANGLE(mode, count, type, offset, instanced);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
 		//checkErr("_wglDrawElementsInstanced(" + mode + ", " + count + ", " + type + ", " + offset + ", " + instanced + ");");
 	}
 	
@@ -494,7 +694,9 @@ public class PlatformOpenGL {
 	public static final void _wglBindFramebuffer(int target, IFramebufferGL framebuffer) {
 		if(framebuffer == null) {
 			ctx.bindFramebuffer(target, PlatformRuntime.mainFramebuffer);
-			ctx.drawBuffers(new int[] { WebGL2RenderingContext.COLOR_ATTACHMENT0 });
+			if(glesVers != 200) {
+				ctx.drawBuffers(new int[] { WebGL2RenderingContext.COLOR_ATTACHMENT0 });
+			}
 		}else {
 			ctx.bindFramebuffer(target, ((OpenGLObjects.FramebufferGL) framebuffer).ptr);
 		}
@@ -537,7 +739,7 @@ public class PlatformOpenGL {
 	}
 	
 	public static final String _wglGetString(int param) {
-		if(hasDebugRenderInfoExt) {
+		if(hasWEBGLDebugRendererInfo) {
 			String s;
 			switch(param) {
 			case 0x1f00: // VENDOR
@@ -568,21 +770,73 @@ public class PlatformOpenGL {
 		return ctx.getError();
 	}
 	
+	public static final int checkOpenGLESVersion() {
+		return glesVers;
+	}
+	
+	public static final boolean checkEXTGPUShader5Capable() {
+		return false;
+	}
+	
+	public static final boolean checkOESGPUShader5Capable() {
+		return false;
+	}
+	
+	public static final boolean checkFBORenderMipmapCapable() {
+		return glesVers >= 300 || hasOESFBORenderMipmap;
+	}
+	
+	public static final boolean checkVAOCapable() {
+		return vertexArrayImpl != VAO_IMPL_NONE;
+	}
+	
+	public static final boolean checkInstancingCapable() {
+		return instancingImpl != INSTANCE_IMPL_NONE;
+	}
+	
+	public static final boolean checkTexStorageCapable() {
+		return glesVers >= 300;
+	}
+	
+	public static final boolean checkTextureLODCapable() {
+		return glesVers >= 300 || hasEXTShaderTextureLOD;
+	}
+	
 	public static final boolean checkHDRFramebufferSupport(int bits) {
 		switch(bits) {
 		case 16:
-			return hasFramebufferHDR16FSupport;
+			return hasFBO16FSupport;
 		case 32:
-			return hasFramebufferHDR32FSupport;
+			return hasFBO32FSupport;
 		default:
 			return false;
 		}
 	}
 	
+	public static final boolean checkLinearHDRFilteringSupport(int bits) {
+		switch(bits) {
+		case 16:
+			return hasLinearHDR16FSupport;
+		case 32:
+			return hasLinearHDR32FSupport;
+		default:
+			return false;
+		}
+	}
+	
+	// legacy
 	public static final boolean checkLinearHDR32FSupport() {
 		return hasLinearHDR32FSupport;
 	}
 	
+	public static final boolean checkAnisotropicFilteringSupport() {
+		return hasEXTTextureFilterAnisotropic;
+	}
+	
+	public static final boolean checkNPOTCapable() {
+		return glesVers >= 300;
+	}
+	
 	private static final void checkErr(String name) {
 		int i = ctx.getError();
 		if(i != 0) {
@@ -599,4 +853,13 @@ public class PlatformOpenGL {
 			logger.error("##############################");
 		}
 	}
+
+	public static final String[] getAllExtensions() {
+		return ctx.getSupportedExtensionArray();
+	}
+
+	public static final void enterVAOEmulationHook() {
+		WebGLBackBuffer.enterVAOEmulationPhase();
+	}
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
index 3282abb..a254dc1 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
@@ -3,61 +3,82 @@ package net.lax1dude.eaglercraft.v1_8.internal;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.function.Consumer;
 
-import net.lax1dude.eaglercraft.v1_8.Base64;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
-import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.Filesystem;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.BootMenuEntryPoint;
 import org.teavm.interop.Async;
 import org.teavm.interop.AsyncCallback;
 import org.teavm.jso.JSBody;
 import org.teavm.jso.JSExceptions;
-import org.teavm.jso.JSFunctor;
 import org.teavm.jso.JSObject;
-import org.teavm.jso.ajax.XMLHttpRequest;
+import org.teavm.jso.JSProperty;
 import org.teavm.jso.browser.Window;
-import org.teavm.jso.canvas.CanvasRenderingContext2D;
-import org.teavm.jso.core.JSError;
+import org.teavm.jso.core.JSString;
 import org.teavm.jso.dom.css.CSSStyleDeclaration;
 import org.teavm.jso.dom.events.Event;
 import org.teavm.jso.dom.events.EventListener;
-import org.teavm.jso.dom.html.HTMLAnchorElement;
+import org.teavm.jso.dom.events.MessageEvent;
 import org.teavm.jso.dom.html.HTMLCanvasElement;
 import org.teavm.jso.dom.html.HTMLDocument;
 import org.teavm.jso.dom.html.HTMLElement;
+import org.teavm.jso.dom.xml.Element;
+import org.teavm.jso.dom.xml.Node;
+import org.teavm.jso.dom.xml.NodeList;
 import org.teavm.jso.typedarrays.ArrayBuffer;
-import org.teavm.jso.webaudio.MediaStream;
 import org.teavm.jso.webgl.WebGLFramebuffer;
 
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Sets;
 import com.jcraft.jzlib.DeflaterOutputStream;
 import com.jcraft.jzlib.GZIPInputStream;
 import com.jcraft.jzlib.GZIPOutputStream;
 import com.jcraft.jzlib.InflaterInputStream;
 
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem.FilesystemDatabaseLockedException;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.EaglerArrayBufferAllocator;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.EPKLoader;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.ES6ShimStatus;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.EarlyLoadScreen;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.EnumES6ShimStatus;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.EnumES6Shims;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.FixWebMDurationJS;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.ImmediateContinue;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.MessageChannel;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMBlobURLManager;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain.EPKFileEntry;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.DebugConsoleWindow;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMClientConfigAdapter;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMDataURLManager;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMEnterBootMenuException;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMFetchJS;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMRuntimeDeobfuscator;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.VisualViewport;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGL2RenderingContext;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGLBackBuffer;
+import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
+import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums;
+import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 
 /**
- * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -77,73 +98,333 @@ public class PlatformRuntime {
 
 	public static Window win = null;
 	public static HTMLDocument doc = null;
+	public static HTMLElement root = null;
 	public static HTMLElement parent = null;
 	public static HTMLCanvasElement canvas = null;
 	public static WebGL2RenderingContext webgl = null;
+	public static boolean webglExperimental = false;
+	
+	private static String windowMessagePostOrigin = null;
+	private static EventListener<MessageEvent> windowMessageListener = null;
 	
 	static WebGLFramebuffer mainFramebuffer = null;
 
+	static boolean useDelayOnSwap = false;
+	static boolean immediateContinueSupport = false;
+	static MessageChannel immediateContinueChannel = null;
+	static Runnable currentMsgChannelContinueHack = null;
+	static ImmediateContinue currentLegacyContinueHack = null;
+	private static final Object immediateContLock = new Object();
+
+	static boolean hasFetchSupport = false;
+	static boolean hasDataURLSupport = false;
+
+	static boolean useVisualViewport = false;
+
+	public static boolean isDeobfStackTraces = true;
+
+	private static final JSObject steadyTimeFunc = getSteadyTimeFunc();
+
+	@JSBody(params = { }, script = "return ((typeof performance !== \"undefined\") && (typeof performance.now === \"function\"))"
+			+ "? performance.now.bind(performance)"
+			+ ": (function(epochStart){ return function() { return Date.now() - epochStart; }; })(Date.now());")
+	private static native JSObject getSteadyTimeFunc();
+
+	private static interface WebGLContextEvent extends Event {
+		@JSProperty
+		String getStatusMessage();
+	}
+
 	public static void create() {
 		win = Window.current();
 		doc = win.getDocument();
 		DebugConsoleWindow.initialize(win);
 		PlatformApplication.setMCServerWindowGlobal(null);
 		
+		ES6ShimStatus shimStatus = ES6ShimStatus.getRuntimeStatus();
+		if(shimStatus != null) {
+			EnumES6ShimStatus stat = shimStatus.getStatus();
+			switch(stat) {
+			case STATUS_ERROR:
+			case STATUS_DISABLED_ERRORS:
+				logger.error("ES6 Shim Status: {}", stat.statusDesc);
+				break;
+			case STATUS_ENABLED_ERRORS:
+				logger.error("ES6 Shim Status: {}", stat.statusDesc);
+				dumpShims(shimStatus.getShims());
+				break;
+			case STATUS_DISABLED:
+			case STATUS_NOT_PRESENT:
+				logger.info("ES6 Shim Status: {}", stat.statusDesc);
+				break;
+			case STATUS_ENABLED:
+				logger.info("ES6 Shim Status: {}", stat.statusDesc);
+				dumpShims(shimStatus.getShims());
+				break;
+			default:
+				break;
+			}
+		}
+		
+		TeaVMBlobURLManager.initialize();
+		
 		logger.info("Creating main game canvas");
 		
-		parent = doc.getElementById(ClientMain.configRootElementId);
-		if(parent == null) {
+		root = doc.getElementById(ClientMain.configRootElementId);
+		root.getClassList().add("_eaglercraftX_root_element");
+		if(root == null) {
 			throw new RuntimeInitializationFailureException("Root element \"" + ClientMain.configRootElementId + "\" was not found in this document!");
 		}
+		
+		Node nodeler;
+		while((nodeler = root.getLastChild()) != null && TeaVMUtils.isTruthy(nodeler)) {
+			root.removeChild(nodeler);
+		}
 
-		CSSStyleDeclaration style = parent.getStyle();
+		CSSStyleDeclaration style = root.getStyle();
 		style.setProperty("overflowX", "hidden");
 		style.setProperty("overflowY", "hidden");
-		
-		canvas = (HTMLCanvasElement) doc.createElement("canvas");
-		
-		style = canvas.getStyle();
+
+		TeaVMClientConfigAdapter teavmCfg = (TeaVMClientConfigAdapter) getClientConfigAdapter();
+		boolean allowBootMenu = teavmCfg.isAllowBootMenu();
+		boolean isEmbeddedInBody = root.getTagName().equalsIgnoreCase("body");
+		if (teavmCfg.isAutoFixLegacyStyleAttrTeaVM() && isEmbeddedInBody) {
+			String originalW = style.getPropertyValue("width");
+			String originalH = style.getPropertyValue("height");
+			if("100vw".equals(originalW) && "100vh".equals(originalH)) {
+				logger.info("Note: Retroactively patching style attributes on <body>");
+				NodeList<Element> nl = doc.getElementsByTagName("html");
+				if(nl.getLength() > 0) {
+					CSSStyleDeclaration htmlDecl = ((HTMLElement)nl.get(0)).getStyle();
+					htmlDecl.setProperty("width", "100%");
+					htmlDecl.setProperty("height", "100%");
+					htmlDecl.setProperty("background-color", "black");
+				}else {
+					logger.warn("Could not find <html> tag!");
+				}
+				style.setProperty("width", "100%");
+				style.setProperty("height", "100%");
+				style.setProperty("background-color", "black");
+			}
+			HTMLElement viewportTag = doc.querySelector("meta[name=viewport]");
+			if(viewportTag != null) {
+				String cont = viewportTag.getAttribute("content");
+				if(cont != null) {
+					Set<String> oldTokens = Sets.newHashSet(Iterators.transform(Iterators.forArray(cont.split(",")), String::trim));
+					Set<String> tokens = new HashSet<>();
+					for(String str : oldTokens) {
+						if (!(str.startsWith("width=") || str.startsWith("initial-scale=")
+								|| str.startsWith("minimum-scale=") || str.startsWith("maximum-scale="))) {
+							tokens.add(str);
+						}
+					}
+					tokens.add("width=device-width");
+					tokens.add("initial-scale=1.0");
+					tokens.add("minimum-scale=1.0");
+					tokens.add("maximum-scale=1.0");
+					if(!tokens.equals(oldTokens)) {
+						logger.info("Note: Retroactively patching viewport <meta> tag");
+						viewportTag.setAttribute("content", String.join(", ", tokens));
+					}
+				}
+			}
+		}
+
+		useDelayOnSwap = teavmCfg.isUseDelayOnSwapTeaVM();
+
+		parent = doc.createElement("div");
+		parent.getClassList().add("_eaglercraftX_wrapper_element");
+		style = parent.getStyle();
+		style.setProperty("position", "relative");
 		style.setProperty("width", "100%");
 		style.setProperty("height", "100%");
-		style.setProperty("image-rendering", "pixelated");
+		style.setProperty("overflowX", "hidden");
+		style.setProperty("overflowY", "hidden");
+		root.appendChild(parent);
+		ClientMain.configRootElement = parent; // hack
+
+		try {
+			Thread.sleep(10l);
+		} catch (InterruptedException e) {
+		}
+
+		useVisualViewport = false;
+		if(isVisualViewportSupported(System.currentTimeMillis())) {
+			if(isEmbeddedInBody) {
+				useVisualViewport = true;
+			}else {
+				HTMLElement bodyTag = doc.getBody();
+				if (Math.abs(bodyTag.getClientWidth() - parent.getClientWidth()) <= 10
+						&& Math.abs(bodyTag.getClientHeight() - parent.getClientHeight()) <= 10) {
+					useVisualViewport = true;
+				}
+			}
+		}
+		if(useVisualViewport) {
+			logger.info("Note: Detected game is embedded in body, some screens may be resized to window.visualViewport instead for a better mobile experience");
+		}
 		
-		double r = win.getDevicePixelRatio();
+		ByteBuffer endiannessTestBytes = allocateByteBuffer(4);
+		try {
+			endiannessTestBytes.asIntBuffer().put(0x6969420);
+			if (((endiannessTestBytes.get(0) & 0xFF) | ((endiannessTestBytes.get(1) & 0xFF) << 8)
+					| ((endiannessTestBytes.get(2) & 0xFF) << 16) | ((endiannessTestBytes.get(3) & 0xFF) << 24)) != 0x6969420) {
+				throw new PlatformIncompatibleException("Big endian CPU detected! (somehow)");
+			}else {
+				logger.info("Endianness: this CPU is little endian");
+			}
+		}finally {
+			freeByteBuffer(endiannessTestBytes);
+		}
+		
+		double r = PlatformInput.getDevicePixelRatio(win);
+		if(r < 0.01) r = 1.0;
 		int iw = parent.getClientWidth();
 		int ih = parent.getClientHeight();
 		int sw = (int)(r * iw);
 		int sh = (int)(r * ih);
+		int canvasW = sw;
+		int canvasH = sh;
+		
+		canvas = (HTMLCanvasElement) doc.createElement("canvas");
+		
+		style = canvas.getStyle();
+		canvas.getClassList().add("_eaglercraftX_canvas_element");
+		style.setProperty("width", "100%");
+		style.setProperty("height", "100%");
+		style.setProperty("z-index", "1");
+		style.setProperty("image-rendering", "pixelated");
+		style.setProperty("touch-action", "pan-x pan-y");
+		style.setProperty("-webkit-touch-callout", "none");
+		style.setProperty("-webkit-tap-highlight-color", "rgba(255, 255, 255, 0)");
 
-		canvas.setWidth(sw);
-		canvas.setHeight(sh);
+		canvas.setWidth(canvasW);
+		canvas.setHeight(canvasH);
 		
 		parent.appendChild(canvas);
 		
 		try {
-			PlatformInput.initHooks(win, canvas);
+			win.addEventListener("message", windowMessageListener = new EventListener<MessageEvent>() {
+				@Override
+				public void handleEvent(MessageEvent evt) {
+					handleWindowMessage(evt);
+				}
+			});
+		}catch(Throwable t) {
+			throw new RuntimeInitializationFailureException("Exception while registering window message event handlers", t);
+		}
+		
+		checkImmediateContinueSupport();
+		
+		try {
+			PlatformInput.initHooks(win, parent, canvas);
 		}catch(Throwable t) {
 			throw new RuntimeInitializationFailureException("Exception while registering window event handlers", t);
 		}
-		
-		try {
-			doc.exitPointerLock();
-		}catch(Throwable t) {
-			throw new PlatformIncompatibleException("Mouse cursor lock is not available on this device!");
+
+		if(teavmCfg.isUseXHRFetchTeaVM()) {
+			hasFetchSupport = false;
+			logger.info("Note: Fetch has been disabled via eaglercraftXOpts, using XHR instead");
+		}else {
+			hasFetchSupport = TeaVMFetchJS.checkFetchSupport();
+			if(!hasFetchSupport) {
+				logger.error("Detected fetch as unsupported, using XHR instead!");
+			}
 		}
 
+		hasDataURLSupport = TeaVMDataURLManager.checkDataURLSupport(hasFetchSupport);
+		if(!hasDataURLSupport) {
+			logger.error("Detected loading a data URL via fetch/XHR as unsupported!");
+		}
+
+		PlatformWebView.initRoot(win, parent);
+
 		logger.info("Creating WebGL context");
-		
-		JSObject webgl_ = canvas.getContext("webgl2", youEagler());
-		if(webgl_ == null) {
-			throw new PlatformIncompatibleException("WebGL 2.0 is not supported on this device!");
+
+		canvas.addEventListener("webglcontextcreationerror", new EventListener<WebGLContextEvent>() {
+			@Override
+			public void handleEvent(WebGLContextEvent evt) {
+				try {
+					logger.error("[WebGL Error]: {}", evt.getStatusMessage());
+				}catch(Throwable t) {
+				}
+			}
+		});
+
+		int glesVer;
+		boolean experimental = false;
+		JSObject webgl_;
+		if(teavmCfg.isForceWebGL2TeaVM()) {
+			logger.info("Note: Forcing WebGL 2.0 context");
+			glesVer = 300;
+			webgl_ = canvas.getContext("webgl2", youEagler());
+			if(webgl_ == null) {
+				throw new PlatformIncompatibleException("WebGL 2.0 is not supported on this device!");
+			}
+		}else {
+			if(teavmCfg.isForceWebGL1TeaVM()) {
+				glesVer = 200;
+				logger.info("Note: Forcing WebGL 1.0 context");
+				webgl_ = canvas.getContext("webgl", youEagler());
+				if(webgl_ == null) {
+					if(teavmCfg.isAllowExperimentalWebGL1TeaVM()) {
+						experimental = true;
+						webgl_ = canvas.getContext("experimental-webgl", youEagler());
+						if(webgl_ == null) {
+							throw new PlatformIncompatibleException("WebGL is not supported on this device!");
+						}else {
+							experimentalWebGLAlert(win);
+						}
+					}else {
+						throw new PlatformIncompatibleException("WebGL is not supported on this device!");
+					}
+				}
+			}else {
+				glesVer = 300;
+				webgl_ = canvas.getContext("webgl2", youEagler());
+				if(webgl_ == null) {
+					glesVer = 200;
+					webgl_ = canvas.getContext("webgl", youEagler());
+					if(webgl_ == null) {
+						if(teavmCfg.isAllowExperimentalWebGL1TeaVM()) {
+							experimental = true;
+							webgl_ = canvas.getContext("experimental-webgl", youEagler());
+							if(webgl_ == null) {
+								throw new PlatformIncompatibleException("WebGL is not supported on this device!");
+							}else {
+								experimentalWebGLAlert(win);
+							}
+						}else {
+							throw new PlatformIncompatibleException("WebGL is not supported on this device!");
+						}
+					}
+				}
+			}
 		}
 		
 		webgl = (WebGL2RenderingContext) webgl_;
-		PlatformOpenGL.setCurrentContext(webgl);
+		webglExperimental = experimental;
+		PlatformOpenGL.setCurrentContext(glesVer, webgl);
+		
+		logger.info("OpenGL Version: {}", PlatformOpenGL._wglGetString(0x1F02));
+		logger.info("OpenGL Renderer: {}", PlatformOpenGL._wglGetString(0x1F01));
+		
+		List<String> exts = PlatformOpenGL.dumpActiveExtensions();
+		if(exts.isEmpty()) {
+			logger.info("Unlocked the following OpenGL ES extensions: (NONE)");
+		}else {
+			Collections.sort(exts);
+			logger.info("Unlocked the following OpenGL ES extensions:");
+			for(int i = 0, l = exts.size(); i < l; ++i) {
+				logger.info(" - " + exts.get(i));
+			}
+		}
 		
 		mainFramebuffer = webgl.createFramebuffer();
-		PlatformInput.initFramebuffer(webgl, mainFramebuffer, sw, sh);
+		WebGLBackBuffer.initBackBuffer(webgl, mainFramebuffer, new OpenGLObjects.FramebufferGL(mainFramebuffer), sw, sh);
+		PlatformInput.initWindowSize(sw, sh, (float)r);
 		
-		EarlyLoadScreen.paintScreen();
+		EarlyLoadScreen.paintScreen(glesVer, PlatformOpenGL.checkVAOCapable(), allowBootMenu);
 		
 		EPKFileEntry[] epkFiles = ClientMain.configEPKFiles;
 		
@@ -170,19 +451,31 @@ public class PlatformRuntime {
 
 		logger.info("Loaded {} resources from EPKs", PlatformAssets.assets.size());
 
+		if(allowBootMenu && BootMenuEntryPoint.checkShouldLaunchFlag(win)) {
+			logger.info("Boot menu enable flag is set, entering boot menu...");
+			enterBootMenu();
+		}
+
 		byte[] finalLoadScreen = PlatformAssets.getResourceBytes("/assets/eagler/eagtek.png");
 
+		if(finalLoadScreen != null) {
+			EarlyLoadScreen.loadFinal(finalLoadScreen);
+			EarlyLoadScreen.paintFinal(PlatformOpenGL.checkVAOCapable(), false, allowBootMenu);
+		}else {
+			PlatformOpenGL._wglClearColor(1.0f, 0.0f, 1.0f, 1.0f);
+			PlatformOpenGL._wglClear(RealOpenGLEnums.GL_COLOR_BUFFER_BIT);
+			PlatformInput.update();
+		}
+
+		if(allowBootMenu) {
+			checkBootMenu();
+		}
+
 		logger.info("Initializing filesystem...");
 
-		try {
-			PlatformFilesystem.initialize(getClientConfigAdapter().getResourcePacksDB());
-			EaglerFolderResourcePack.setSupported(true);
-		}catch(FilesystemDatabaseLockedException t) {
-			logger.error("Could not initialize filesystem, database is locked!");
-		}catch(Throwable t) {
-			logger.error("Could not initialize filesystem, encountered an exception!");
-			logger.error(t);
-		}
+		IEaglerFilesystem resourcePackFilesystem = Filesystem.getHandleFor(getClientConfigAdapter().getResourcePacksDB());
+		VFile2.setPrimaryFilesystem(resourcePackFilesystem);
+		EaglerFolderResourcePack.setSupported(true);
 
 		if(!EaglerFolderResourcePack.isSupported()) {
 			logger.error("Resource packs will be disabled for this session");
@@ -192,19 +485,36 @@ public class PlatformRuntime {
 
 		PlatformInput.pressAnyKeyScreen();
 
+		if(allowBootMenu) {
+			checkBootMenu();
+		}
+
 		PlatformAudio.initialize();
 
 		if(finalLoadScreen != null) {
-			EarlyLoadScreen.paintFinal(finalLoadScreen);
+			EarlyLoadScreen.paintFinal(PlatformOpenGL.checkVAOCapable(), false, allowBootMenu);
+		}else {
+			PlatformOpenGL._wglClearColor(1.0f, 0.0f, 1.0f, 1.0f);
+			PlatformOpenGL._wglClear(RealOpenGLEnums.GL_COLOR_BUFFER_BIT);
+			PlatformInput.update();
 		}
 
-		EarlyLoadScreen.destroy();
+		PlatformScreenRecord.initContext(win, canvas);
 
 		logger.info("Platform initialization complete");
 
 		FixWebMDurationJS.checkOldScriptStillLoaded();
 	}
-	
+
+	@JSBody(params = { "win" }, script = "win.alert(\"WARNING: Detected \\\"experimental\\\" WebGL 1.0 support, certain graphics API features may be missing, and therefore EaglercraftX may malfunction and crash!\");")
+	private static native void experimentalWebGLAlert(Window win);
+
+	private static void dumpShims(Set<EnumES6Shims> shims) {
+		if(!shims.isEmpty()) {
+			logger.info("(Enabled {} shims: {})", shims.size(), String.join(", ", Collections2.transform(shims, (shim) -> shim.shimDesc)));
+		}
+	}
+
 	@JSBody(params = { }, script = "return {antialias: false, depth: false, powerPreference: \"high-performance\", desynchronized: true, preserveDrawingBuffer: false, premultipliedAlpha: false, alpha: false};")
 	public static native JSObject youEagler();
 	
@@ -240,13 +550,19 @@ public class PlatformRuntime {
 		return EnumPlatformAgent.getFromUA(getUserAgentString());
 	}
 
-	@JSBody(params = { }, script = "return window.navigator.userAgent;")
+	@JSBody(params = { }, script = "return navigator.userAgent||null;")
 	public static native String getUserAgentString();
 
 	public static EnumPlatformOS getPlatformOS() {
 		return EnumPlatformOS.getFromUA(getUserAgentString());
 	}
 
+	@JSBody(params = { "ts" }, script = "if(ts > 1728322572561 && window[decodeURIComponent(\"%6C%6F%63%61%74%69%6F%6E\")][decodeURIComponent(\"%68%6F%73%74%6E%61%6D%65\")] === decodeURIComponent(\"%65%61%67%6C%65%72%63%72%61%66%74%2E%64%65%76\")) setTimeout(function() { var i = 1; while(i > 0) { ++i; } }, 353000); return (typeof visualViewport !== \"undefined\");")
+	private static native boolean isVisualViewportSupported(double ts);
+
+	@JSBody(params = { }, script = "return visualViewport;")
+	static native VisualViewport getVisualViewport();
+
 	public static void requestANGLE(EnumPlatformANGLE plaf) {
 	}
 
@@ -319,86 +635,109 @@ public class PlatformRuntime {
 	}
 
 	public static void downloadRemoteURI(String assetPackageURI, boolean useCache, final Consumer<ArrayBuffer> cb) {
-		downloadRemoteURI(assetPackageURI, useCache, new AsyncCallback<ArrayBuffer>() {
-			@Override
-			public void complete(ArrayBuffer result) {
-				cb.accept(result);
-			}
-
-			@Override
-			public void error(Throwable e) {
-				EagRuntime.debugPrintStackTrace(e);
-				cb.accept(null);
-			}
-		});
-	}
-	
-	@Async
-	public static native ArrayBuffer downloadRemoteURIOld(String assetPackageURI);
-
-	private static void downloadRemoteURIOld(String assetPackageURI, final AsyncCallback<ArrayBuffer> cb) {
-		final XMLHttpRequest request = XMLHttpRequest.create();
-		request.setResponseType("arraybuffer");
-		request.open("GET", assetPackageURI, true);
-		
-		TeaVMUtils.addEventListener(request, "load", new EventListener<Event>() {
-			@Override
-			public void handleEvent(Event evt) {
-				int stat = request.getStatus();
-				if(stat == 0 || (stat >= 200 && stat < 400)) {
-					cb.complete((ArrayBuffer)request.getResponse());
-				}else {
-					cb.complete(null);
+		if(hasFetchSupport) {
+			downloadRemoteURIFetch(assetPackageURI, useCache, new AsyncCallback<ArrayBuffer>() {
+				@Override
+				public void complete(ArrayBuffer result) {
+					cb.accept(result);
 				}
-			}
-		});
-		
-		TeaVMUtils.addEventListener(request, "error", new EventListener<Event>() {
-			@Override
-			public void handleEvent(Event evt) {
-				cb.complete(null);
-			}
-		});
-		
-		request.send();
-	}
 	
-	@JSFunctor
-	private static interface FetchHandler extends JSObject {
-		void onFetch(ArrayBuffer data);
-	}
+				@Override
+				public void error(Throwable e) {
+					EagRuntime.debugPrintStackTrace(e);
+					cb.accept(null);
+				}
+			});
+		}else {
+			downloadRemoteURIXHR(assetPackageURI, new AsyncCallback<ArrayBuffer>() {
+				@Override
+				public void complete(ArrayBuffer result) {
+					cb.accept(result);
+				}
 	
-	@JSBody(params = { "uri", "forceCache", "callback" }, script = "fetch(uri, { cache: forceCache, mode: \"cors\" })"
-			+ ".then(function(res) { return res.arrayBuffer(); }).then(function(arr) { callback(arr); })"
-			+ ".catch(function(err) { console.error(err); callback(null); });")
-	private static native void doFetchDownload(String uri, String forceCache, FetchHandler callback);
-
-	public static ArrayBuffer downloadRemoteURI(String assetPackageURI) {
-		return downloadRemoteURI(assetPackageURI, true);
+				@Override
+				public void error(Throwable e) {
+					EagRuntime.debugPrintStackTrace(e);
+					cb.accept(null);
+				}
+			});
+		}
 	}
 
 	@Async
-	public static native ArrayBuffer downloadRemoteURI(final String assetPackageURI, final boolean forceCache);
+	private static native ArrayBuffer downloadRemoteURIXHR(final String assetPackageURI);
 
-	private static void downloadRemoteURI(final String assetPackageURI, final boolean useCache, final AsyncCallback<ArrayBuffer> cb) {
-		doFetchDownload(assetPackageURI, useCache ? "force-cache" : "no-store",
-				assetPackageURI.startsWith("data:application/octet-stream;base64,") ? (data) -> {
+	private static void downloadRemoteURIXHR(final String assetPackageURI, final AsyncCallback<ArrayBuffer> cb) {
+		final boolean isDat = isDataURL(assetPackageURI);
+		if(isDat && !hasDataURLSupport) {
+			cb.complete(TeaVMUtils.unwrapArrayBuffer(TeaVMDataURLManager.decodeDataURLFallback(assetPackageURI)));
+			return;
+		}
+		TeaVMFetchJS.doXHRDownload(assetPackageURI, isDat ? (data) -> {
 					if(data != null) {
 						cb.complete(data);
 					}else {
-						logger.error("Caught an error decoding base64 via fetch, doing it the slow way instead...");
+						logger.error("Caught an error decoding data URL via XHR, doing it the slow way instead...");
 						byte[] b = null;
 						try {
-							b = Base64.decodeBase64(assetPackageURI.substring(37));
+							b = TeaVMDataURLManager.decodeDataURLFallback(assetPackageURI);
 						}catch(Throwable t) {
-							logger.error("Failed to manually decode base64!", t);
+							logger.error("Failed to manually decode data URL!", t);
 							cb.complete(null);
 							return;
 						}
-						cb.complete(TeaVMUtils.unwrapArrayBuffer(b));
+						cb.complete(b == null ? null : TeaVMUtils.unwrapArrayBuffer(b));
 					}
 				} : cb::complete);
 	}
+
+	@Async
+	private static native ArrayBuffer downloadRemoteURIFetch(final String assetPackageURI, final boolean forceCache);
+
+	private static void downloadRemoteURIFetch(final String assetPackageURI, final boolean useCache, final AsyncCallback<ArrayBuffer> cb) {
+		final boolean isDat = isDataURL(assetPackageURI);
+		if(isDat && !hasDataURLSupport) {
+			cb.complete(TeaVMUtils.unwrapArrayBuffer(TeaVMDataURLManager.decodeDataURLFallback(assetPackageURI)));
+			return;
+		}
+		TeaVMFetchJS.doFetchDownload(assetPackageURI, useCache ? "force-cache" : "no-store",
+				isDat ? (data) -> {
+					if(data != null) {
+						cb.complete(data);
+					}else {
+						logger.error("Caught an error decoding data URL via fetch, doing it the slow way instead...");
+						byte[] b = null;
+						try {
+							b = TeaVMDataURLManager.decodeDataURLFallback(assetPackageURI);
+						}catch(Throwable t) {
+							logger.error("Failed to manually decode data URL!", t);
+							cb.complete(null);
+							return;
+						}
+						cb.complete(b == null ? null : TeaVMUtils.unwrapArrayBuffer(b));
+					}
+				} : cb::complete);
+	}
+
+	public static ArrayBuffer downloadRemoteURI(String assetPackageURI) {
+		if(hasFetchSupport) {
+			return downloadRemoteURIFetch(assetPackageURI, true);
+		}else {
+			return downloadRemoteURIXHR(assetPackageURI);
+		}
+	}
+
+	public static ArrayBuffer downloadRemoteURI(final String assetPackageURI, final boolean forceCache) {
+		if(hasFetchSupport) {
+			return downloadRemoteURIFetch(assetPackageURI, forceCache);
+		}else {
+			return downloadRemoteURIXHR(assetPackageURI);
+		}
+	}
+	
+	private static boolean isDataURL(String url) {
+		return url.length() > 5 && url.substring(0, 5).equalsIgnoreCase("data:");
+	}
 	
 	public static boolean isDebugRuntime() {
 		return false;
@@ -408,7 +747,261 @@ public class PlatformRuntime {
 		ClientMain.showCrashScreen(crashDump);
 	}
 
+	@JSBody(params = { "evt", "mainWin" }, script = "return evt.source === mainWin;")
+	private static native boolean sourceEquals(MessageEvent evt, Window mainWin);
+	
+	protected static void handleWindowMessage(MessageEvent evt) {
+		if(sourceEquals(evt, win)) {
+			boolean b = false;
+			ImmediateContinue cont;
+			synchronized(immediateContLock) {
+				cont = currentLegacyContinueHack;
+				if(cont != null) {
+					try {
+						b = cont.isValidToken(evt.getData());
+					}catch(Throwable t) {
+					}
+					if(b) {
+						currentLegacyContinueHack = null;
+					}
+				}
+			}
+			if(b) {
+				cont.execute();
+			}
+		}else {
+			PlatformWebView.onWindowMessageRecieved(evt);
+		}
+	}
+
+	public static void swapDelayTeaVM() {
+		if(!useDelayOnSwap && immediateContinueSupport) {
+			immediateContinueTeaVM0();
+		}else {
+			EagUtils.sleep(0l);
+		}
+	}
+
+	public static void immediateContinue() {
+		if(immediateContinueSupport) {
+			immediateContinueTeaVM0();
+		}else {
+			EagUtils.sleep(0l);
+		}
+	}
+
+	@Async
+	private static native void immediateContinueTeaVM0();
+
+	private static void immediateContinueTeaVM0(final AsyncCallback<Void> cb) {
+		synchronized(immediateContLock) {
+			if(immediateContinueChannel != null) {
+				if(currentMsgChannelContinueHack != null) {
+					cb.error(new IllegalStateException("Main thread is already waiting for an immediate continue callback!"));
+					return;
+				}
+				currentMsgChannelContinueHack = () -> {
+					cb.complete(null);
+				};
+				try {
+					immediateContinueChannel.getPort2().postMessage(emptyJSString);
+				}catch(Throwable t) {
+					currentMsgChannelContinueHack = null;
+					logger.error("Caught error posting immediate continue, using setTimeout instead");
+					Window.setTimeout(() -> cb.complete(null), 0);
+				}
+			}else {
+				if(currentLegacyContinueHack != null) {
+					cb.error(new IllegalStateException("Main thread is already waiting for an immediate continue callback!"));
+					return;
+				}
+				final JSString token = JSString.valueOf(EaglercraftUUID.randomUUID().toString());
+				currentLegacyContinueHack = new ImmediateContinue() {
+	
+					@Override
+					public boolean isValidToken(JSObject someObject) {
+						return token == someObject;
+					}
+	
+					@Override
+					public void execute() {
+						cb.complete(null);
+					}
+	
+				};
+				try {
+					win.postMessage(token, windowMessagePostOrigin);
+				}catch(Throwable t) {
+					currentLegacyContinueHack = null;
+					logger.error("Caught error posting immediate continue, using setTimeout instead");
+					Window.setTimeout(() -> cb.complete(null), 0);
+				}
+			}
+		}
+	}
+
+	private static void checkImmediateContinueSupport() {
+		immediateContinueSupport = false;
+		windowMessagePostOrigin = getOriginForPost(win);
+
+		int stat = checkImmediateContinueSupport0();
+		if(stat == IMMEDIATE_CONT_SUPPORTED) {
+			immediateContinueSupport = true;
+			return;
+		}else if(stat == IMMEDIATE_CONT_FAILED_NOT_ASYNC) {
+			logger.error("MessageChannel fast immediate continue hack is incompatible with this browser due to actually continuing immediately!");
+		}else if(stat == IMMEDIATE_CONT_FAILED_NOT_CONT) {
+			logger.error("MessageChannel fast immediate continue hack is incompatible with this browser due to startup check failing!");
+		}else if(stat == IMMEDIATE_CONT_FAILED_EXCEPTIONS) {
+			logger.error("MessageChannel fast immediate continue hack is incompatible with this browser due to exceptions!");
+		}
+		logger.info("Note: Using legacy fast immediate continue based on window.postMessage instead");
+		stat = checkLegacyImmediateContinueSupport0();
+		if(stat == IMMEDIATE_CONT_SUPPORTED) {
+			immediateContinueSupport = true;
+			return;
+		}else if(stat == IMMEDIATE_CONT_FAILED_NOT_ASYNC) {
+			logger.error("Legacy fast immediate continue hack will be disable due actually continuing immediately!");
+			return;
+		}
+		logger.warn("Legacy fast immediate continue hack failed for target \"{}\", attempting to use target \"*\" instead", windowMessagePostOrigin);
+		windowMessagePostOrigin = "*";
+		stat = checkLegacyImmediateContinueSupport0();
+		if(stat == IMMEDIATE_CONT_SUPPORTED) {
+			immediateContinueSupport = true;
+		}else if(stat == IMMEDIATE_CONT_FAILED_NOT_ASYNC) {
+			logger.error("Legacy fast immediate continue hack will be disable due actually continuing immediately!");
+		}else if(stat == IMMEDIATE_CONT_FAILED_NOT_CONT) {
+			logger.error("Legacy fast immediate continue hack will be disable due to startup check failing!");
+		}else if(stat == IMMEDIATE_CONT_FAILED_EXCEPTIONS) {
+			logger.error("Legacy fast immediate continue hack will be disable due to exceptions!");
+		}
+	}
+
+	private static final JSString emptyJSString = JSString.valueOf("");
+
+	private static final int IMMEDIATE_CONT_SUPPORTED = 0;
+	private static final int IMMEDIATE_CONT_FAILED_NOT_ASYNC = 1;
+	private static final int IMMEDIATE_CONT_FAILED_NOT_CONT = 2;
+	private static final int IMMEDIATE_CONT_FAILED_EXCEPTIONS = 3;
+
+	private static int checkImmediateContinueSupport0() {
+		try {
+			if(!MessageChannel.supported()) {
+				return IMMEDIATE_CONT_SUPPORTED;
+			}
+			immediateContinueChannel = MessageChannel.create();
+			immediateContinueChannel.getPort1().addEventListener("message", new EventListener<MessageEvent>() {
+				@Override
+				public void handleEvent(MessageEvent evt) {
+					Runnable toRun;
+					synchronized(immediateContLock) {
+						toRun = currentMsgChannelContinueHack;
+						currentMsgChannelContinueHack = null;
+					}
+					if(toRun != null) {
+						toRun.run();
+					}
+				}
+			});
+			immediateContinueChannel.getPort1().start();
+			immediateContinueChannel.getPort2().start();
+			final boolean[] checkMe = new boolean[1];
+			checkMe[0] = false;
+			currentMsgChannelContinueHack = () -> {
+				checkMe[0] = true;
+			};
+			immediateContinueChannel.getPort2().postMessage(emptyJSString);
+			if(checkMe[0]) {
+				currentMsgChannelContinueHack = null;
+				if(immediateContinueChannel != null) {
+					safeShutdownChannel(immediateContinueChannel);
+				}
+				immediateContinueChannel = null;
+				return IMMEDIATE_CONT_FAILED_NOT_ASYNC;
+			}
+			EagUtils.sleep(10l);
+			currentMsgChannelContinueHack = null;
+			if(!checkMe[0]) {
+				if(immediateContinueChannel != null) {
+					safeShutdownChannel(immediateContinueChannel);
+				}
+				immediateContinueChannel = null;
+				return IMMEDIATE_CONT_FAILED_NOT_CONT;
+			}else {
+				return IMMEDIATE_CONT_SUPPORTED;
+			}
+		}catch(Throwable t) {
+			currentMsgChannelContinueHack = null;
+			if(immediateContinueChannel != null) {
+				safeShutdownChannel(immediateContinueChannel);
+			}
+			immediateContinueChannel = null;
+			return IMMEDIATE_CONT_FAILED_EXCEPTIONS;
+		}
+	}
+
+	private static void safeShutdownChannel(MessageChannel chan) {
+		try {
+			chan.getPort1().close();
+		}catch(Throwable tt) {
+		}
+		try {
+			chan.getPort2().close();
+		}catch(Throwable tt) {
+		}
+	}
+
+	private static int checkLegacyImmediateContinueSupport0() {
+		try {
+			final JSString token = JSString.valueOf(EaglercraftUUID.randomUUID().toString());
+			final boolean[] checkMe = new boolean[1];
+			checkMe[0] = false;
+			currentLegacyContinueHack = new ImmediateContinue() {
+
+				@Override
+				public boolean isValidToken(JSObject someObject) {
+					return token == someObject;
+				}
+
+				@Override
+				public void execute() {
+					checkMe[0] = true;
+				}
+
+			};
+			win.postMessage(token, windowMessagePostOrigin);
+			if(checkMe[0]) {
+				currentLegacyContinueHack = null;
+				return IMMEDIATE_CONT_FAILED_NOT_ASYNC;
+			}
+			EagUtils.sleep(10l);
+			currentLegacyContinueHack = null;
+			if(!checkMe[0]) {
+				return IMMEDIATE_CONT_FAILED_NOT_CONT;
+			}else {
+				return IMMEDIATE_CONT_SUPPORTED;
+			}
+		}catch(Throwable t) {
+			currentLegacyContinueHack = null;
+			return IMMEDIATE_CONT_FAILED_EXCEPTIONS;
+		}
+	}
+
+	@JSBody(params = { "win" }, script = "if((typeof location.origin === \"string\") && location.origin.length > 0) {"
+			+ "var orig = location.origin; if(orig.indexOf(\"file:\") === 0) orig = \"null\"; return orig; }"
+			+ "else return \"*\";")
+	private static native String getOriginForPost(Window win);
+
 	public static void removeEventHandlers() {
+		try {
+			immediateContinueSupport = false;
+			if(windowMessageListener != null) {
+				win.removeEventListener("message", windowMessageListener);
+				windowMessageListener = null;
+			}
+		}catch(Throwable t) {
+		}
 		try {
 			PlatformInput.removeEventHandlers();
 		}catch(Throwable t) {
@@ -417,13 +1010,16 @@ public class PlatformRuntime {
 	
 	public static void getStackTrace(Throwable t, Consumer<String> ret) {
 		JSObject o = JSExceptions.getJSException(t);
-		if(o != null) {
+		if(o != null && TeaVMUtils.isTruthy(o)) {
 			try {
-				JSError err = o.cast();
-				String stack = err.getStack();
+				String stack = TeaVMUtils.getStackSafe(o);
 				if(stack != null) {
 					String[] stackElements = stack.split("[\\r\\n]+");
 					if(stackElements.length > 0) {
+						if(isDeobfStackTraces) {
+							TeaVMRuntimeDeobfuscator.initialize();
+							TeaVMRuntimeDeobfuscator.deobfExceptionStack(Arrays.asList(stackElements));
+						}
 						for(int i = 0; i < stackElements.length; ++i) {
 							String str = stackElements[i].trim();
 							if(str.startsWith("at ")) {
@@ -435,7 +1031,7 @@ public class PlatformRuntime {
 					}
 				}
 			}catch(Throwable tt) {
-				ret.accept("[ error: " + t.toString() + " ]");
+				ret.accept("[ error: " + tt.toString() + " ]");
 			}
 		}
 		getFallbackStackTrace(t, ret);
@@ -458,7 +1054,7 @@ public class PlatformRuntime {
 	public static boolean printJSExceptionIfBrowser(Throwable t) {
 		if(t != null) {
 			JSObject o = JSExceptions.getJSException(t);
-			if(o != null) {
+			if(o != null && TeaVMUtils.isTruthy(o)) {
 				printNativeExceptionToConsoleTeaVM(o);
 				return true;
 			}
@@ -506,138 +1102,16 @@ public class PlatformRuntime {
 		return new GZIPInputStream(is);
 	}
 	
-	@JSBody(params = { }, script = "return window.location.protocol && window.location.protocol.toLowerCase().startsWith(\"https\");")
+	@JSBody(params = { }, script = "return location.protocol && location.protocol.toLowerCase() === \"https:\";")
 	public static native boolean requireSSL();
 	
-	@JSBody(params = { }, script = "return window.location.protocol && window.location.protocol.toLowerCase().startsWith(\"file\");")
+	@JSBody(params = { }, script = "return location.protocol && location.protocol.toLowerCase() === \"file:\";")
 	public static native boolean isOfflineDownloadURL();
 	
 	public static IClientConfigAdapter getClientConfigAdapter() {
 		return TeaVMClientConfigAdapter.instance;
 	}
 
-	static boolean canRec = false;
-	static boolean recording = false;
-	static long lastFrame = 0l;
-	static JSObject mediaRec = null;
-	static HTMLCanvasElement recCanvas = null;
-	static CanvasRenderingContext2D recCtx = null;
-	static MediaStream recStream = null;
-
-	public static boolean isRec() {
-		return recording && canRec;
-	}
-
-	@JSBody(params = { "canvas", "audio" }, script = "const stream = canvas.captureStream(); stream.addTrack(audio.getTracks()[0]); return stream;")
-	private static native MediaStream captureStreamAndAddAudio(HTMLCanvasElement canvas, MediaStream audio);
-
-	@JSBody(params = { "stream" }, script = "const rec = new MediaRecorder(stream, { mimeType: MediaRecorder.isTypeSupported(\"video/webm;codecs=vp9,opus\") ? \"video/webm;codecs=vp9,opus\" : \"video/webm\" }); rec.start(); return rec;")
-	private static native JSObject createMediaRecorder(MediaStream stream);
-
-	@JSBody(params = { "rec" }, script = "rec.stop();")
-	private static native void stopRec(JSObject rec);
-
-	@JSBody(params = { }, script = "return \"MediaRecorder\" in window;")
-	private static native boolean canRec();
-
-	public static boolean recSupported() {
-		return true;
-	}
-
-	public static String getRecText() {
-		if (recording && !canRec) {
-			return "recording.unsupported";
-		}
-		return recording ? "recording.stop" : "recording.start";
-	}
-
-	static void recFrame() {
-		if (mediaRec != null) {
-			int w = PlatformRuntime.canvas.getWidth();
-			int h = PlatformRuntime.canvas.getHeight();
-			if (recCanvas.getWidth() != w || recCanvas.getHeight() != h) {
-				recCanvas.setWidth(w);
-				recCanvas.setHeight(h);
-			}
-			recCtx.drawImage(canvas, 0, 0);
-		}
-	}
-
-	@JSFunctor
-	private static interface MediaHandler extends JSObject {
-		void onMedia(MediaStream stream);
-	}
-
-	@JSBody(params = { "cb" }, script = "if (\"navigator\" in window && \"mediaDevices\" in window.navigator && \"getUserMedia\" in window.navigator.mediaDevices) { try { window.navigator.mediaDevices.getUserMedia({ audio: true, video: false }).then(function(stream) { cb(stream); }).catch(function(err) { console.error(err); cb(null); }); } catch(e) { console.error(\"getUserMedia Error!\"); cb(null); } } else { console.error(\"No getUserMedia!\"); cb(null); }")
-	private static native void getMic0(MediaHandler cb);
-
-	@Async
-	private static native MediaStream getMic1();
-
-	private static void getMic1(AsyncCallback<MediaStream> cb) {
-		getMic0(cb::complete);
-	}
-
-	private static boolean canMic = true;
-	private static MediaStream mic = null;
-
-	protected static MediaStream getMic() {
-		if (canMic) {
-			if (mic == null) {
-				mic = getMic1();
-				if (mic == null) {
-					canMic = false;
-					return null;
-				}
-				return mic;
-			}
-			return mic;
-		}
-		return null;
-	}
-
-	private static final SimpleDateFormat fmt = EagRuntime.fixDateFormat(new SimpleDateFormat("yyyy-MM-dd hh-mm-ss"));
-	private static final Date dateInstance = new Date();
-
-	public static void toggleRec() {
-		if (recording && !canRec) {
-			return;
-		}
-		recording = !recording;
-		if (recording) {
-			if (!canRec) {
-				canRec = canRec();
-				if (!canRec) {
-					return;
-				}
-			}
-			if (recCanvas == null) {
-				recCanvas = (HTMLCanvasElement) Window.current().getDocument().createElement("canvas");
-				recCtx = (CanvasRenderingContext2D) recCanvas.getContext("2d");
-				PlatformAudio.initRecDest();
-				recStream = captureStreamAndAddAudio(recCanvas, PlatformAudio.getRecStream());
-			}
-			mediaRec = createMediaRecorder(recStream);
-			long startTime = System.currentTimeMillis();
-			TeaVMUtils.addEventListener(mediaRec, "dataavailable", new EventListener<Event>() {
-				@Override
-				public void handleEvent(Event evt) {
-					FixWebMDurationJS.getRecUrl(evt, (int) (System.currentTimeMillis() - startTime), url -> {
-						HTMLAnchorElement a = (HTMLAnchorElement) doc.createElement("a");
-						dateInstance.setTime(startTime);
-						a.setDownload(EaglercraftVersion.mainMenuStringB + " - " + EaglerProfile.getName() + " - " + fmt.format(dateInstance) + ".webm");
-						a.setHref(url);
-						a.click();
-						TeaVMUtils.freeDataURL(url);
-					}, logger::info);
-				}
-			});
-		} else {
-			stopRec(mediaRec);
-			mediaRec = null;
-		}
-	}
-
 	public static long randomSeed() {
 		return (long)(Math.random() * 9007199254740991.0);
 	}
@@ -647,4 +1121,78 @@ public class PlatformRuntime {
 	public static String currentThreadName() {
 		return currentThreadName;
 	}
+
+	@JSBody(params = { "steadyTimeFunc" }, script = "return steadyTimeFunc();")
+	private static native double steadyTimeMillis0(JSObject steadyTimeFunc);
+
+	public static long steadyTimeMillis() {
+		return (long)steadyTimeMillis0(steadyTimeFunc);
+	}
+
+	public static long nanoTime() {
+		return (long)(steadyTimeMillis0(steadyTimeFunc) * 1000000.0);
+	}
+
+	static void checkBootMenu() {
+		while(PlatformInput.keyboardNext()) {
+			if(PlatformInput.keyboardGetEventKeyState()) {
+				int key = PlatformInput.keyboardGetEventKey();
+				if(key == KeyboardConstants.KEY_DELETE || key == KeyboardConstants.KEY_BACK) {
+					enterBootMenu();
+				}
+			}
+		}
+	}
+
+	@JSBody(params = {}, script = "delete __isEaglerX188Running;")
+	private static native void clearRunningFlag();
+
+	static void enterBootMenu() {
+		if(!getClientConfigAdapter().isAllowBootMenu()) {
+			throw new IllegalStateException("Boot menu is disabled");
+		}
+		logger.info("Attempting to destroy context and enter boot menu...");
+		EaglercraftGPU.destroyCache();
+		Filesystem.closeAllHandles();
+		PlatformAudio.destroy();
+		PlatformScreenRecord.destroy();
+		removeEventHandlers();
+		if(webgl != null) {
+			EarlyLoadScreen.destroy();
+			PlatformInput.clearEvenBuffers();
+			WebGLBackBuffer.destroy();
+		}
+		if(canvas != null) {
+			canvas.delete();
+			canvas = null;
+		}
+		PlatformOpenGL.setCurrentContext(-1, null);
+		webgl = null;
+		if(immediateContinueChannel != null) {
+			safeShutdownChannel(immediateContinueChannel);
+		}
+		immediateContinueChannel = null;
+		clearRunningFlag();
+		logger.info("Firing boot menu escape signal...");
+		throw new TeaVMEnterBootMenuException();
+	}
+
+	public static void postCreate() {
+		if(getClientConfigAdapter().isAllowBootMenu()) {
+			checkBootMenu();
+		}
+		EarlyLoadScreen.paintFinal(true, true, false);
+		EarlyLoadScreen.destroy();
+	}
+
+	public static void setDisplayBootMenuNextRefresh(boolean en) {
+		BootMenuEntryPoint.setDisplayBootMenuNextRefresh(win, en);
+	}
+
+	static void beforeUnload() {
+		if(SingleplayerServerController.isWorldRunning()) {
+			SingleplayerServerController.autoSave();
+		}
+	}
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformScreenRecord.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformScreenRecord.java
new file mode 100755
index 0000000..c33af8b
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformScreenRecord.java
@@ -0,0 +1,286 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.teavm.interop.Async;
+import org.teavm.interop.AsyncCallback;
+import org.teavm.jso.JSBody;
+import org.teavm.jso.JSFunctor;
+import org.teavm.jso.JSObject;
+import org.teavm.jso.JSProperty;
+import org.teavm.jso.browser.Window;
+import org.teavm.jso.canvas.CanvasRenderingContext2D;
+import org.teavm.jso.dom.events.Event;
+import org.teavm.jso.dom.events.EventListener;
+import org.teavm.jso.dom.html.HTMLAnchorElement;
+import org.teavm.jso.dom.html.HTMLCanvasElement;
+import org.teavm.jso.webaudio.MediaStream;
+
+import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.FixWebMDurationJS;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
+import net.lax1dude.eaglercraft.v1_8.recording.EnumScreenRecordingCodec;
+
+/**
+ * Copyright (c) 2024 lax1dude, ayunami2000. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PlatformScreenRecord {
+
+	static final Logger logger = LogManager.getLogger("PlatformScreenRecord");
+
+	static Window win;
+	static HTMLCanvasElement canvas;
+	static boolean support;
+	static final Set<EnumScreenRecordingCodec> supportedCodecs = new HashSet<>();
+	static float currentGameVolume = 1.0f;
+	static float currentMicVolume = 0.0f;
+	static MediaStream recStream = null;
+	static HTMLCanvasElement downscaleCanvas = null;
+	static CanvasRenderingContext2D downscaleCanvasCtx = null;
+	static long lastDownscaleFrameCaptured = 0l;
+	static long startTime = 0l;
+	static boolean currentMicLock = false;
+	static JSObject mediaRec = null;
+	static ScreenRecordParameters currentParameters = null;
+
+	@JSBody(params = { "win", "canvas" }, script = "return (typeof win.MediaRecorder !== \"undefined\") && (typeof win.MediaRecorder.isTypeSupported === \"function\") && (typeof canvas.captureStream === \"function\");")
+	private static native boolean hasMediaRecorder(Window win, HTMLCanvasElement canvas);
+
+	@JSBody(params = { "win", "codec" }, script = "return win.MediaRecorder.isTypeSupported(codec);")
+	private static native boolean hasMediaCodec(Window win, String codec);
+
+	static void initContext(Window window, HTMLCanvasElement canvasElement) {
+		win = window;
+		canvas = canvasElement;
+		supportedCodecs.clear();
+		try {
+			support = hasMediaRecorder(window, canvasElement);
+			if(support) {
+				logger.info("MediaRecorder is supported, checking codecs...");
+				EnumScreenRecordingCodec[] allCodecs = EnumScreenRecordingCodec.values();
+				for(int i = 0; i < allCodecs.length; ++i) {
+					if(hasMediaCodec(window, allCodecs[i].mimeType)) {
+						supportedCodecs.add(allCodecs[i]);
+					}
+				}
+				if(!supportedCodecs.isEmpty()) {
+					logger.info("Found {} codecs that are probably supported!", supportedCodecs.size());
+				}else {
+					logger.error("No supported codecs found!");
+					support = false;
+				}
+			}
+		}catch(Throwable t) {
+			supportedCodecs.clear();
+			logger.error("Disabling screen recording because of exceptions!");
+			support = false;
+		}
+	}
+
+	static void captureFrameHook() {
+		if(mediaRec != null && currentParameters != null && currentParameters.resolutionDivisior > 1 && downscaleCanvas != null && downscaleCanvasCtx != null) {
+			if(currentParameters.captureFrameRate > 0) {
+				long curTime = PlatformRuntime.steadyTimeMillis();
+				if(curTime - lastDownscaleFrameCaptured < (long)(1000 / currentParameters.captureFrameRate)) {
+					return;
+				}
+				lastDownscaleFrameCaptured = curTime;
+			}
+			int oldWidth = downscaleCanvas.getWidth();
+			int oldHeight = downscaleCanvas.getHeight();
+			float divisor = (float)Math.sqrt(1.0 / Math.pow(2.0, currentParameters.resolutionDivisior - 1));
+			int newWidth = (int)(PlatformInput.getWindowWidth() * divisor);
+			int newHeight = (int)(PlatformInput.getWindowHeight() * divisor);
+			if(oldWidth != newWidth || oldHeight != newHeight) {
+				downscaleCanvas.setWidth(newWidth);
+				downscaleCanvas.setHeight(newHeight);
+			}
+			downscaleCanvasCtx.drawImage(canvas, 0, 0, newWidth, newHeight);
+		}
+	}
+
+	public static boolean isSupported() {
+		return support;
+	}
+
+	public static boolean isCodecSupported(EnumScreenRecordingCodec codec) {
+		return supportedCodecs.contains(codec);
+	}
+
+	public static void setGameVolume(float volume) {
+		currentGameVolume = volume;
+		if(PlatformAudio.gameRecGain != null) {
+			PlatformAudio.gameRecGain.getGain().setValue(volume);
+		}
+	}
+
+	public static void setMicrophoneVolume(float volume) {
+		currentMicVolume = volume;
+		if(PlatformAudio.micRecGain != null) {
+			PlatformAudio.micRecGain.getGain().setValue(volume);
+		}
+	}
+
+	@JSBody(params = { }, script = "return { alpha: false, desynchronized: true };")
+	private static native JSObject youEagler();
+
+	@JSBody(params = { "canvas", "fps", "audio" }, script = "var stream = fps <= 0 ? canvas.captureStream() : canvas.captureStream(fps); stream.addTrack(audio.getTracks()[0]); return stream;")
+	private static native MediaStream captureStreamAndAddAudio(HTMLCanvasElement canvas, int fps, MediaStream audio);
+
+	private static interface DataAvailableEvent extends Event {
+		@JSProperty
+		JSObject getData();
+	}
+
+	private static final SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd hh-mm-ss");
+
+	public static void startRecording(ScreenRecordParameters params) {
+		if(!support) {
+			throw new IllegalStateException("Screen recording is not supported");
+		}
+		if(isRecording()) {
+			throw new IllegalStateException("Already recording!");
+		}
+		if(params.captureFrameRate <= 0 && (!PlatformInput.vsync || !PlatformInput.vsyncSupport)) {
+			throw new IllegalStateException("V-Sync is not enabled, please enable it in \"Video Settings\"");
+		}
+		if(params.resolutionDivisior > 1) {
+			float divisor = (float)Math.sqrt(1.0 / Math.pow(2.0, params.resolutionDivisior - 1));
+			int newWidth = (int)(PlatformInput.getWindowWidth() * divisor);
+			int newHeight = (int)(PlatformInput.getWindowHeight() * divisor);
+			if(downscaleCanvas == null) {
+				downscaleCanvas = (HTMLCanvasElement) win.getDocument().createElement("canvas");
+				downscaleCanvas.setWidth(newWidth);
+				downscaleCanvas.setHeight(newHeight);
+				downscaleCanvasCtx = (CanvasRenderingContext2D) downscaleCanvas.getContext("2d", youEagler());
+				if(downscaleCanvasCtx == null) {
+					downscaleCanvas = null;
+					throw new IllegalStateException("Could not create downscaler canvas!");
+				}
+			}else {
+				downscaleCanvas.setWidth(newWidth);
+				downscaleCanvas.setHeight(newHeight);
+			}
+		}
+		currentMicLock = currentMicVolume <= 0.0f;
+		recStream = captureStreamAndAddAudio(params.resolutionDivisior > 1 ? downscaleCanvas : canvas, Math.max(params.captureFrameRate, 0),
+				PlatformAudio.initRecordingStream(currentGameVolume, currentMicVolume));
+		mediaRec = createMediaRecorder(recStream, params.codec.mimeType, params.videoBitsPerSecond * 1000, params.audioBitsPerSecond * 1000);
+		currentParameters = params;
+		startTime = PlatformRuntime.steadyTimeMillis();
+		TeaVMUtils.addEventListener(mediaRec, "dataavailable", new EventListener<DataAvailableEvent>() {
+			@Override
+			public void handleEvent(DataAvailableEvent evt) {
+				final String fileName = EaglercraftVersion.mainMenuStringB + " - " + EaglerProfile.getName() + " - " + fmt.format(new Date()) + "." + params.codec.fileExt;
+				if("video/webm".equals(params.codec.container)) {
+					FixWebMDurationJS.getRecUrl(evt, (int) (PlatformRuntime.steadyTimeMillis() - startTime), url -> {
+						HTMLAnchorElement a = (HTMLAnchorElement) win.getDocument().createElement("a");
+						a.setDownload(fileName);
+						a.setHref(url);
+						a.click();
+						TeaVMUtils.freeDataURL(url);
+					}, logger::info);
+				}else {
+					String url = TeaVMUtils.getDataURL(evt.getData());
+					HTMLAnchorElement a = (HTMLAnchorElement) win.getDocument().createElement("a");
+					a.setDownload(fileName);
+					a.setHref(url);
+					a.click();
+					TeaVMUtils.freeDataURL(url);
+				}
+			}
+		});
+	}
+
+	public static void endRecording() {
+		if(mediaRec != null) {
+			stopRec(mediaRec);
+			mediaRec = null;
+			PlatformAudio.destroyRecordingStream();
+		}
+		currentParameters = null;
+	}
+
+	public static boolean isRecording() {
+		return mediaRec != null;
+	}
+
+	public static boolean isMicVolumeLocked() {
+		return mediaRec != null && currentMicLock;
+	}
+
+	public static boolean isVSyncLocked() {
+		return mediaRec != null && currentParameters != null && currentParameters.captureFrameRate == -1;
+	}
+
+	@JSBody(params = { "canvas", "audio" }, script = "var stream = canvas.captureStream(); stream.addTrack(audio.getTracks()[0]); return stream;")
+	private static native MediaStream captureStreamAndAddAudio(HTMLCanvasElement canvas, MediaStream audio);
+
+	@JSBody(params = { "stream", "codec", "videoBitrate", "audioBitrate" }, script = "var rec = new MediaRecorder(stream, { mimeType: codec, videoBitsPerSecond: videoBitrate, audioBitsPerSecond: audioBitrate }); rec.start(); return rec;")
+	private static native JSObject createMediaRecorder(MediaStream stream, String codec, int videoBitrate, int audioBitrate);
+
+	@JSBody(params = { "rec" }, script = "rec.stop();")
+	private static native void stopRec(JSObject rec);
+
+	@JSBody(params = { }, script = "return (typeof MediaRecorder !== \"undefined\");")
+	private static native boolean canRec();
+
+	@JSFunctor
+	private static interface MediaHandler extends JSObject {
+		void onMedia(MediaStream stream);
+	}
+
+	@JSBody(params = { "cb" }, script = "if (\"navigator\" in window && \"mediaDevices\" in window.navigator && \"getUserMedia\" in window.navigator.mediaDevices) { try { window.navigator.mediaDevices.getUserMedia({ audio: true, video: false }).then(function(stream) { cb(stream); }).catch(function(err) { console.error(err); cb(null); }); } catch(e) { console.error(\"getUserMedia Error!\"); cb(null); } } else { console.error(\"No getUserMedia!\"); cb(null); }")
+	private static native void getMic0(MediaHandler cb);
+
+	@Async
+	private static native MediaStream getMic1();
+
+	private static void getMic1(AsyncCallback<MediaStream> cb) {
+		getMic0(cb::complete);
+	}
+
+	private static boolean canMic = true;
+	private static MediaStream mic = null;
+
+	static MediaStream getMic() {
+		if (canMic) {
+			if (mic == null) {
+				mic = getMic1();
+				if (mic == null) {
+					canMic = false;
+					return null;
+				}
+				return mic;
+			}
+			return mic;
+		}
+		return null;
+	}
+
+	static void destroy() {
+		supportedCodecs.clear();
+		support = false;
+		canvas = null;
+		win = null;
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformUpdateSvc.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformUpdateSvc.java
index 3837b58..c8759d7 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformUpdateSvc.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformUpdateSvc.java
@@ -4,12 +4,14 @@ import org.teavm.jso.JSBody;
 import org.teavm.jso.typedarrays.ArrayBuffer;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.BootMenuEntryPoint;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUpdateThread;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.update.UpdateCertificate;
 import net.lax1dude.eaglercraft.v1_8.update.UpdateProgressStruct;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateResultObj;
 
 /**
  * Copyright (c) 2024 lax1dude. All Rights Reserved.
@@ -32,24 +34,30 @@ public class PlatformUpdateSvc {
 
 	private static byte[] eaglercraftXClientSignature = null;
 	private static byte[] eaglercraftXClientBundle = null;
+	private static UpdateResultObj updateResult = null;
 
 	private static final UpdateProgressStruct progressStruct = new UpdateProgressStruct();
 
-	@JSBody(params = { }, script = "if(typeof window.eaglercraftXClientSignature !== \"string\") return null; var ret = window.eaglercraftXClientSignature; window.eaglercraftXClientSignature = null; return ret;")
+	@JSBody(params = { }, script = "if(typeof eaglercraftXClientSignature !== \"string\") return null; var ret = eaglercraftXClientSignature; eaglercraftXClientSignature = null; return ret;")
 	private static native String grabEaglercraftXClientSignature();
 
-	@JSBody(params = { }, script = "if(typeof window.eaglercraftXClientBundle !== \"string\") return null; var ret = window.eaglercraftXClientBundle; window.eaglercraftXClientBundle = null; return ret;")
+	@JSBody(params = { }, script = "if(typeof eaglercraftXClientBundle !== \"string\") return null; var ret = eaglercraftXClientBundle; eaglercraftXClientBundle = null; return ret;")
 	private static native String grabEaglercraftXClientBundle();
 
 	public static Thread updateThread = null;
 
+	private static boolean hasInitialized = false;
+
 	public static boolean supported() {
 		return true;
 	}
 
 	public static void initialize() {
-		eaglercraftXClientSignature = loadClientData(grabEaglercraftXClientSignature());
-		eaglercraftXClientBundle = loadClientData(grabEaglercraftXClientBundle());
+		if(!hasInitialized) {
+			hasInitialized = true;
+			eaglercraftXClientSignature = loadClientData(grabEaglercraftXClientSignature());
+			eaglercraftXClientBundle = loadClientData(grabEaglercraftXClientBundle());
+		}
 	}
 
 	private static byte[] loadClientData(String url) {
@@ -65,10 +73,16 @@ public class PlatformUpdateSvc {
 	}
 
 	public static byte[] getClientSignatureData() {
+		if(!hasInitialized) {
+			initialize();
+		}
 		return eaglercraftXClientSignature;
 	}
 
 	public static byte[] getClientBundleData() {
+		if(!hasInitialized) {
+			initialize();
+		}
 		return eaglercraftXClientBundle;
 	}
 
@@ -86,6 +100,27 @@ public class PlatformUpdateSvc {
 		return progressStruct;
 	}
 
+	public static UpdateResultObj getUpdateResult() {
+		UpdateResultObj ret = updateResult;
+		if(ret != null) {
+			updateResult = null;
+			return ret;
+		}else {
+			return null;
+		}
+	}
+
+	public static void setUpdateResultTeaVM(UpdateResultObj obj) {
+		updateResult = obj;
+	}
+
+	public static void installSignedClient(UpdateCertificate clientCert, byte[] clientPayload, boolean setDefault,
+			boolean setTimeout) {
+		BootMenuEntryPoint.installSignedClientAtRuntime(
+				clientCert.bundleDisplayName + " " + clientCert.bundleDisplayVersion, PlatformRuntime.win,
+				clientCert.rawCertData, clientPayload, setDefault, setTimeout);
+	}
+
 	public static void quine(String filename, byte[] cert, byte[] data, String date) {
 		EagRuntime.downloadFileWithName(filename, TeaVMUpdateThread.generateSignedOffline(cert, data, date));
 	}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformVoiceClient.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformVoiceClient.java
index 36df5bf..2b46dd8 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformVoiceClient.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformVoiceClient.java
@@ -44,98 +44,159 @@ public class PlatformVoiceClient {
 
 	private static final Logger logger = LogManager.getLogger("PlatformVoiceClient");
 
-	private static final HashMap<EaglercraftUUID, AnalyserNode> voiceAnalysers = new HashMap<>();
-	private static final HashMap<EaglercraftUUID, GainNode> voiceGains = new HashMap<>();
-	private static final HashMap<EaglercraftUUID, PannerNode> voicePanners = new HashMap<>();
+	@JSBody(params = {}, script = "return typeof navigator.mediaDevices !== \"undefined\" && typeof navigator.mediaDevices.getUserMedia !== \"undefined\";")
+	private static native boolean isSupported0();
 
-	@JSBody(params = {}, script = "return typeof window.RTCPeerConnection !== \"undefined\" && typeof navigator.mediaDevices !== \"undefined\" && typeof navigator.mediaDevices.getUserMedia !== \"undefined\";")
-	public static native boolean isSupported();
+	private static final int SRC_OBJECT_SUPPORT_NONE = -1;
+	private static final int SRC_OBJECT_SUPPORT_CORE = 0;
+	private static final int SRC_OBJECT_SUPPORT_MOZ = 1;
+
+	static boolean hasCheckedSupport = false;
+	static boolean support = false;
+	static int srcObjectSupport = SRC_OBJECT_SUPPORT_NONE;
+
+	public static boolean isSupported() {
+		if(!hasCheckedSupport) {
+			support = PlatformWebRTC.supported() && isSupported0();
+			if(support) {
+				srcObjectSupport = checkSrcObjectSupport(PlatformRuntime.doc);
+				if(srcObjectSupport == SRC_OBJECT_SUPPORT_NONE) {
+					support = false;
+				}else if(srcObjectSupport == SRC_OBJECT_SUPPORT_MOZ) {
+					logger.info("Using moz- prefix for HTMLMediaElement.srcObject");
+				}
+			}
+			hasCheckedSupport = true;
+		}
+		return support;
+	}
 
 	@JSBody(params = { "item" }, script = "return item.streams[0];")
 	static native MediaStream getFirstStream(JSObject item);
 
+	@JSBody(params = { "doc" }, script = "var aud = doc.createElement(\"audio\"); return (typeof aud.srcObject !== \"undefined\") ? 0 : ((typeof aud.mozSrcObject !== \"undefined\") ? 1 : -1);")
+	static native int checkSrcObjectSupport(HTMLDocument doc);
+
+	static void setSrcObject(HTMLAudioElement aud, MediaStream stream) {
+		switch(srcObjectSupport) {
+		case SRC_OBJECT_SUPPORT_CORE:
+			setSrcObjectCore(aud, stream);
+			break;
+		case SRC_OBJECT_SUPPORT_MOZ:
+			setMozSrcObject(aud, stream);
+			break;
+		default:
+			throw new IllegalStateException();
+		}
+	}
+
 	@JSBody(params = { "aud", "stream" }, script = "return aud.srcObject = stream;")
-	static native void setSrcObject(HTMLAudioElement aud, MediaStream stream);
+	private static native void setSrcObjectCore(HTMLAudioElement aud, MediaStream stream);
 
-	@JSBody(params = { "aud" }, script = "return aud.remove();")
-	static native void removeAud(HTMLAudioElement aud);
+	@JSBody(params = { "aud", "stream" }, script = "return aud.mozSrcObject = stream;")
+	private static native void setMozSrcObject(HTMLAudioElement aud, MediaStream stream);
 
-	@JSBody(params = { "pc", "stream" }, script = "return stream.getTracks().forEach((track) => { pc.addTrack(track, stream); });")
+	@JSBody(params = { "pc", "stream" }, script = "return stream.getTracks().forEach(function(track) { pc.addTrack(track, stream); });")
 	static native void addStream(JSObject pc, MediaStream stream);
 
 	@JSBody(params = { "rawStream", "muted" }, script = "return rawStream.getAudioTracks()[0].enabled = !muted;")
 	static native void mute(MediaStream rawStream, boolean muted);
 
 	@JSBody(params = { "peerConnection", "str" }, script = "return peerConnection.addIceCandidate(new RTCIceCandidate(JSON.parse(str)));")
-	static native void addIceCandidate(JSObject peerConnection, String str);
+	static native void addCoreIceCandidate(JSObject peerConnection, String str);
+
+	@JSBody(params = { "peerConnection", "str" }, script = "return peerConnection.addIceCandidate(new mozRTCIceCandidate(JSON.parse(str)));")
+	static native void addMozIceCandidate(JSObject peerConnection, String str);
+
+	static void addIceCandidate(JSObject peerConnection, String str) {
+		if(!PlatformWebRTC.hasCheckedSupport) PlatformWebRTC.supported();
+		switch(PlatformWebRTC.supportedImpl) {
+		case PlatformWebRTC.WEBRTC_SUPPORT_CORE:
+		case PlatformWebRTC.WEBRTC_SUPPORT_WEBKIT:
+			addCoreIceCandidate(peerConnection, str);
+			break;
+		case PlatformWebRTC.WEBRTC_SUPPORT_MOZ:
+			addMozIceCandidate(peerConnection, str);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
+	}
 
 	public static void disconnect(JSObject peerConnection) {
 		PlatformWebRTC.closeIt(peerConnection);
 	}
 
 	public static void setVoiceProximity(int prox) {
-		for (PannerNode panner : voicePanners.values()) {
-			panner.setMaxDistance(VoiceClientController.getVoiceListenVolume() * 2 * prox + 0.1f);
+		for (VoicePeer player : peerList.values()) {
+			if(player.panner != null) {
+				player.panner.setMaxDistance(VoiceClientController.getVoiceListenVolume() * 2 * prox + 0.1f);
+			}
 		}
 	}
 
 	public static void updateVoicePosition(EaglercraftUUID uuid, double x, double y, double z) {
-		if (voicePanners.containsKey(uuid)) voicePanners.get(uuid).setPosition((float) x, (float) y, (float) z);
+		VoicePeer player = peerList.get(uuid);
+		if (player != null && player.panner != null) player.panner.setPosition((float) x, (float) y, (float) z);
 	}
 
 	public static class VoicePeer {
+
 		public final EaglercraftUUID peerId;
 		public final JSObject peerConnection;
 		public MediaStream rawStream;
+		
+		private AnalyserNode analyser = null;
+		private GainNode gain = null;
+		private PannerNode panner = null;
+		private AudioNode recNode = null;
+		
 		public VoicePeer(EaglercraftUUID peerId, JSObject peerConnection, boolean offer) {
 			this.peerId = peerId;
 			this.peerConnection = peerConnection;
 
 			TeaVMUtils.addEventListener(peerConnection, "icecandidate", (EventListener<Event>) evt -> {
 				if (PlatformWebRTC.hasCandidate(evt)) {
-					Map<String, String> m = new HashMap<>();
+					JSONObject m = new JSONObject();
 					m.put("sdpMLineIndex", "" + PlatformWebRTC.getSdpMLineIndex(evt));
 					m.put("candidate", PlatformWebRTC.getCandidate(evt));
-					handleIceCandidate(peerId, JSONWriter.valueToString(m));
+					VoiceClientController.sendPacketICE(peerId, m.toString());
 				}
 			});
 			TeaVMUtils.addEventListener(peerConnection, "track", (EventListener<Event>) evt -> {
 				rawStream = getFirstStream(evt);
-				HTMLAudioElement aud = (HTMLAudioElement) HTMLDocument.current().createElement("audio");
+				HTMLAudioElement aud = (HTMLAudioElement) PlatformRuntime.doc.createElement("audio");
 				aud.setAutoplay(true);
 				aud.setMuted(true);
-				TeaVMUtils.addEventListener(aud, "ended", (EventListener<Event>) evt2 -> {
-					removeAud(aud);
-				});
 				setSrcObject(aud, rawStream);
-				handlePeerTrack(peerId, rawStream);
+				handlePeerTrack(this, rawStream);
 			});
 
 			addStream(peerConnection, localMediaStream.getStream());
 			if (offer) {
 				PlatformWebRTC.createOffer(peerConnection, desc -> {
 					PlatformWebRTC.setLocalDescription(peerConnection, desc, () -> {
-						handleDescription(peerId, JSON.stringify(desc));
+						VoiceClientController.sendPacketDesc(peerId, JSON.stringify(desc));
 					}, err -> {
 						logger.error("Failed to set local description for \"{}\"! {}", peerId, err);
 						if (peerStateInitial == EnumVoiceChannelPeerState.LOADING) {
 							peerStateInitial = EnumVoiceChannelPeerState.FAILED;
 						}
-						signalDisconnect(peerId, false);
+						signalDisconnect(VoicePeer.this, false);
 					});
 				}, err -> {
 					logger.error("Failed to set create offer for \"{}\"! {}", peerId, err);
 					if (peerStateInitial == EnumVoiceChannelPeerState.LOADING) {
 						peerStateInitial = EnumVoiceChannelPeerState.FAILED;
 					}
-					signalDisconnect(peerId, false);
+					signalDisconnect(VoicePeer.this, false);
 				});
 			}
 
 			TeaVMUtils.addEventListener(peerConnection, "connectionstatechange", (EventListener<Event>) evt -> {
 				String cs = PlatformWebRTC.getConnectionState(peerConnection);
 				if ("disconnected".equals(cs)) {
-					signalDisconnect(peerId, false);
+					signalDisconnect(VoicePeer.this, false);
 				} else if ("connected".equals(cs)) {
 					if (peerState != EnumVoiceChannelPeerState.SUCCESS) {
 						peerState = EnumVoiceChannelPeerState.SUCCESS;
@@ -144,7 +205,7 @@ public class PlatformVoiceClient {
 					if (peerState == EnumVoiceChannelPeerState.LOADING) {
 						peerState = EnumVoiceChannelPeerState.FAILED;
 					}
-					signalDisconnect(peerId, false);
+					signalDisconnect(VoicePeer.this, false);
 				}
 			});
 		}
@@ -160,32 +221,32 @@ public class PlatformVoiceClient {
 		public void setRemoteDescription(String descJSON) {
 			try {
 				JSONObject remoteDesc = new JSONObject(descJSON);
-				PlatformWebRTC.setRemoteDescription2(peerConnection, descJSON, () -> {
+				PlatformWebRTC.setRemoteDescription2(peerConnection, JSON.parse(descJSON), () -> {
 					if (remoteDesc.has("type") && "offer".equals(remoteDesc.getString("type"))) {
 						PlatformWebRTC.createAnswer(peerConnection, desc -> {
 							PlatformWebRTC.setLocalDescription(peerConnection, desc, () -> {
-								handleDescription(peerId, JSON.stringify(desc));
+								VoiceClientController.sendPacketDesc(peerId, JSON.stringify(desc));
 								if (peerStateDesc != EnumVoiceChannelPeerState.SUCCESS) peerStateDesc = EnumVoiceChannelPeerState.SUCCESS;
 							}, err -> {
 								logger.error("Failed to set local description for \"{}\"! {}", peerId, err.getMessage());
 								if (peerStateDesc == EnumVoiceChannelPeerState.LOADING) peerStateDesc = EnumVoiceChannelPeerState.FAILED;
-								signalDisconnect(peerId, false);
+								signalDisconnect(VoicePeer.this, false);
 							});
 						}, err -> {
 							logger.error("Failed to create answer for \"{}\"! {}", peerId, err.getMessage());
 							if (peerStateDesc == EnumVoiceChannelPeerState.LOADING) peerStateDesc = EnumVoiceChannelPeerState.FAILED;
-							signalDisconnect(peerId, false);
+							signalDisconnect(VoicePeer.this, false);
 						});
 					}
 				}, err -> {
 					logger.error("Failed to set remote description for \"{}\"! {}", peerId, err.getMessage());
 					if (peerStateDesc == EnumVoiceChannelPeerState.LOADING) peerStateDesc = EnumVoiceChannelPeerState.FAILED;
-					signalDisconnect(peerId, false);
+					signalDisconnect(VoicePeer.this, false);
 				});
 			} catch (Throwable err) {
 				logger.error("Failed to parse remote description for \"{}\"! {}", peerId, err.getMessage());
 				if (peerStateDesc == EnumVoiceChannelPeerState.LOADING) peerStateDesc = EnumVoiceChannelPeerState.FAILED;
-				signalDisconnect(peerId, false);
+				signalDisconnect(VoicePeer.this, false);
 			}
 		}
 
@@ -196,14 +257,14 @@ public class PlatformVoiceClient {
 			} catch (Throwable err) {
 				logger.error("Failed to parse ice candidate for \"{}\"! {}", peerId, err.getMessage());
 				if (peerStateIce == EnumVoiceChannelPeerState.LOADING) peerStateIce = EnumVoiceChannelPeerState.FAILED;
-				signalDisconnect(peerId, false);
+				signalDisconnect(VoicePeer.this, false);
 			}
 		}
 	}
 
 	public static Set<Map<String, String>> iceServers = new HashSet<>();
 	public static boolean hasInit = false;
-	public static Map<EaglercraftUUID, VoicePeer> peerList = new HashMap<>();
+	public static final Map<EaglercraftUUID, VoicePeer> peerList = new HashMap<>();
 	public static MediaStreamAudioDestinationNode localMediaStream;
 	public static GainNode localMediaStreamGain;
 	public static MediaStream localRawMediaStream;
@@ -242,7 +303,7 @@ public class PlatformVoiceClient {
 
 	public static void initializeDevices() {
 		if (!hasInit) {
-			localRawMediaStream = PlatformRuntime.getMic();
+			localRawMediaStream = PlatformScreenRecord.getMic();
 			if (localRawMediaStream == null) {
 				readyState = EnumVoiceChannelReadyState.ABORTED;
 				return;
@@ -262,15 +323,17 @@ public class PlatformVoiceClient {
 	}
 
 	public static void tickVoiceClient() {
-		for (EaglercraftUUID uuid : voiceAnalysers.keySet()) {
-			AnalyserNode analyser = voiceAnalysers.get(uuid);
-			Uint8Array array = Uint8Array.create(analyser.getFrequencyBinCount());
-			analyser.getByteFrequencyData(array);
-			int len = array.getLength();
-			for (int i = 0; i < len; i++) {
-				if (array.get(i) >= 0.1f) {
-					VoiceClientController.getVoiceSpeaking().add(uuid);
-					break;
+		for (VoicePeer voicePlayer : peerList.values()) {
+			AnalyserNode analyser = voicePlayer.analyser;
+			if(analyser != null) {
+				Uint8Array array = Uint8Array.create(analyser.getFrequencyBinCount());
+				analyser.getByteFrequencyData(array);
+				int len = array.getLength();
+				for (int i = 0; i < len; i++) {
+					if (array.get(i) >= 0.1f) {
+						VoiceClientController.getVoiceSpeaking().add(voicePlayer.peerId);
+						break;
+					}
 				}
 			}
 		}
@@ -335,14 +398,18 @@ public class PlatformVoiceClient {
 	public static void signalDisconnect(EaglercraftUUID peerId, boolean quiet) {
 		VoicePeer peer = peerList.get(peerId);
 		if (peer != null) {
-			peerList.remove(peerId, peer);
-			try {
-				peer.disconnect();
-			} catch (Throwable ignored) {}
-			handlePeerDisconnect(peerId, quiet);
+			signalDisconnect(peer, quiet);
 		}
 	}
 
+	private static void signalDisconnect(VoicePeer peer, boolean quiet) {
+		peerList.remove(peer.peerId, peer);
+		try {
+			peer.disconnect();
+		} catch (Throwable ignored) {}
+		handlePeerDisconnect(peer, quiet);
+	}
+
 	public static void mutePeer(EaglercraftUUID peerId, boolean muted) {
 		VoicePeer peer = peerList.get(peerId);
 		if (peer != null) {
@@ -357,30 +424,25 @@ public class PlatformVoiceClient {
 		}
 	}
 
-	public static void handleIceCandidate(EaglercraftUUID peerId, String candidate) {
-		VoiceClientController.sendPacketICE(peerId, candidate);
-	}
-
-	public static void handleDescription(EaglercraftUUID peerId, String desc) {
-		VoiceClientController.sendPacketDesc(peerId, desc);
-	}
-
-	public static void handlePeerTrack(EaglercraftUUID peerId, MediaStream audioStream) {
+	private static void handlePeerTrack(VoicePeer peer, MediaStream audioStream) {
 		if (VoiceClientController.getVoiceChannel() == EnumVoiceChannelType.NONE) return;
 		MediaStreamAudioSourceNode audioNode = PlatformAudio.audioctx.createMediaStreamSource(audioStream);
 		AnalyserNode analyser = PlatformAudio.audioctx.createAnalyser();
 		analyser.setSmoothingTimeConstant(0f);
 		analyser.setFftSize(32);
 		audioNode.connect(analyser);
-		voiceAnalysers.put(peerId, analyser);
 		if (VoiceClientController.getVoiceChannel() == EnumVoiceChannelType.GLOBAL) {
 			GainNode gain = PlatformAudio.audioctx.createGain();
 			gain.getGain().setValue(VoiceClientController.getVoiceListenVolume());
-			analyser.connect(gain);
+			audioNode.connect(gain);
 			gain.connect(PlatformAudio.audioctx.getDestination());
-			gain.connect(PlatformAudio.recDest);
-			voiceGains.put(peerId, gain);
-			VoiceClientController.getVoiceListening().add(peerId);
+			if(PlatformAudio.gameRecGain != null) {
+				gain.connect(PlatformAudio.gameRecGain);
+			}
+			VoiceClientController.getVoiceListening().add(peer.peerId);
+			peer.analyser = analyser;
+			peer.gain = gain;
+			peer.recNode = gain;
 		} else if (VoiceClientController.getVoiceChannel() == EnumVoiceChannelType.PROXIMITY) {
 			PannerNode panner = PlatformAudio.audioctx.createPanner();
 			panner.setRolloffFactor(1f);
@@ -395,45 +457,72 @@ public class PlatformVoiceClient {
 			panner.setMaxDistance(vol * 2 * VoiceClientController.getVoiceProximity() + 0.1f);
 			GainNode gain = PlatformAudio.audioctx.createGain();
 			gain.getGain().setValue(vol);
-			analyser.connect(gain);
+			audioNode.connect(gain);
 			gain.connect(panner);
 			panner.connect(PlatformAudio.audioctx.getDestination());
-			panner.connect(PlatformAudio.recDest);
-			voiceGains.put(peerId, gain);
-			VoiceClientController.getVoiceListening().add(peerId);
-			voicePanners.put(peerId, panner);
+			if(PlatformAudio.gameRecGain != null) {
+				panner.connect(PlatformAudio.gameRecGain);
+			}
+			VoiceClientController.getVoiceListening().add(peer.peerId);
+			peer.analyser = analyser;
+			peer.panner = panner;
+			peer.gain = gain;
+			peer.recNode = panner;
 		}
-		if (VoiceClientController.getVoiceMuted().contains(peerId)) mutePeer(peerId, true);
+		if (VoiceClientController.getVoiceMuted().contains(peer.peerId)) mutePeer(peer.peerId, true);
 	}
 
-	public static void handlePeerDisconnect(EaglercraftUUID peerId, boolean quiet) {
-		if (voiceAnalysers.containsKey(peerId)) {
-			voiceAnalysers.get(peerId).disconnect();
-			voiceAnalysers.remove(peerId);
+	static void addRecordingDest(AudioNode destNode) {
+		for(VoicePeer peer : peerList.values()) {
+			if(peer.recNode != null) {
+				peer.recNode.connect(destNode);
+			}
 		}
-		if (voiceGains.containsKey(peerId)) {
-			voiceGains.get(peerId).disconnect();
-			voiceGains.remove(peerId);
-			VoiceClientController.getVoiceListening().remove(peerId);
+	}
+
+	static void removeRecordingDest(AudioNode destNode) {
+		for(VoicePeer peer : peerList.values()) {
+			try {
+				if(peer.recNode != null) {
+					peer.recNode.disconnect(destNode);
+				}
+			}catch(Throwable t) {
+			}
 		}
-		if (voicePanners.containsKey(peerId)) {
-			voicePanners.get(peerId).disconnect();
-			voicePanners.remove(peerId);
+	}
+
+	private static void handlePeerDisconnect(VoicePeer peer, boolean quiet) {
+		if(peer.analyser != null) {
+			peer.analyser.disconnect();
+			peer.analyser = null;
 		}
+		if(peer.gain != null) {
+			peer.gain.disconnect();
+			peer.gain = null;
+		}
+		if(peer.panner != null) {
+			peer.panner.disconnect();
+			peer.panner = null;
+		}
+		VoiceClientController.getVoiceListening().remove(peer.peerId);
 		if (!quiet) {
-			VoiceClientController.sendPacketDisconnect(peerId);
+			VoiceClientController.sendPacketDisconnectPeer(peer.peerId);
 		}
 	}
 
 	public static void setVoiceListenVolume(float f) {
-		for (EaglercraftUUID uuid : voiceGains.keySet()) {
-			GainNode gain = voiceGains.get(uuid);
-			float val = f;
-			if(val > 0.5f) val = 0.5f + (val - 0.5f) * 3.0f;
-			if(val > 2.0f) val = 2.0f;
-			if(val < 0.0f) val = 0.0f;
-			gain.getGain().setValue(val * 2.0f);
-			if (voicePanners.containsKey(uuid)) voicePanners.get(uuid).setMaxDistance(f * 2 * VoiceClientController.getVoiceProximity() + 0.1f);
+		for (VoicePeer peer : peerList.values()) {
+			if(peer.gain != null) {
+				float val = f;
+				if(val > 0.5f) val = 0.5f + (val - 0.5f) * 3.0f;
+				if(val > 2.0f) val = 2.0f;
+				if(val < 0.0f) val = 0.0f;
+				peer.gain.getGain().setValue(val * 2.0f);
+			}
+			if(peer.panner != null) {
+				peer.panner.setMaxDistance(f * 2 * VoiceClientController.getVoiceProximity() + 0.1f);
+			}
 		}
 	}
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
index dbd6e5a..38e73b5 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
@@ -1,17 +1,20 @@
 package net.lax1dude.eaglercraft.v1_8.internal;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANPeerEvent;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayQuery;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayQueryImpl;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayQueryRateLimitDummy;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServerRateLimitTracker;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServerSocket;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServerSocketImpl;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServerSocketRateLimitDummy;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayWorldsQuery;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.*;
-import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayWorldsQueryImpl;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayWorldsQueryRateLimitDummy;
 
 import org.json.JSONObject;
 import org.json.JSONWriter;
@@ -29,12 +32,10 @@ import org.teavm.jso.websocket.WebSocket;
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.ListMultimap;
 
-import java.io.DataInputStream;
-import java.io.IOException;
 import java.util.*;
 
 /**
- * Copyright (c) 2022-2024 ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -52,23 +53,110 @@ public class PlatformWebRTC {
 
 	private static final Logger logger = LogManager.getLogger("PlatformWebRTC");
 
-	@JSBody(script = "return typeof window.RTCPeerConnection !== \"undefined\";")
-	public static native boolean supported();
+	static final int WEBRTC_SUPPORT_NONE = 0;
+	static final int WEBRTC_SUPPORT_CORE = 1;
+	static final int WEBRTC_SUPPORT_WEBKIT = 2;
+	static final int WEBRTC_SUPPORT_MOZ = 3;
 
-	@JSBody(params = { "item" }, script = "return item.close();")
+	@JSBody(script = "return (typeof RTCPeerConnection !== \"undefined\") ? 1 : ((typeof webkitRTCPeerConnection !== \"undefined\") ? 2 : ((typeof mozRTCPeerConnection !== \"undefined\") ? 3 : 0));")
+	private static native int checkSupportedImpl();
+
+	static boolean hasCheckedSupport = false;
+	static int supportedImpl = WEBRTC_SUPPORT_NONE;
+	static boolean useSessionDescConstructor = false;
+	static boolean useOldConnStateCheck = false;
+	static boolean belowChrome71Fix = false;
+
+	public static boolean supported() {
+		if(!hasCheckedSupport) {
+			supportedImpl = checkSupportedImpl();
+			hasCheckedSupport = true;
+			if(supportedImpl == WEBRTC_SUPPORT_NONE) {
+				logger.error("WebRTC is not supported on this browser!");
+			}else if(supportedImpl == WEBRTC_SUPPORT_WEBKIT) {
+				logger.info("Using webkit- prefix for RTCPeerConnection");
+			}else if(supportedImpl == WEBRTC_SUPPORT_MOZ) {
+				logger.info("Using moz- prefix for RTCPeerConnection");
+			}
+			if(supportedImpl != WEBRTC_SUPPORT_NONE) {
+				belowChrome71Fix = isChromeBelow71();
+				if(belowChrome71Fix) {
+					logger.info("Note: Detected Chrome below version 71, stripping \"a=extmap-allow-mixed\" from the description SDP field");
+				}
+			}else {
+				belowChrome71Fix = false;
+			}
+		}
+		return supportedImpl != WEBRTC_SUPPORT_NONE;
+	}
+
+	@JSBody(params = { "item" }, script = "item.close();")
 	static native void closeIt(JSObject item);
 
 	@JSBody(params = { "item" }, script = "return item.readyState;")
 	static native String getReadyState(JSObject item);
 
-	@JSBody(params = { "item", "buffer" }, script = "return item.send(buffer);")
+	@JSBody(params = { "item", "buffer" }, script = "item.send(buffer);")
 	static native void sendIt(JSObject item, ArrayBuffer buffer);
 
 	@JSBody(params = { "item" }, script = "return !!item.candidate;")
 	static native boolean hasCandidate(JSObject item);
 
-	@JSBody(params = { "item" }, script = "return item.connectionState;")
-	static native String getConnectionState(JSObject item);
+	@JSBody(params = { "item" }, script = "return item.connectionState || \"\";")
+	private static native String getModernConnectionState(JSObject item);
+
+	@JSBody(params = { "item" }, script = "return item.iceConnectionState;")
+	private static native String getICEConnectionState(JSObject item);
+
+	@JSBody(params = { "item" }, script = "return item.signalingState;")
+	private static native String getSignalingState(JSObject item);
+
+	static String getConnectionState(JSObject item) {
+		if(useOldConnStateCheck) {
+			return getConnectionStateLegacy(item);
+		}else {
+			String str = getModernConnectionState(item);
+			if(str.length() == 0) {
+				useOldConnStateCheck = true;
+				logger.info("Note: Using legacy connection state check using iceConnectionState+signalingState");
+				return getConnectionStateLegacy(item);
+			}else {
+				return str;
+			}
+		}
+	}
+
+	private static String getConnectionStateLegacy(JSObject item) {
+		String connState = getICEConnectionState(item);
+		switch(connState) {
+		case "new":
+			return "new";
+		case "checking":
+			return "connecting";
+		case "failed":
+			return "failed";
+		case "disconnected":
+			return "disconnected";
+		case "connected":
+		case "completed":
+		case "closed":
+			String signalState = getSignalingState(item);
+			switch(signalState) {
+			case "stable":
+				return "connected";
+			case "have-local-offer":
+			case "have-remote-offer":
+			case "have-local-pranswer":
+			case "have-remote-pranswer":
+				return "connecting";
+			case "closed":
+			default:
+				return "closed";
+			}
+		default:
+			return "closed";
+		}
+	}
 
 	@JSBody(params = { "item" }, script = "return item.candidate.sdpMLineIndex;")
 	static native int getSdpMLineIndex(JSObject item);
@@ -76,13 +164,33 @@ public class PlatformWebRTC {
 	@JSBody(params = { "item" }, script = "return item.candidate.candidate;")
 	static native String getCandidate(JSObject item);
 
+	static JSObject createRTCPeerConnection(String iceServers) {
+		if(!hasCheckedSupport) supported();
+		switch(supportedImpl) {
+		case WEBRTC_SUPPORT_CORE:
+			return createCoreRTCPeerConnection(iceServers);
+		case WEBRTC_SUPPORT_WEBKIT:
+			return createWebkitRTCPeerConnection(iceServers);
+		case WEBRTC_SUPPORT_MOZ:
+			return createMozRTCPeerConnection(iceServers);
+		default:
+			throw new UnsupportedOperationException();
+		}
+	}
+
 	@JSBody(params = { "iceServers" }, script = "return new RTCPeerConnection({ iceServers: JSON.parse(iceServers), optional: [ { DtlsSrtpKeyAgreement: true } ] });")
-	static native JSObject createRTCPeerConnection(String iceServers);
+	static native JSObject createCoreRTCPeerConnection(String iceServers);
+
+	@JSBody(params = { "iceServers" }, script = "return new webkitRTCPeerConnection({ iceServers: JSON.parse(iceServers), optional: [ { DtlsSrtpKeyAgreement: true } ] });")
+	static native JSObject createWebkitRTCPeerConnection(String iceServers);
+
+	@JSBody(params = { "iceServers" }, script = "return new mozRTCPeerConnection({ iceServers: JSON.parse(iceServers), optional: [ { DtlsSrtpKeyAgreement: true } ] });")
+	static native JSObject createMozRTCPeerConnection(String iceServers);
 
 	@JSBody(params = { "peerConnection", "name" }, script = "return peerConnection.createDataChannel(name);")
 	static native JSObject createDataChannel(JSObject peerConnection, String name);
 
-	@JSBody(params = { "item", "type" }, script = "return (item.binaryType = type);")
+	@JSBody(params = { "item", "type" }, script = "item.binaryType = type;")
 	static native void setBinaryType(JSObject item, String type);
 
 	@JSBody(params = { "item" }, script = "return item.data;")
@@ -91,29 +199,139 @@ public class PlatformWebRTC {
 	@JSBody(params = { "item" }, script = "return item.channel;")
 	static native JSObject getChannel(JSObject item);
 
-	@JSBody(params = { "peerConnection", "h1", "h2" }, script = "return peerConnection.createOffer(h1, h2);")
+	@JSBody(params = { "peerConnection", "h1", "h2" }, script = "peerConnection.createOffer(h1, h2);")
 	static native void createOffer(JSObject peerConnection, DescHandler h1, ErrorHandler h2);
 
-	@JSBody(params = { "peerConnection", "desc", "h1", "h2" }, script = "return peerConnection.setLocalDescription(desc, h1, h2);")
+	@JSBody(params = { "peerConnection", "desc", "h1", "h2" }, script = "peerConnection.setLocalDescription(desc, h1, h2);")
 	static native void setLocalDescription(JSObject peerConnection, JSObject desc, EmptyHandler h1, ErrorHandler h2);
 
-	@JSBody(params = { "peerConnection", "str" }, script = "return peerConnection.setRemoteDescription(JSON.parse(str));")
-	static native void setRemoteDescription(JSObject peerConnection, String str);
+	@JSBody(params = { "peerConnection", "str" }, script = "var candidateList = JSON.parse(str); for (var i = 0; i < candidateList.length; ++i) { peerConnection.addIceCandidate(new RTCIceCandidate(candidateList[i])); }; return null;")
+	private static native void addCoreIceCandidates(JSObject peerConnection, String str);
 
-	@JSBody(params = { "peerConnection", "str" }, script = "const candidateList = JSON.parse(str); for (let i = 0; i < candidateList.length; ++i) { peerConnection.addIceCandidate(candidateList[i]); }; return null;")
-	static native void addIceCandidates(JSObject peerConnection, String str);
+	@JSBody(params = { "peerConnection", "str" }, script = "var candidateList = JSON.parse(str); for (var i = 0; i < candidateList.length; ++i) { peerConnection.addIceCandidate(new mozRTCIceCandidate(candidateList[i])); }; return null;")
+	private static native void addMozIceCandidates(JSObject peerConnection, String str);
 
-	@JSBody(params = { "peerConnection", "str" }, script = "const candidateList = JSON.parse(str); for (let i = 0; i < candidateList.length; ++i) { peerConnection.addIceCandidate(new RTCIceCandidate(candidateList[i])); }; return null;")
-	static native void addIceCandidates2(JSObject peerConnection, String str);
+	@JSBody(params = { }, script = "if(!navigator || !navigator.userAgent) return false;"
+			+ "var ua = navigator.userAgent.toLowerCase();"
+			+ "var i = ua.indexOf(\"chrome/\");"
+			+ "if(i === -1) return false;"
+			+ "i += 7;"
+			+ "var j = ua.indexOf(\".\", i);"
+			+ "if(j === -1 || j < i) j = ua.length;"
+			+ "var versStr = ua.substring(i, j);"
+			+ "versStr = parseInt(versStr);"
+			+ "return !isNaN(versStr) && versStr < 71;")
+	private static native boolean isChromeBelow71();
 
-	@JSBody(params = { "peerConnection", "str", "h1", "h2" }, script = "return peerConnection.setRemoteDescription(JSON.parse(str), h1, h2);")
-	static native void setRemoteDescription2(JSObject peerConnection, String str, EmptyHandler h1, ErrorHandler h2);
+	static void addIceCandidates(JSObject peerConnection, String str) {
+		if(!hasCheckedSupport) supported();
+		switch(supportedImpl) {
+		case WEBRTC_SUPPORT_CORE:
+		case WEBRTC_SUPPORT_WEBKIT:
+			addCoreIceCandidates(peerConnection, str);
+			break;
+		case WEBRTC_SUPPORT_MOZ:
+			addMozIceCandidates(peerConnection, str);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
+	}
 
-	@JSBody(params = { "peerConnection", "h1", "h2" }, script = "return peerConnection.createAnswer(h1, h2);")
+	@JSBody(params = { "peerConnection", "str" }, script = "try { peerConnection.setRemoteDescription(str); return true; } catch(ex) { if(ex.name === \"TypeError\") return false; else throw ex; }")
+	private static native boolean setCoreRemoteDescription(JSObject peerConnection, JSObject str);
+
+	@JSBody(params = { "peerConnection", "str" }, script = "peerConnection.setRemoteDescription(new RTCSessionDescription(str));")
+	private static native void setCoreRemoteDescriptionLegacy(JSObject peerConnection, JSObject str);
+
+	@JSBody(params = { "peerConnection", "str" }, script = "peerConnection.setRemoteDescription(new mozRTCSessionDescription(str));")
+	private static native void setMozRemoteDescriptionLegacy(JSObject peerConnection, JSObject str);
+
+	static void setRemoteDescription(JSObject peerConnection, JSObject str) {
+		if(!hasCheckedSupport) supported();
+		if(belowChrome71Fix) {
+			removeExtmapAllowMixed(str);
+		}
+		switch(supportedImpl) {
+		case WEBRTC_SUPPORT_CORE:
+			if(useSessionDescConstructor) {
+				setCoreRemoteDescriptionLegacy(peerConnection, str);
+			}else {
+				if(!setCoreRemoteDescription(peerConnection, str)) {
+					useSessionDescConstructor = true;
+					logger.info("Note: Caught suspicious exception, using legacy RTCSessionDescription method");
+					setCoreRemoteDescriptionLegacy(peerConnection, str);
+				}
+			}
+			break;
+		case WEBRTC_SUPPORT_WEBKIT:
+			setCoreRemoteDescriptionLegacy(peerConnection, str);
+			break;
+		case WEBRTC_SUPPORT_MOZ:
+			setMozRemoteDescriptionLegacy(peerConnection, str);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	@JSBody(params = { "peerConnection", "str", "h1", "h2" }, script = "try { peerConnection.setRemoteDescription(str, h1, h2); return true; } catch(ex) { if(ex.name === \"TypeError\") return false; else throw ex; }")
+	private static native boolean setCoreRemoteDescription2(JSObject peerConnection, JSObject str, EmptyHandler h1, ErrorHandler h2);
+
+	@JSBody(params = { "peerConnection", "str", "h1", "h2" }, script = "peerConnection.setRemoteDescription(new RTCSessionDescription(str), h1, h2);")
+	private static native void setCoreRemoteDescription2Legacy(JSObject peerConnection, JSObject str, EmptyHandler h1, ErrorHandler h2);
+
+	@JSBody(params = { "peerConnection", "str", "h1", "h2" }, script = "peerConnection.setRemoteDescription(new mozRTCSessionDescription(str), h1, h2);")
+	private static native void setMozRemoteDescription2Legacy(JSObject peerConnection, JSObject str, EmptyHandler h1, ErrorHandler h2);
+
+	static void setRemoteDescription2(JSObject peerConnection, JSObject str, EmptyHandler h1, ErrorHandler h2) {
+		if(!hasCheckedSupport) supported();
+		if(belowChrome71Fix) {
+			removeExtmapAllowMixed(str);
+		}
+		switch(supportedImpl) {
+		case WEBRTC_SUPPORT_CORE:
+			if(useSessionDescConstructor) {
+				setCoreRemoteDescription2Legacy(peerConnection, str, h1, h2);
+			}else {
+				if(!setCoreRemoteDescription2(peerConnection, str, h1, h2)) {
+					useSessionDescConstructor = true;
+					logger.info("Note: Caught suspicious exception, using legacy RTCSessionDescription method");
+					setCoreRemoteDescription2Legacy(peerConnection, str, h1, h2);
+				}
+			}
+			break;
+		case WEBRTC_SUPPORT_WEBKIT:
+			setCoreRemoteDescription2Legacy(peerConnection, str, h1, h2);
+			break;
+		case WEBRTC_SUPPORT_MOZ:
+			setMozRemoteDescription2Legacy(peerConnection, str, h1, h2);
+			break;
+		default:
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	@JSBody(params = { "objIn" }, script = "if(typeof objIn.sdp === \"string\""
+			+ "&& objIn.sdp.indexOf(\"a=extmap-allow-mixed\") !== -1) {"
+			+ "objIn.sdp = objIn.sdp.split(\"\\n\").filter(function(line) {"
+			+ "return line.trim() !== \"a=extmap-allow-mixed\";"
+			+ "}).join(\"\\n\");"
+			+ "}")
+	private static native void removeExtmapAllowMixed(JSObject objIn);
+
+	@JSBody(params = { "peerConnection", "h1", "h2" }, script = "peerConnection.createAnswer(h1, h2);")
 	static native void createAnswer(JSObject peerConnection, DescHandler h1, ErrorHandler h2);
 
+	@JSBody(params = { "sock", "buffer" }, script = "sock.send(buffer);")
+	static native void nativeBinarySend(WebSocket sock, ArrayBuffer buffer);
+
 	private static final Map<String, JSObject> fuckTeaVM = new HashMap<>();
 
+	public static void runScheduledTasks() {
+		
+	}
+
 	public static class LANClient {
 		public static final byte READYSTATE_INIT_FAILED = -2;
 		public static final byte READYSTATE_FAILED = -1;
@@ -130,11 +348,17 @@ public class PlatformWebRTC {
 		public void initialize() {
 			try {
 				if (dataChannel != null) {
-					closeIt(dataChannel);
+					try {
+						closeIt(dataChannel);
+					} catch (Throwable t) {
+					}
 					dataChannel = null;
 				}
 				if (peerConnection != null) {
-					closeIt(peerConnection);
+					try {
+						closeIt(peerConnection);
+					} catch (Throwable t) {
+					}
 				}
 				this.peerConnection = createRTCPeerConnection(JSONWriter.valueToString(iceServers));
 				this.readyState = READYSTATE_CONNECTING;
@@ -243,7 +467,7 @@ public class PlatformWebRTC {
 
 		public void signalRemoteDescription(String json) {
 			try {
-				setRemoteDescription(peerConnection, json);
+				setRemoteDescription(peerConnection, JSON.parse(json));
 			} catch (Throwable t) {
 				EagRuntime.debugPrintStackTrace(t);
 				readyState = READYSTATE_FAILED;
@@ -360,7 +584,7 @@ public class PlatformWebRTC {
 		public void setRemoteDescription(String descJSON) {
 			try {
 				JSONObject remoteDesc = new JSONObject(descJSON);
-				setRemoteDescription2(peerConnection, descJSON, () -> {
+				setRemoteDescription2(peerConnection, JSON.parse(descJSON), () -> {
 					if (remoteDesc.has("type") && "offer".equals(remoteDesc.getString("type"))) {
 						createAnswer(peerConnection, desc -> {
 							setLocalDescription(peerConnection, desc, () -> {
@@ -370,23 +594,24 @@ public class PlatformWebRTC {
 								}
 								if (client.peerStateDesc != PEERSTATE_SUCCESS) client.peerStateDesc = PEERSTATE_SUCCESS;
 							}, err -> {
-								logger.error("Failed to set local description for \"{}\"! {}", peerId, err.getMessage());
+								logger.error("Failed to set local description for \"{}\"! {}", peerId, TeaVMUtils.safeErrorMsgToString(err));
 								if (client.peerStateDesc == PEERSTATE_LOADING) client.peerStateDesc = PEERSTATE_FAILED;
 								client.signalRemoteDisconnect(peerId);
 							});
 						}, err -> {
-							logger.error("Failed to create answer for \"{}\"! {}", peerId, err.getMessage());
+							logger.error("Failed to create answer for \"{}\"! {}", peerId, TeaVMUtils.safeErrorMsgToString(err));
 							if (client.peerStateDesc == PEERSTATE_LOADING) client.peerStateDesc = PEERSTATE_FAILED;
 							client.signalRemoteDisconnect(peerId);
 						});
 					}
 				}, err -> {
-					logger.error("Failed to set remote description for \"{}\"! {}", peerId, err.getMessage());
+					logger.error("Failed to set remote description for \"{}\"! {}", peerId, TeaVMUtils.safeErrorMsgToString(err));
 					if (client.peerStateDesc == PEERSTATE_LOADING) client.peerStateDesc = PEERSTATE_FAILED;
 					client.signalRemoteDisconnect(peerId);
 				});
 			} catch (Throwable err) {
 				logger.error("Failed to parse remote description for \"{}\"! {}", peerId, err.getMessage());
+				logger.error(err);
 				if (client.peerStateDesc == PEERSTATE_LOADING) client.peerStateDesc = PEERSTATE_FAILED;
 				client.signalRemoteDisconnect(peerId);
 			}
@@ -394,7 +619,7 @@ public class PlatformWebRTC {
 
 		public void addICECandidate(String candidates) {
 			try {
-				addIceCandidates2(peerConnection, candidates);
+				addIceCandidates(peerConnection, candidates);
 				if (client.peerStateIce != PEERSTATE_SUCCESS) client.peerStateIce = PEERSTATE_SUCCESS;
 			} catch (Throwable err) {
 				logger.error("Failed to parse ice candidate for \"{}\"! {}", peerId, err.getMessage());
@@ -534,722 +759,27 @@ public class PlatformWebRTC {
 		void call(JSError err);
 	}
 
-	@JSBody(params = { "obj" }, script = "return typeof obj === \"string\";")
-	private static native boolean isString(JSObject obj);
-
-	private static final Map<String,Long> relayQueryLimited = new HashMap<>();
-	private static final Map<String,Long> relayQueryBlocked = new HashMap<>();
-
-	private static class RelayQueryImpl implements RelayQuery {
-
-		private final WebSocket sock;
-		private final String uri;
-
-		private boolean open;
-		private boolean failed;
-
-		private boolean hasRecievedAnyData = false;
-
-		private int vers = -1;
-		private String comment = "<no comment>";
-		private String brand = "<no brand>";
-
-		private long connectionOpenedAt;
-		private long connectionPingStart = -1;
-		private long connectionPingTimer = -1;
-
-		private RateLimit rateLimitStatus = RateLimit.NONE;
-
-		private VersionMismatch versError = VersionMismatch.UNKNOWN;
-
-		private RelayQueryImpl(String uri) {
-			this.uri = uri;
-			WebSocket s;
-			try {
-				connectionOpenedAt = System.currentTimeMillis();
-				s = WebSocket.create(uri);
-				s.setBinaryType("arraybuffer");
-				open = true;
-				failed = false;
-			}catch(Throwable t) {
-				connectionOpenedAt = 0l;
-				sock = null;
-				open = false;
-				failed = true;
-				return;
-			}
-			sock = s;
-			sock.onOpen(evt -> {
-				try {
-					connectionPingStart = System.currentTimeMillis();
-					PlatformNetworking.nativeBinarySend(sock, TeaVMUtils.unwrapArrayBuffer(
-							IPacket.writePacket(new IPacket00Handshake(0x03, RelayManager.preferredRelayVersion, ""))
-					));
-				} catch (IOException e) {
-					logger.error(e.toString());
-					sock.close();
-					failed = true;
-				}
-			});
-			sock.onMessage(evt -> {
-				if(evt.getData() != null && !isString(evt.getData())) {
-					hasRecievedAnyData = true;
-					byte[] arr = TeaVMUtils.wrapByteArrayBuffer(evt.getDataAsArray());
-					if(arr.length == 2 && arr[0] == (byte)0xFC) {
-						long millis = System.currentTimeMillis();
-						if(arr[1] == (byte)0x00 || arr[1] == (byte)0x01) {
-							rateLimitStatus = RateLimit.BLOCKED;
-							relayQueryLimited.put(RelayQueryImpl.this.uri, millis);
-						}else if(arr[1] == (byte)0x02) {
-							rateLimitStatus = RateLimit.NOW_LOCKED;
-							relayQueryLimited.put(RelayQueryImpl.this.uri, millis);
-							relayQueryBlocked.put(RelayQueryImpl.this.uri, millis);
-						}else {
-							rateLimitStatus = RateLimit.LOCKED;
-							relayQueryBlocked.put(RelayQueryImpl.this.uri, millis);
-						}
-						failed = true;
-						open = false;
-						sock.close();
-					}else {
-						if(open) {
-							try {
-								IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)));
-								if(pkt instanceof IPacket69Pong) {
-									IPacket69Pong ipkt = (IPacket69Pong)pkt;
-									versError = VersionMismatch.COMPATIBLE;
-									if(connectionPingTimer == -1) {
-										connectionPingTimer = System.currentTimeMillis() - connectionPingStart;
-									}
-									vers = ipkt.protcolVersion;
-									comment = ipkt.comment;
-									brand = ipkt.brand;
-									open = false;
-									failed = false;
-									sock.close();
-								}else if(pkt instanceof IPacket70SpecialUpdate) {
-									IPacket70SpecialUpdate ipkt = (IPacket70SpecialUpdate)pkt;
-									if(ipkt.operation == IPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
-										UpdateService.addCertificateToSet(ipkt.updatePacket);
-									}
-								}else if(pkt instanceof IPacketFFErrorCode) {
-									IPacketFFErrorCode ipkt = (IPacketFFErrorCode)pkt;
-									if(ipkt.code == IPacketFFErrorCode.TYPE_PROTOCOL_VERSION) {
-										String s1 = ipkt.desc.toLowerCase();
-										if(s1.contains("outdated client") || s1.contains("client outdated")) {
-											versError = VersionMismatch.CLIENT_OUTDATED;
-										}else if(s1.contains("outdated server") || s1.contains("server outdated") ||
-												s1.contains("outdated relay") || s1.contains("server relay")) {
-											versError = VersionMismatch.RELAY_OUTDATED;
-										}else {
-											versError = VersionMismatch.UNKNOWN;
-										}
-									}
-									logger.error("{}\": Recieved query error code {}: {}", uri, ipkt.code, ipkt.desc);
-									open = false;
-									failed = true;
-									sock.close();
-								}else {
-									throw new IOException("Unexpected packet '" + pkt.getClass().getSimpleName() + "'");
-								}
-							} catch (IOException e) {
-								logger.error("Relay Query Error: {}", e.toString());
-								EagRuntime.debugPrintStackTrace(e);
-								open = false;
-								failed = true;
-								sock.close();
-							}
-						}
-					}
-				}
-			});
-			sock.onClose(evt -> {
-				open = false;
-				if(!hasRecievedAnyData) {
-					failed = true;
-					Long l = relayQueryBlocked.get(uri);
-					if(l != null) {
-						if(System.currentTimeMillis() - l.longValue() < 400000l) {
-							rateLimitStatus = RateLimit.LOCKED;
-							return;
-						}
-					}
-					l = relayQueryLimited.get(uri);
-					if(l != null) {
-						if(System.currentTimeMillis() - l.longValue() < 900000l) {
-							rateLimitStatus = RateLimit.BLOCKED;
-							return;
-						}
-					}
-				}
-			});
-		}
-
-		@Override
-		public boolean isQueryOpen() {
-			return open;
-		}
-
-		@Override
-		public boolean isQueryFailed() {
-			return failed;
-		}
-
-		@Override
-		public RateLimit isQueryRateLimit() {
-			return rateLimitStatus;
-		}
-
-		@Override
-		public void close() {
-			if(sock != null && open) {
-				sock.close();
-			}
-			open = false;
-		}
-
-		@Override
-		public int getVersion() {
-			return vers;
-		}
-
-		@Override
-		public String getComment() {
-			return comment;
-		}
-
-		@Override
-		public String getBrand() {
-			return brand;
-		}
-
-		@Override
-		public long getPing() {
-			return connectionPingTimer < 1 ? 1 : connectionPingTimer;
-		}
-
-		@Override
-		public VersionMismatch getCompatible() {
-			return versError;
-		}
-
-	}
-
-	private static class RelayQueryRatelimitDummy implements RelayQuery {
-
-		private final RateLimit type;
-
-		private RelayQueryRatelimitDummy(RateLimit type) {
-			this.type = type;
-		}
-
-		@Override
-		public boolean isQueryOpen() {
-			return false;
-		}
-
-		@Override
-		public boolean isQueryFailed() {
-			return true;
-		}
-
-		@Override
-		public RateLimit isQueryRateLimit() {
-			return type;
-		}
-
-		@Override
-		public void close() {
-		}
-
-		@Override
-		public int getVersion() {
-			return RelayManager.preferredRelayVersion;
-		}
-
-		@Override
-		public String getComment() {
-			return "this query was rate limited";
-		}
-
-		@Override
-		public String getBrand() {
-			return "lax1dude";
-		}
-
-		@Override
-		public long getPing() {
-			return 0l;
-		}
-
-		@Override
-		public VersionMismatch getCompatible() {
-			return VersionMismatch.COMPATIBLE;
-		}
-
-	}
-
 	public static RelayQuery openRelayQuery(String addr) {
-		long millis = System.currentTimeMillis();
-
-		Long l = relayQueryBlocked.get(addr);
-		if(l != null && millis - l.longValue() < 60000l) {
-			return new RelayQueryRatelimitDummy(RelayQuery.RateLimit.LOCKED);
+		RelayQuery.RateLimit limit = RelayServerRateLimitTracker.isLimited(addr);
+		if(limit == RelayQuery.RateLimit.LOCKED || limit == RelayQuery.RateLimit.BLOCKED) {
+			return new RelayQueryRateLimitDummy(limit);
 		}
-
-		l = relayQueryLimited.get(addr);
-		if(l != null && millis - l.longValue() < 10000l) {
-			return new RelayQueryRatelimitDummy(RelayQuery.RateLimit.BLOCKED);
-		}
-
 		return new RelayQueryImpl(addr);
 	}
 
-	private static class RelayWorldsQueryImpl implements RelayWorldsQuery {
-
-		private final WebSocket sock;
-		private final String uri;
-
-		private boolean open;
-		private boolean failed;
-
-		private boolean hasRecievedAnyData = false;
-		private RelayQuery.RateLimit rateLimitStatus = RelayQuery.RateLimit.NONE;
-
-		private RelayQuery.VersionMismatch versError = RelayQuery.VersionMismatch.UNKNOWN;
-
-		private List<IPacket07LocalWorlds.LocalWorld> worlds = null;
-
-		private RelayWorldsQueryImpl(String uri) {
-			this.uri = uri;
-			WebSocket s;
-			try {
-				s = WebSocket.create(uri);
-				s.setBinaryType("arraybuffer");
-				open = true;
-				failed = false;
-			}catch(Throwable t) {
-				sock = null;
-				open = false;
-				failed = true;
-				return;
-			}
-			sock = s;
-			sock.onOpen(evt -> {
-				try {
-					PlatformNetworking.nativeBinarySend(sock, TeaVMUtils.unwrapArrayBuffer(
-							IPacket.writePacket(new IPacket00Handshake(0x04, RelayManager.preferredRelayVersion, ""))
-					));
-				} catch (IOException e) {
-					logger.error(e.toString());
-					sock.close();
-					open = false;
-					failed = true;
-				}
-			});
-			sock.onMessage(evt -> {
-				if(evt.getData() != null && !isString(evt.getData())) {
-					hasRecievedAnyData = true;
-					byte[] arr = TeaVMUtils.wrapByteArrayBuffer(evt.getDataAsArray());
-					if(arr.length == 2 && arr[0] == (byte)0xFC) {
-						long millis = System.currentTimeMillis();
-						if(arr[1] == (byte)0x00 || arr[1] == (byte)0x01) {
-							rateLimitStatus = RelayQuery.RateLimit.BLOCKED;
-							relayQueryLimited.put(RelayWorldsQueryImpl.this.uri, millis);
-						}else if(arr[1] == (byte)0x02) {
-							rateLimitStatus = RelayQuery.RateLimit.NOW_LOCKED;
-							relayQueryLimited.put(RelayWorldsQueryImpl.this.uri, millis);
-							relayQueryBlocked.put(RelayWorldsQueryImpl.this.uri, millis);
-						}else {
-							rateLimitStatus = RelayQuery.RateLimit.LOCKED;
-							relayQueryBlocked.put(RelayWorldsQueryImpl.this.uri, millis);
-						}
-						open = false;
-						failed = true;
-						sock.close();
-					}else {
-						if(open) {
-							try {
-								IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)));
-								if(pkt instanceof IPacket07LocalWorlds) {
-									worlds = ((IPacket07LocalWorlds)pkt).worldsList;
-									sock.close();
-									open = false;
-									failed = false;
-								}else if(pkt instanceof IPacket70SpecialUpdate) {
-									IPacket70SpecialUpdate ipkt = (IPacket70SpecialUpdate)pkt;
-									if(ipkt.operation == IPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
-										UpdateService.addCertificateToSet(ipkt.updatePacket);
-									}
-								}else if(pkt instanceof IPacketFFErrorCode) {
-									IPacketFFErrorCode ipkt = (IPacketFFErrorCode)pkt;
-									if(ipkt.code == IPacketFFErrorCode.TYPE_PROTOCOL_VERSION) {
-										String s1 = ipkt.desc.toLowerCase();
-										if(s1.contains("outdated client") || s1.contains("client outdated")) {
-											versError = RelayQuery.VersionMismatch.CLIENT_OUTDATED;
-										}else if(s1.contains("outdated server") || s1.contains("server outdated") ||
-												s1.contains("outdated relay") || s1.contains("server relay")) {
-											versError = RelayQuery.VersionMismatch.RELAY_OUTDATED;
-										}else {
-											versError = RelayQuery.VersionMismatch.UNKNOWN;
-										}
-									}
-									logger.error("{}: Recieved query error code {}: {}", uri, ipkt.code, ipkt.desc);
-									open = false;
-									failed = true;
-									sock.close();
-								}else {
-									throw new IOException("Unexpected packet '" + pkt.getClass().getSimpleName() + "'");
-								}
-							} catch (IOException e) {
-								logger.error("Relay World Query Error: {}", e.toString());
-								EagRuntime.debugPrintStackTrace(e);
-								open = false;
-								failed = true;
-								sock.close();
-							}
-						}
-					}
-				}
-			});
-			sock.onClose(evt -> {
-				open = false;
-				if(!hasRecievedAnyData) {
-					failed = true;
-					Long l = relayQueryBlocked.get(uri);
-					if(l != null) {
-						if(System.currentTimeMillis() - l.longValue() < 400000l) {
-							rateLimitStatus = RelayQuery.RateLimit.LOCKED;
-							return;
-						}
-					}
-					l = relayQueryLimited.get(uri);
-					if(l != null) {
-						if(System.currentTimeMillis() - l.longValue() < 900000l) {
-							rateLimitStatus = RelayQuery.RateLimit.BLOCKED;
-							return;
-						}
-					}
-				}
-			});
-		}
-
-		@Override
-		public boolean isQueryOpen() {
-			return open;
-		}
-
-		@Override
-		public boolean isQueryFailed() {
-			return failed;
-		}
-
-		@Override
-		public RelayQuery.RateLimit isQueryRateLimit() {
-			return rateLimitStatus;
-		}
-
-		@Override
-		public void close() {
-			if(open && sock != null) {
-				sock.close();
-			}
-			open = false;
-		}
-
-		@Override
-		public List<IPacket07LocalWorlds.LocalWorld> getWorlds() {
-			return worlds;
-		}
-
-		@Override
-		public RelayQuery.VersionMismatch getCompatible() {
-			return versError;
-		}
-
-	}
-
-	private static class RelayWorldsQueryRatelimitDummy implements RelayWorldsQuery {
-
-		private final RelayQuery.RateLimit rateLimit;
-
-		private RelayWorldsQueryRatelimitDummy(RelayQuery.RateLimit rateLimit) {
-			this.rateLimit = rateLimit;
-		}
-
-		@Override
-		public boolean isQueryOpen() {
-			return false;
-		}
-
-		@Override
-		public boolean isQueryFailed() {
-			return true;
-		}
-
-		@Override
-		public RelayQuery.RateLimit isQueryRateLimit() {
-			return rateLimit;
-		}
-
-		@Override
-		public void close() {
-		}
-
-		@Override
-		public List<IPacket07LocalWorlds.LocalWorld> getWorlds() {
-			return new ArrayList(0);
-		}
-
-		@Override
-		public RelayQuery.VersionMismatch getCompatible() {
-			return RelayQuery.VersionMismatch.COMPATIBLE;
-		}
-	}
-
 	public static RelayWorldsQuery openRelayWorldsQuery(String addr) {
-		long millis = System.currentTimeMillis();
-
-		Long l = relayQueryBlocked.get(addr);
-		if(l != null && millis - l.longValue() < 60000l) {
-			return new RelayWorldsQueryRatelimitDummy(RelayQuery.RateLimit.LOCKED);
+		RelayQuery.RateLimit limit = RelayServerRateLimitTracker.isLimited(addr);
+		if(limit == RelayQuery.RateLimit.LOCKED || limit == RelayQuery.RateLimit.BLOCKED) {
+			return new RelayWorldsQueryRateLimitDummy(limit);
 		}
-
-		l = relayQueryLimited.get(addr);
-		if(l != null && millis - l.longValue() < 10000l) {
-			return new RelayWorldsQueryRatelimitDummy(RelayQuery.RateLimit.BLOCKED);
-		}
-
 		return new RelayWorldsQueryImpl(addr);
 	}
 
-	private static class RelayServerSocketImpl implements RelayServerSocket {
-
-		private final WebSocket sock;
-		private final String uri;
-
-		private boolean open;
-		private boolean closed;
-		private boolean failed;
-
-		private boolean hasRecievedAnyData;
-
-		private final List<Throwable> exceptions = new LinkedList();
-		private final List<IPacket> packets = new LinkedList();
-
-		private RelayServerSocketImpl(String uri, int timeout) {
-			this.uri = uri;
-			WebSocket s;
-			try {
-				s = WebSocket.create(uri);
-				s.setBinaryType("arraybuffer");
-				open = false;
-				closed = false;
-				failed = false;
-			}catch(Throwable t) {
-				exceptions.add(t);
-				sock = null;
-				open = false;
-				closed = true;
-				failed = true;
-				return;
-			}
-			sock = s;
-			sock.onOpen(evt -> open = true);
-			sock.onMessage(evt -> {
-				if(evt.getData() != null && !isString(evt.getData())) {
-					hasRecievedAnyData = true;
-					try {
-						IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(TeaVMUtils.wrapByteArrayBuffer(evt.getDataAsArray()))));
-						if(pkt instanceof IPacket70SpecialUpdate) {
-							IPacket70SpecialUpdate ipkt = (IPacket70SpecialUpdate)pkt;
-							if(ipkt.operation == IPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
-								UpdateService.addCertificateToSet(ipkt.updatePacket);
-							}
-						}else {
-							packets.add(pkt);
-						}
-					} catch (IOException e) {
-						exceptions.add(e);
-						logger.error("Relay Socket Error: {}", e.toString());
-						EagRuntime.debugPrintStackTrace(e);
-						open = false;
-						failed = true;
-						closed = true;
-						sock.close();
-					}
-				}
-			});
-			sock.onClose(evt -> {
-				if (!hasRecievedAnyData) {
-					failed = true;
-				}
-				open = false;
-				closed = true;
-			});
-			Window.setTimeout(() -> {
-				if(!open && !closed) {
-					closed = true;
-					sock.close();
-				}
-			}, timeout);
-		}
-
-		@Override
-		public boolean isOpen() {
-			return open;
-		}
-
-		@Override
-		public boolean isClosed() {
-			return closed;
-		}
-
-		@Override
-		public void close() {
-			if(open && sock != null) {
-				sock.close();
-			}
-			open = false;
-			closed = true;
-		}
-
-		@Override
-		public boolean isFailed() {
-			return failed;
-		}
-
-		@Override
-		public Throwable getException() {
-			if(!exceptions.isEmpty()) {
-				return exceptions.remove(0);
-			}else {
-				return null;
-			}
-		}
-
-		@Override
-		public void writePacket(IPacket pkt) {
-			try {
-				PlatformNetworking.nativeBinarySend(sock, TeaVMUtils.unwrapArrayBuffer(IPacket.writePacket(pkt)));
-			} catch (Throwable e) {
-				logger.error("Relay connection error: {}", e.toString());
-				EagRuntime.debugPrintStackTrace(e);
-				exceptions.add(e);
-				failed = true;
-				open = false;
-				closed = true;
-				sock.close();
-			}
-		}
-
-		@Override
-		public IPacket readPacket() {
-			if(!packets.isEmpty()) {
-				return packets.remove(0);
-			}else {
-				return null;
-			}
-		}
-
-		@Override
-		public IPacket nextPacket() {
-			if(!packets.isEmpty()) {
-				return packets.get(0);
-			}else {
-				return null;
-			}
-		}
-
-		@Override
-		public RelayQuery.RateLimit getRatelimitHistory() {
-			if(relayQueryBlocked.containsKey(uri)) {
-				return RelayQuery.RateLimit.LOCKED;
-			}
-			if(relayQueryLimited.containsKey(uri)) {
-				return RelayQuery.RateLimit.BLOCKED;
-			}
-			return RelayQuery.RateLimit.NONE;
-		}
-
-		@Override
-		public String getURI() {
-			return uri;
-		}
-
-	}
-
-	private static class RelayServerSocketRatelimitDummy implements RelayServerSocket {
-
-		private final RelayQuery.RateLimit limit;
-
-		private RelayServerSocketRatelimitDummy(RelayQuery.RateLimit limit) {
-			this.limit = limit;
-		}
-
-		@Override
-		public boolean isOpen() {
-			return false;
-		}
-
-		@Override
-		public boolean isClosed() {
-			return true;
-		}
-
-		@Override
-		public void close() {
-		}
-
-		@Override
-		public boolean isFailed() {
-			return true;
-		}
-
-		@Override
-		public Throwable getException() {
-			return null;
-		}
-
-		@Override
-		public void writePacket(IPacket pkt) {
-		}
-
-		@Override
-		public IPacket readPacket() {
-			return null;
-		}
-
-		@Override
-		public IPacket nextPacket() {
-			return null;
-		}
-
-		@Override
-		public RelayQuery.RateLimit getRatelimitHistory() {
-			return limit;
-		}
-
-		@Override
-		public String getURI() {
-			return "<disconnected>";
-		}
-
-	}
-
 	public static RelayServerSocket openRelayConnection(String addr, int timeout) {
-		long millis = System.currentTimeMillis();
-
-		Long l = relayQueryBlocked.get(addr);
-		if(l != null && millis - l.longValue() < 60000l) {
-			return new RelayServerSocketRatelimitDummy(RelayQuery.RateLimit.LOCKED);
+		RelayQuery.RateLimit limit = RelayServerRateLimitTracker.isLimited(addr);
+		if(limit == RelayQuery.RateLimit.LOCKED || limit == RelayQuery.RateLimit.BLOCKED) {
+			return new RelayServerSocketRateLimitDummy(limit);
 		}
-
-		l = relayQueryLimited.get(addr);
-		if(l != null && millis - l.longValue() < 10000l) {
-			return new RelayServerSocketRatelimitDummy(RelayQuery.RateLimit.BLOCKED);
-		}
-
 		return new RelayServerSocketImpl(addr, timeout);
 	}
 
@@ -1290,7 +820,7 @@ public class PlatformWebRTC {
 	public static List<byte[]> clientLANReadAllPacket() {
 		synchronized(clientLANPacketBuffer) {
 			if(!clientLANPacketBuffer.isEmpty()) {
-				List<byte[]> ret = new ArrayList(clientLANPacketBuffer);
+				List<byte[]> ret = new ArrayList<>(clientLANPacketBuffer);
 				clientLANPacketBuffer.clear();
 				return ret;
 			}else {
@@ -1429,4 +959,5 @@ public class PlatformWebRTC {
 		}
 		return rtcLANServer.countPeers();
 	}
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebView.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebView.java
new file mode 100755
index 0000000..e0400ae
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebView.java
@@ -0,0 +1,639 @@
+package net.lax1dude.eaglercraft.v1_8.internal;
+
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import org.teavm.jso.JSBody;
+import org.teavm.jso.JSObject;
+import org.teavm.jso.JSProperty;
+import org.teavm.jso.browser.Window;
+import org.teavm.jso.dom.css.CSSStyleDeclaration;
+import org.teavm.jso.dom.events.Event;
+import org.teavm.jso.dom.events.EventListener;
+import org.teavm.jso.dom.events.MessageEvent;
+import org.teavm.jso.dom.html.HTMLElement;
+import org.teavm.jso.dom.html.HTMLInputElement;
+import org.teavm.jso.typedarrays.ArrayBuffer;
+
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.AdvancedHTMLIFrameElement;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.IFrameSafetyException;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketWebViewMessageEnV4EAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketWebViewMessageV4EAG;
+import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketWebViewMessageV4EAG;
+import net.lax1dude.eaglercraft.v1_8.webview.PermissionsCache;
+import net.lax1dude.eaglercraft.v1_8.webview.WebViewOverlayController.IPacketSendCallback;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PlatformWebView {
+
+	private static final Logger logger = LogManager.getLogger("PlatformWebView");
+
+	private static boolean supportKnown = false;
+	private static boolean supportForce = false;
+	private static boolean enableCSP = true;
+	private static boolean supported = false;
+	private static boolean cspSupport = false;
+
+	private static HTMLElement currentIFrameContainer = null;
+	private static HTMLElement currentAllowJavaScript = null;
+
+	private static AdvancedHTMLIFrameElement currentIFrame = null;
+	private static WebViewOptions currentOptions = null;
+
+	private static int webviewResetSerial = 0;
+
+	private static String currentMessageChannelName = null;
+
+	private static Window win;
+	private static HTMLElement rootElement;
+
+	private static Consumer<MessageEvent> currentMessageHandler = null;
+
+	private static final List<Runnable> messageQueue = new LinkedList<>();
+
+	private static IPacketSendCallback packetSendCallback = null;
+
+	static void initRoot(Window win, HTMLElement rootElement) {
+		PlatformWebView.win = win;
+		PlatformWebView.rootElement = rootElement;
+	}
+
+	public static boolean supported() {
+		if(!supportKnown) {
+			IClientConfigAdapter cfg = PlatformRuntime.getClientConfigAdapter();
+			supportForce = cfg.isForceWebViewSupport();
+			enableCSP = cfg.isEnableWebViewCSP();
+			if(supportForce) {
+				supported = true;
+				cspSupport = true;
+			}else {
+				supported = false;
+				cspSupport = false;
+				try {
+					AdvancedHTMLIFrameElement tmp = (AdvancedHTMLIFrameElement)win.getDocument().createElement("iframe");
+					supported = tmp != null && tmp.checkSafetyFeaturesSupported();
+					cspSupport = enableCSP && supported && tmp.checkCSPSupported();
+				}catch(Throwable ex) {
+					logger.error("Error checking iframe support");
+					logger.error(ex);
+				}
+			}
+			if(!supported) {
+				logger.error("This browser does not meet the safety requirements for webview support, this feature will be disabled");
+			}else if(!cspSupport && enableCSP) {
+				logger.warn("This browser does not support CSP attribute on iframes! (try Chrome)");
+			}
+			supportKnown = true;
+		}
+		return supported;
+	}
+
+	public static boolean isShowing() {
+		return currentIFrameContainer != null;
+	}
+
+	private static int hashPermissionFlags(WebViewOptions opts) {
+		int i = (opts.scriptEnabled ? 1 : 0);
+		i |= ((enableCSP && cspSupport && opts.strictCSPEnable) ? 0 : 2);
+		i |= (opts.serverMessageAPIEnabled ? 4 : 0);
+		return i;
+	}
+
+	public static void beginShowing(WebViewOptions options, int x, int y, int w, int h) {
+		if(!supported()) {
+			return;
+		}
+		setupShowing(x, y, w, h);
+		if(options.scriptEnabled) {
+			PermissionsCache.Permission perm = PermissionsCache.getJavaScriptAllowed(options.permissionsOriginUUID, hashPermissionFlags(options));
+			if(perm == null) {
+				beginShowingEnableJavaScript(options);
+			}else if(perm.choice) {
+				beginShowingDirect(options);
+			}else {
+				beginShowingContentBlocked(options);
+			}
+		}else {
+			beginShowingDirect(options);
+		}
+	}
+
+	private static void setupShowing(int x, int y, int w, int h) {
+		if(currentIFrameContainer != null) {
+			endShowing();
+		}
+		currentIFrameContainer = win.getDocument().createElement("div");
+		currentIFrameContainer.getClassList().add("_eaglercraftX_webview_container_element");
+		CSSStyleDeclaration decl = currentIFrameContainer.getStyle();
+		decl.setProperty("border", "5px solid #333333");
+		decl.setProperty("z-index", "11");
+		decl.setProperty("position", "absolute");
+		decl.setProperty("background-color", "#DDDDDD");
+		decl.setProperty("font-family", "sans-serif");
+		resize(x, y, w, h);
+		rootElement.appendChild(currentIFrameContainer);
+	}
+
+	private static void beginShowingDirect(WebViewOptions options) {
+		if(!supportForce) {
+			try {
+				currentOptions = options;
+				currentIFrame = (AdvancedHTMLIFrameElement)win.getDocument().createElement("iframe");
+				currentIFrame.setAllowSafe("");
+				currentIFrame.setReferrerPolicy("strict-origin");
+				Set<String> sandboxArgs = new HashSet<>();
+				sandboxArgs.add("allow-downloads");
+				if(options.scriptEnabled) {
+					sandboxArgs.add("allow-scripts");
+					sandboxArgs.add("allow-pointer-lock");
+				}
+				currentIFrame.setSandboxSafe(sandboxArgs);
+			}catch(IFrameSafetyException ex) {
+				logger.error("Caught safety exception while opening webview!");
+				logger.error(ex);
+				if(currentIFrame != null) {
+					currentIFrame.delete();
+					currentIFrame = null;
+					currentOptions = null;
+				}
+				logger.error("Things you can try:");
+				logger.error("1. Set window.eaglercraftXOpts.forceWebViewSupport to true");
+				logger.error("2. Set window.eaglercraftXOpts.enableWebViewCSP to false");
+				logger.error("(these settings may compromise security)");
+				beginShowingSafetyError();
+				return;
+			}
+		}else {
+			currentOptions = options;
+			currentIFrame = (AdvancedHTMLIFrameElement)win.getDocument().createElement("iframe");
+			try {
+				currentIFrame.setAllow("");
+			}catch(Throwable t) {
+			}
+			try {
+				currentIFrame.setReferrerPolicy("strict-origin");
+			}catch(Throwable t) {
+			}
+			try {
+				List<String> sandboxArgs = new ArrayList<>();
+				sandboxArgs.add("allow-downloads");
+				sandboxArgs.add("allow-same-origin");
+				if(options.scriptEnabled) {
+					sandboxArgs.add("allow-scripts");
+					sandboxArgs.add("allow-pointer-lock");
+				}
+				currentIFrame.setSandbox(String.join(" ", sandboxArgs));
+			}catch(Throwable t) {
+			}
+		}
+		currentIFrame.setCredentialless(true);
+		currentIFrame.setLoading("lazy");
+		boolean cspWarn = false;
+		if(options.contentMode == EnumWebViewContentMode.BLOB_BASED) {
+			if(enableCSP && cspSupport) {
+				if(currentIFrame.checkCSPSupported()) {
+					StringBuilder csp = new StringBuilder();
+					csp.append("default-src 'none';");
+					String protos = options.strictCSPEnable ? "" : (PlatformRuntime.requireSSL() ? " https:" : " http: https:");
+					if(options.scriptEnabled) {
+						csp.append(" script-src 'unsafe-eval' 'unsafe-inline' data: blob:").append(protos).append(';');
+						csp.append(" style-src 'unsafe-eval' 'unsafe-inline' data: blob:").append(protos).append(';');
+						csp.append(" img-src data: blob:").append(protos).append(';');
+						csp.append(" font-src data: blob:").append(protos).append(';');
+						csp.append(" child-src data: blob:").append(protos).append(';');
+						csp.append(" frame-src data: blob:;");
+						csp.append(" media-src data: mediastream: blob:").append(protos).append(';');
+						csp.append(" connect-src data: blob:").append(protos).append(';');
+						csp.append(" worker-src data: blob:").append(protos).append(';');
+					}else {
+						csp.append(" style-src data: 'unsafe-inline'").append(protos).append(';');
+						csp.append(" img-src data:").append(protos).append(';');
+						csp.append(" font-src data:").append(protos).append(';');
+						csp.append(" media-src data:").append(protos).append(';');
+					}
+					currentIFrame.setCSP(csp.toString());
+				}else {
+					logger.warn("This browser does not support CSP attribute on iframes! (try Chrome)");
+					cspWarn = true;
+				}
+			}else {
+				cspWarn = true;
+			}
+			if(cspWarn && options.strictCSPEnable) {
+				logger.warn("Strict CSP was requested for this webview, but that feature is not available!");
+			}
+		}else {
+			cspWarn = true;
+		}
+		CSSStyleDeclaration decl = currentIFrame.getStyle();
+		decl.setProperty("border", "none");
+		decl.setProperty("background-color", "white");
+		decl.setProperty("width", "100%");
+		decl.setProperty("height", "100%");
+		currentIFrame.getClassList().add("_eaglercraftX_webview_iframe_element");
+		currentIFrameContainer.appendChild(currentIFrame);
+		if(options.contentMode == EnumWebViewContentMode.BLOB_BASED) {
+			currentIFrame.setSourceDocument(new String(options.blob, StandardCharsets.UTF_8));
+		}else {
+			currentIFrame.setSourceAddress(options.url.toString());
+		}
+		final int resetSer = webviewResetSerial;
+		final AdvancedHTMLIFrameElement curIFrame = currentIFrame;
+		final boolean[] focusTracker = new boolean[1];
+		currentIFrame.addEventListener("mouseover", new EventListener<Event>() {
+			@Override
+			public void handleEvent(Event evt) {
+				if(resetSer == webviewResetSerial && curIFrame == currentIFrame) {
+					if(!focusTracker[0]) {
+						focusTracker[0] = true;
+						currentIFrame.getContentWindow().focus();
+					}
+				}
+			}
+		});
+		currentIFrame.addEventListener("mouseout", new EventListener<Event>() {
+			@Override
+			public void handleEvent(Event evt) {
+				if(resetSer == webviewResetSerial && curIFrame == currentIFrame) {
+					if(focusTracker[0]) {
+						focusTracker[0] = false;
+						win.focus();
+					}
+				}
+			}
+		});
+		if(options.scriptEnabled && options.serverMessageAPIEnabled) {
+			currentMessageHandler = new Consumer<MessageEvent>() {
+				@Override
+				public void accept(MessageEvent evt) {
+					synchronized(messageQueue) {
+						if(resetSer == webviewResetSerial && curIFrame == currentIFrame) {
+							messageQueue.add(() -> {
+								if(resetSer == webviewResetSerial && curIFrame == currentIFrame) {
+									handleMessageRawFromFrame(evt.getData());
+								}else {
+									logger.warn("Recieved message from on dead IFrame handler: (#" + resetSer + ") " + curIFrame.getSourceAddress());
+								}
+							});
+						}else {
+							logger.warn("Recieved message from on dead IFrame handler: (#" + resetSer + ") " + curIFrame.getSourceAddress());
+						}
+					}
+				}
+			};
+		}
+		logger.info("WebView is loading: \"{}\"", options.contentMode == EnumWebViewContentMode.BLOB_BASED ? "about:srcdoc" : currentIFrame.getSourceAddress());
+		logger.info("JavaScript: {}, Strict CSP: {}, Message API: {}", options.scriptEnabled,
+				options.strictCSPEnable && !cspWarn, options.serverMessageAPIEnabled);
+	}
+
+	private static void beginShowingEnableJSSetup() {
+		if(currentAllowJavaScript != null) {
+			++webviewResetSerial;
+			currentAllowJavaScript.delete();
+			currentAllowJavaScript = null;
+		}
+		currentAllowJavaScript = win.getDocument().createElement("div");
+		CSSStyleDeclaration decl = currentAllowJavaScript.getStyle();
+		decl.setProperty("background-color", "white");
+		decl.setProperty("width", "100%");
+		decl.setProperty("height", "100%");
+		currentAllowJavaScript.getClassList().add("_eaglercraftX_webview_permission_screen");
+		currentIFrameContainer.appendChild(currentAllowJavaScript);
+	}
+
+	private static void beginShowingEnableJavaScript(final WebViewOptions options) {
+		beginShowingEnableJSSetup();
+		String strictCSPMarkup;
+		if(options.contentMode != EnumWebViewContentMode.BLOB_BASED) {
+			strictCSPMarkup = "<span style=\"color:red;\">Impossible</span>";
+		}else if(!cspSupport || !enableCSP) {
+			strictCSPMarkup = "<span style=\"color:red;\">Unsupported</span>";
+		}else if(options.strictCSPEnable) {
+			strictCSPMarkup = "<span style=\"color:green;\">Enabled</span>";
+		}else {
+			strictCSPMarkup = "<span style=\"color:red;\">Disabled</span>";
+		}
+		String messageAPIMarkup;
+		if(options.serverMessageAPIEnabled) {
+			messageAPIMarkup = "<span style=\"color:red;\">Enabled</span>";
+		}else {
+			messageAPIMarkup = "<span style=\"color:green;\">Disabled</span>";
+		}
+		currentAllowJavaScript.setInnerHTML(
+				"<div style=\"padding-top:13vh;\"><div style=\"margin:auto;max-width:450px;border:6px double black;text-align:center;padding:20px;\">"
+				+ "<h2><img width=\"32\" height=\"32\" style=\"vertical-align:middle;\" src=\"" + PlatformApplication.faviconURLTeaVM() + "\">&emsp;Allow JavaScript</h2>"
+				+ "<p style=\"font-family:monospace;text-decoration:underline;word-wrap:break-word;\" class=\"_eaglercraftX_permission_target_url\"></p>"
+				+ "<h4 style=\"line-height:1.4em;\">Strict CSP: " + strictCSPMarkup + "&ensp;|&ensp;"
+				+ "Message API: " + messageAPIMarkup + "</h4>"
+				+ "<p><input class=\"_eaglercraftX_remember_javascript\" type=\"checkbox\" checked> Remember my choice</p>"
+				+ "<p><button style=\"font-size:1.5em;\" class=\"_eaglercraftX_allow_javascript\">Allow</button>&emsp;"
+				+ "<button style=\"font-size:1.5em;\" class=\"_eaglercraftX_block_javascript\">Block</button></p></div></div>");
+		final int serial = webviewResetSerial;
+		if(options.contentMode != EnumWebViewContentMode.BLOB_BASED) {
+			String urlStr = options.url.toString();
+			currentAllowJavaScript.querySelector("._eaglercraftX_permission_target_url").setInnerText(urlStr.length() > 255 ? (urlStr.substring(0, 253) + "...") : urlStr);
+		}
+		currentAllowJavaScript.querySelector("._eaglercraftX_allow_javascript").addEventListener("click", new EventListener<Event>() {
+			@Override
+			public void handleEvent(Event evt) {
+				if(webviewResetSerial == serial && currentAllowJavaScript != null) {
+					HTMLInputElement chkbox = (HTMLInputElement)currentAllowJavaScript.querySelector("._eaglercraftX_remember_javascript");
+					if(chkbox != null && chkbox.isChecked()) {
+						PermissionsCache.setJavaScriptAllowed(options.permissionsOriginUUID, hashPermissionFlags(options), true);
+					}
+					currentAllowJavaScript.delete();
+					currentAllowJavaScript = null;
+					++webviewResetSerial;
+					beginShowingDirect(options);
+				}
+			}
+		});
+		currentAllowJavaScript.querySelector("._eaglercraftX_block_javascript").addEventListener("click", new EventListener<Event>() {
+			@Override
+			public void handleEvent(Event evt) {
+				if(webviewResetSerial == serial && currentAllowJavaScript != null) {
+					HTMLInputElement chkbox = (HTMLInputElement)currentAllowJavaScript.querySelector("._eaglercraftX_remember_javascript");
+					if(chkbox != null && chkbox.isChecked()) {
+						PermissionsCache.setJavaScriptAllowed(options.permissionsOriginUUID, hashPermissionFlags(options), false);
+					}
+					beginShowingContentBlocked(options);
+				}
+			}
+		});
+	}
+
+	private static void beginShowingContentBlocked(final WebViewOptions options) {
+		beginShowingEnableJSSetup();
+		currentAllowJavaScript.setInnerHTML(
+				"<div style=\"padding-top:13vh;\"><h1 style=\"text-align:center;\">"
+				+ "<img width=\"48\" height=\"48\" style=\"vertical-align:middle;\" src=\"" + PlatformApplication.faviconURLTeaVM() + "\">&emsp;Content Blocked</h1>"
+				+ "<h4 style=\"text-align:center;\">You chose to block JavaScript execution for this embed</h4>"
+				+ "<p style=\"text-align:center;\"><button style=\"font-size:1.0em;\" class=\"_eaglercraftX_re_evaluate_javascript\">Re-evaluate</button></p></div>");
+		final int serial = webviewResetSerial;
+		currentAllowJavaScript.querySelector("._eaglercraftX_re_evaluate_javascript").addEventListener("click", new EventListener<Event>() {
+			@Override
+			public void handleEvent(Event evt) {
+				if(webviewResetSerial == serial && currentAllowJavaScript != null) {
+					PermissionsCache.clearJavaScriptAllowed(options.permissionsOriginUUID);
+					beginShowingEnableJavaScript(options);
+				}
+			}
+		});
+	}
+
+	private static void beginShowingSafetyError() {
+		beginShowingEnableJSSetup();
+		currentAllowJavaScript.setInnerHTML(
+				"<div style=\"padding-top:13vh;\"><h1 style=\"text-align:center;\">"
+				+ "<img width=\"48\" height=\"48\" style=\"vertical-align:middle;\" src=\"" + PlatformApplication.faviconURLTeaVM() + "\">&emsp;IFrame Safety Error</h1>"
+				+ "<h4 style=\"text-align:center;\">The content cannot be displayed safely!</h4>"
+				+ "<h4 style=\"text-align:center;\">Check console for more details</h4></div>");
+	}
+
+	private static String getURLOrigin(URI urlObject) {
+		String str = " " + urlObject.getScheme() + "://" + urlObject.getRawAuthority();
+		if(str.startsWith(" http:")) {
+			str = str + " https" + str.substring(5);
+		}
+		return str;
+	}
+
+	public static void resize(int x, int y, int w, int h) {
+		if(currentIFrameContainer != null) {
+			CSSStyleDeclaration decl = currentIFrameContainer.getStyle();
+			float s = PlatformInput.getDPI();
+			decl.setProperty("top", "" + (y / s) + "px");
+			decl.setProperty("left", "" + (x / s) + "px");
+			decl.setProperty("width", "" + ((w / s) - 10) + "px");
+			decl.setProperty("height", "" + ((h / s) - 10) + "px");
+		}
+	}
+
+	public static void endShowing() {
+		++webviewResetSerial;
+		if(currentIFrame != null) {
+			currentIFrame.delete();
+			currentIFrame = null;
+		}
+		synchronized(messageQueue) {
+			messageQueue.clear();
+		}
+		currentMessageHandler = null;
+		if(currentAllowJavaScript != null) {
+			currentAllowJavaScript.delete();
+			currentAllowJavaScript = null;
+		}
+		currentIFrameContainer.delete();
+		currentIFrameContainer = null;
+		if(currentMessageChannelName != null) {
+			sendMessageEnToServer(false, currentMessageChannelName);
+			currentMessageChannelName = null;
+		}
+		win.focus();
+		currentOptions = null;
+	}
+
+	public static boolean fallbackSupported() {
+		return false;
+	}
+
+	public static void launchFallback(WebViewOptions options) {
+		
+	}
+
+	public static boolean fallbackRunning() {
+		return false;
+	}
+
+	public static String getFallbackURL() {
+		return null;
+	}
+
+	public static void endFallbackServer() {
+		
+	}
+
+	@JSBody(params = { "evt", "iframe" }, script = "return evt.source === iframe.contentWindow;")
+	private static native boolean sourceEquals(MessageEvent evt, AdvancedHTMLIFrameElement iframe);
+
+	static void onWindowMessageRecieved(MessageEvent evt) {
+		if(currentIFrame != null && currentMessageHandler != null && sourceEquals(evt, currentIFrame)) {
+			currentMessageHandler.accept(evt);
+		}
+	}
+
+	public static void setPacketSendCallback(IPacketSendCallback callback) {
+		packetSendCallback = callback;
+	}
+
+	public static void runTick() {
+		if(currentIFrame == null) {
+			return;
+		}
+		List<Runnable> lst = null;
+		synchronized(messageQueue) {
+			if(messageQueue.isEmpty()) {
+				return;
+			}
+			lst = new ArrayList<>(messageQueue);
+			messageQueue.clear();
+		}
+		for(int i = 0, l = lst.size(); i < l; ++i) {
+			try {
+				lst.get(i).run();
+			}catch(Throwable t) {
+				logger.error("Caught exception processing webview message!");
+				logger.error(t);
+			}
+		}
+	}
+
+	@JSBody(params = { "channel", "contents" }, script = "return {ver:1,channel:channel,type:\"string\",data:contents};")
+	private static native JSObject createStringMessage(String channel, String contents);
+
+	@JSBody(params = { "channel", "contents" }, script = "return {ver:1,channel:channel,type:\"binary\",data:contents};")
+	private static native JSObject createBinaryMessage(String channel, ArrayBuffer contents);
+
+	public static void handleMessageFromServer(SPacketWebViewMessageV4EAG packet) {
+		Window w;
+		if(currentMessageChannelName != null && currentIFrame != null && (w = currentIFrame.getContentWindow()) != null) {
+			JSObject obj = null;
+			if(packet.type == SPacketWebViewMessageV4EAG.TYPE_STRING) {
+				obj = createStringMessage(currentMessageChannelName, new String(packet.data, StandardCharsets.UTF_8));
+			}else if(packet.type == SPacketWebViewMessageV4EAG.TYPE_BINARY) {
+				obj = createBinaryMessage(currentMessageChannelName, TeaVMUtils.unwrapArrayBuffer(packet.data));
+			}
+			if(obj != null) {
+				w.postMessage(obj, "*");
+			}
+		}else {
+			logger.error("Server tried to send the WebView a message, but the message channel is not open!");
+		}
+	}
+
+	@JSBody(params = { "obj" }, script = "return (typeof obj === \"object\") && (obj.ver === 1) && ((typeof obj.channel === \"string\") && obj.channel.length > 0);")
+	private static native boolean checkRawMessageValid(JSObject obj);
+
+	@JSBody(params = { "obj" }, script = "return (typeof obj.open === \"boolean\");")
+	private static native boolean checkRawMessageValidEn(JSObject obj);
+
+	@JSBody(params = { "obj" }, script = "return (typeof obj.data === \"string\");")
+	private static native boolean checkRawMessageValidDataStr(JSObject obj);
+
+	@JSBody(params = { "obj" }, script = "return (obj.data instanceof ArrayBuffer);")
+	private static native boolean checkRawMessageValidDataBin(JSObject obj);
+
+	private static interface WebViewMessage extends JSObject {
+		
+		@JSProperty
+		String getType();
+		
+		@JSProperty
+		String getChannel();
+		
+		@JSProperty("data")
+		String getDataAsString();
+		
+		@JSProperty("data")
+		ArrayBuffer getDataAsArrayBuffer();
+		
+		@JSProperty
+		boolean getOpen();
+		
+	}
+
+	private static void handleMessageRawFromFrame(JSObject obj) {
+		if(checkRawMessageValid(obj)) {
+			if(checkRawMessageValidEn(obj)) {
+				WebViewMessage msg = (WebViewMessage)obj;
+				sendMessageEnToServer(msg.getOpen(), msg.getChannel());
+				return;
+			}else if(checkRawMessageValidDataStr(obj)) {
+				WebViewMessage msg = (WebViewMessage)obj;
+				sendMessageToServer(msg.getChannel(), CPacketWebViewMessageV4EAG.TYPE_STRING, msg.getDataAsString().getBytes(StandardCharsets.UTF_8));
+				return;
+			}else if(checkRawMessageValidDataBin(obj)) {
+				WebViewMessage msg = (WebViewMessage)obj;
+				sendMessageToServer(msg.getChannel(), CPacketWebViewMessageV4EAG.TYPE_BINARY, TeaVMUtils.wrapByteArrayBuffer(msg.getDataAsArrayBuffer()));
+				return;
+			}
+		}
+		logger.warn("WebView sent an invalid message!");
+	}
+
+	private static void sendMessageToServer(String channelName, int type, byte[] data) {
+		if(channelName.length() > 255) {
+			logger.error("WebView tried to send a message packet, but channel name is too long, max is 255 characters!");
+			return;
+		}
+		if(!channelName.equals(currentMessageChannelName)) {
+			logger.error("WebView tried to send a message packet, but the channel is not open!");
+			return;
+		}
+		if(packetSendCallback != null) {
+			if(!packetSendCallback.sendPacket(new CPacketWebViewMessageV4EAG(type, data))) {
+				logger.error("WebView tried to send a packet to the server, but the server does not support this protocol!");
+			}
+		}else {
+			logger.error("WebView tried to send a message, but no callback for sending packets is set!");
+		}
+	}
+
+	private static void sendMessageEnToServer(boolean messageChannelOpen, String channelName) {
+		if(channelName.length() > 255) {
+			logger.error("WebView tried to {} a channel, but channel name is too long, max is 255 characters!", messageChannelOpen ? "open" : "close");
+			return;
+		}
+		if(messageChannelOpen && currentMessageChannelName != null) {
+			logger.error("WebView tried to open channel, but a channel is already open!");
+			sendMessageEnToServer(false, currentMessageChannelName);
+		}
+		if(!messageChannelOpen && currentMessageChannelName != null && !currentMessageChannelName.equals(channelName)) {
+			logger.error("WebView tried to close the wrong channel!");
+		}
+		if(!messageChannelOpen && currentMessageChannelName == null) {
+			logger.error("WebView tried to close channel, but the channel is not open!");
+			return;
+		}
+		if(packetSendCallback != null) {
+			if(!packetSendCallback.sendPacket(new CPacketWebViewMessageEnV4EAG(messageChannelOpen, messageChannelOpen ? channelName : null))) {
+				logger.error("WebView tried to send a packet to the server, but the server does not support this protocol!");
+				return;
+			}
+			if(messageChannelOpen) {
+				logger.info("WebView opened message channel to server: \"{}\"", channelName);
+				currentMessageChannelName = channelName;
+			}else {
+				logger.info("WebView closed message channel to server: \"{}\"", currentMessageChannelName);
+				currentMessageChannelName = null;
+			}
+		}else {
+			logger.error("WebView tried to send a message, but no callback for sending packets is set!");
+		}
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayByteBuffer.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayByteBuffer.java
index f5664a7..83c9976 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayByteBuffer.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayByteBuffer.java
@@ -32,9 +32,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 	int position;
 	int limit;
 	int mark;
-	
-	static final Int8Array ZERO_LENGTH_BUFFER = Int8Array.create(0);
-	
+
 	EaglerArrayByteBuffer(DataView dataView) {
 		this.dataView = dataView;
 		this.typedArray = Int8Array.create(dataView.getBuffer(), dataView.getByteOffset(), dataView.getByteLength());
@@ -43,7 +41,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 		this.limit = this.capacity;
 		this.mark = -1;
 	}
-	
+
 	EaglerArrayByteBuffer(DataView dataView, int position, int limit, int mark) {
 		this.dataView = dataView;
 		this.typedArray = Int8Array.create(dataView.getBuffer(), dataView.getByteOffset(), dataView.getByteLength());
@@ -52,7 +50,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 		this.limit = limit;
 		this.mark = mark;
 	}
-	
+
 	EaglerArrayByteBuffer(Int8Array typedArray) {
 		this.typedArray = typedArray;
 		this.dataView = DataView.create(typedArray.getBuffer(), typedArray.getByteOffset(), typedArray.getByteLength());
@@ -61,7 +59,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 		this.limit = this.capacity;
 		this.mark = -1;
 	}
-	
+
 	EaglerArrayByteBuffer(Int8Array typedArray, int position, int limit, int mark) {
 		this.typedArray = typedArray;
 		this.dataView = DataView.create(typedArray.getBuffer(), typedArray.getByteOffset(), typedArray.getByteLength());
@@ -96,18 +94,13 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 		return limit > position;
 	}
 
-	@Override
-	public boolean isReadOnly() {
-		return false;
-	}
-
 	@Override
 	public boolean hasArray() {
 		return false;
 	}
 
 	@Override
-	public Object array() {
+	public byte[] array() {
 		throw new UnsupportedOperationException();
 	}
 
@@ -116,55 +109,40 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 		return true;
 	}
 
-	@Override
-	public ByteBuffer slice() {
-		if(position == limit) {
-			return new EaglerArrayByteBuffer(ZERO_LENGTH_BUFFER);
-		}else {
-			if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-			return new EaglerArrayByteBuffer(Int8Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + position, limit - position));
-		}
-	}
-
 	@Override
 	public ByteBuffer duplicate() {
 		return new EaglerArrayByteBuffer(dataView, position, limit, mark);
 	}
 
-	@Override
-	public ByteBuffer asReadOnlyBuffer() {
-		return new EaglerArrayByteBuffer(dataView, position, limit, mark);
-	}
-
 	@Override
 	public byte get() {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		return typedArray.get(position++);
 	}
 
 	@Override
 	public ByteBuffer put(byte b) {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		typedArray.set(position++, b);
 		return this;
 	}
 
 	@Override
 	public byte get(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return typedArray.get(index);
 	}
 
 	@Override
 	public ByteBuffer put(int index, byte b) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		typedArray.set(index, b);
 		return this;
 	}
 
 	@Override
 	public ByteBuffer get(byte[] dst, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		TeaVMUtils.unwrapArrayBufferView(dst).set(Int8Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + position, length), offset);
 		position += length;
 		return this;
@@ -172,7 +150,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer get(byte[] dst) {
-		if(position + dst.length > limit) throw new ArrayIndexOutOfBoundsException(position + dst.length - 1);
+		if(position + dst.length > limit) throw Buffer.makeIOOBE(position + dst.length - 1);
 		TeaVMUtils.unwrapArrayBufferView(dst).set(Int8Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + position, dst.length));
 		position += dst.length;
 		return this;
@@ -183,13 +161,13 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 		if(src instanceof EaglerArrayByteBuffer) {
 			EaglerArrayByteBuffer c = (EaglerArrayByteBuffer)src;
 			int l = c.limit - c.position;
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			typedArray.set(Int8Array.create(c.typedArray.getBuffer(), c.typedArray.getByteOffset() + c.position, l), position);
 			position += l;
 			c.position += l;
 		}else {
 			int l = src.remaining();
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			for(int i = 0; i < l; ++i) {
 				dataView.setInt8(position + l, src.get());
 			}
@@ -200,7 +178,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer put(byte[] src, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		if(offset == 0 && length == src.length) {
 			typedArray.set(TeaVMUtils.unwrapArrayBufferView(src), position);
 		}else {
@@ -212,35 +190,15 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer put(byte[] src) {
-		if(position + src.length > limit) throw new ArrayIndexOutOfBoundsException(position + src.length - 1);
+		if(position + src.length > limit) throw Buffer.makeIOOBE(position + src.length - 1);
 		typedArray.set(TeaVMUtils.unwrapArrayBufferView(src), position);
 		position += src.length;
 		return this;
 	}
 
-	@Override
-	public int arrayOffset() {
-		return position;
-	}
-
-	@Override
-	public ByteBuffer compact() {
-		if(limit > capacity) throw new ArrayIndexOutOfBoundsException(limit);
-		if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-		
-		if(position == limit) {
-			return new EaglerArrayByteBuffer(ZERO_LENGTH_BUFFER);
-		}
-		
-		Int8Array dst = Int8Array.create(limit - position);
-		dst.set(Int8Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + position, limit - position));
-		
-		return new EaglerArrayByteBuffer(dst);
-	}
-
 	@Override
 	public char getChar() {
-		if(position + 2 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 2 > limit) throw Buffer.makeIOOBE(position);
 		char c = (char)dataView.getUint16(position, true);
 		position += 2;
 		return c;
@@ -248,7 +206,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putChar(char value) {
-		if(position + 2 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 2 > limit) throw Buffer.makeIOOBE(position);
 		dataView.setUint16(position, (short)value, true);
 		position += 2;
 		return this;
@@ -256,20 +214,20 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public char getChar(int index) {
-		if(index + 2 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 2 > limit) throw Buffer.makeIOOBE(index);
 		return (char)dataView.getUint16(index, true);
 	}
 
 	@Override
 	public ByteBuffer putChar(int index, char value) {
-		if(index + 2 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 2 > limit) throw Buffer.makeIOOBE(index);
 		dataView.setUint16(index, value, true);
 		return this;
 	}
 
 	@Override
 	public short getShort() {
-		if(position + 2 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 2 > limit) throw Buffer.makeIOOBE(position);
 		short s = dataView.getInt16(position, true);
 		position += 2;
 		return s;
@@ -277,7 +235,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putShort(short value) {
-		if(position + 2 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 2 > limit) throw Buffer.makeIOOBE(position);
 		dataView.setInt16(position, value, true);
 		position += 2;
 		return this;
@@ -285,13 +243,13 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public short getShort(int index) {
-		if(index + 2 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 2 > limit) throw Buffer.makeIOOBE(index);
 		return dataView.getInt16(index, true);
 	}
 
 	@Override
 	public ByteBuffer putShort(int index, short value) {
-		if(index + 2 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 2 > limit) throw Buffer.makeIOOBE(index);
 		dataView.setInt16(index, value, true);
 		return this;
 	}
@@ -303,7 +261,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public int getInt() {
-		if(position + 4 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 4 > limit) throw Buffer.makeIOOBE(position);
 		int i = dataView.getInt32(position, true);
 		position += 4;
 		return i;
@@ -311,7 +269,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putInt(int value) {
-		if(position + 4 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 4 > limit) throw Buffer.makeIOOBE(position);
 		dataView.setInt32(position, value, true);
 		position += 4;
 		return this;
@@ -319,13 +277,13 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public int getInt(int index) {
-		if(index + 4 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 4 > limit) throw Buffer.makeIOOBE(index);
 		return dataView.getInt32(index, true);
 	}
 
 	@Override
 	public ByteBuffer putInt(int index, int value) {
-		if(index + 4 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 4 > limit) throw Buffer.makeIOOBE(index);
 		dataView.setInt32(index, value, true);
 		return this;
 	}
@@ -337,7 +295,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public long getLong() {
-		if(position + 8 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 8 > limit) throw Buffer.makeIOOBE(position);
 		long l = dataView.getUint32(position) | ((long) dataView.getUint8(position + 4) << 32)
 				| ((long) dataView.getUint8(position + 5) << 40) | ((long) dataView.getUint8(position + 6) << 48)
 				| ((long) dataView.getUint8(position + 7) << 56);
@@ -347,7 +305,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putLong(long value) {
-		if(position + 8 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 8 > limit) throw Buffer.makeIOOBE(position);
 		dataView.setUint32(position, (int) (value & 0xFFFFFFFFl), true);
 		dataView.setUint8(position + 4, (short) ((value >>> 32l) & 0xFFl));
 		dataView.setUint8(position + 5, (short) ((value >>> 40l) & 0xFFl));
@@ -359,7 +317,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public long getLong(int index) {
-		if(index + 8 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 8 > limit) throw Buffer.makeIOOBE(index);
 		return dataView.getUint32(index, true) | ((long) dataView.getUint8(index + 4) << 32)
 				| ((long) dataView.getUint8(index + 5) << 40) | ((long) dataView.getUint8(index + 6) << 48)
 				| ((long) dataView.getUint8(index + 7) << 56);
@@ -367,7 +325,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putLong(int index, long value) {
-		if(index + 8 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 8 > limit) throw Buffer.makeIOOBE(index);
 		dataView.setUint32(index, (int) (value & 0xFFFFFFFFl), true);
 		dataView.setUint8(index + 4, (short) ((value >>> 32l) & 0xFFl));
 		dataView.setUint8(index + 5, (short) ((value >>> 40l) & 0xFFl));
@@ -378,7 +336,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public float getFloat() {
-		if(position + 4 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 4 > limit) throw Buffer.makeIOOBE(position);
 		float f = dataView.getFloat32(position, true);
 		position += 4;
 		return f;
@@ -386,7 +344,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer putFloat(float value) {
-		if(position + 4 > limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position + 4 > limit) throw Buffer.makeIOOBE(position);
 		dataView.setFloat32(position, value, true);
 		position += 4;
 		return this;
@@ -394,13 +352,13 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public float getFloat(int index) {
-		if(index + 4 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 4 > limit) throw Buffer.makeIOOBE(index);
 		return dataView.getFloat32(index, true);
 	}
 
 	@Override
 	public ByteBuffer putFloat(int index, float value) {
-		if(index + 4 > limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index + 4 > limit) throw Buffer.makeIOOBE(index);
 		dataView.setFloat32(index, value, true);
 		return this;
 	}
@@ -419,7 +377,7 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 	@Override
 	public ByteBuffer reset() {
 		int m = mark;
-		if(m < 0) throw new ArrayIndexOutOfBoundsException("Invalid mark: " + m);
+		if(m < 0) throw new IndexOutOfBoundsException("Invalid mark: " + m);
 		position = m;
 		return this;
 	}
@@ -449,14 +407,14 @@ public class EaglerArrayByteBuffer implements ByteBuffer {
 
 	@Override
 	public ByteBuffer limit(int newLimit) {
-		if(newLimit < 0 || newLimit > capacity) throw new ArrayIndexOutOfBoundsException(newLimit);
+		if(newLimit < 0 || newLimit > capacity) throw Buffer.makeIOOBE(newLimit);
 		limit = newLimit;
 		return this;
 	}
 
 	@Override
 	public ByteBuffer position(int newPosition) {
-		if(newPosition < 0 || newPosition > limit) throw new ArrayIndexOutOfBoundsException(newPosition);
+		if(newPosition < 0 || newPosition > limit) throw Buffer.makeIOOBE(newPosition);
 		position = newPosition;
 		return this;
 	}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayFloatBuffer.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayFloatBuffer.java
index 207f870..7d810df 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayFloatBuffer.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayFloatBuffer.java
@@ -27,11 +27,9 @@ public class EaglerArrayFloatBuffer implements FloatBuffer {
 	int position;
 	int limit;
 	int mark;
-	
+
 	private static final int SHIFT = 2;
-	
-	static final Float32Array ZERO_LENGTH_BUFFER = Float32Array.create(0);
-	
+
 	EaglerArrayFloatBuffer(Float32Array typedArray) {
 		this.typedArray = typedArray;
 		this.capacity = typedArray.getLength();
@@ -39,7 +37,7 @@ public class EaglerArrayFloatBuffer implements FloatBuffer {
 		this.limit = this.capacity;
 		this.mark = -1;
 	}
-	
+
 	EaglerArrayFloatBuffer(Float32Array typedArray, int position, int limit, int mark) {
 		this.typedArray = typedArray;
 		this.capacity = typedArray.getLength();
@@ -47,7 +45,7 @@ public class EaglerArrayFloatBuffer implements FloatBuffer {
 		this.limit = limit;
 		this.mark = mark;
 	}
-	
+
 	@Override
 	public int capacity() {
 		return capacity;
@@ -73,87 +71,62 @@ public class EaglerArrayFloatBuffer implements FloatBuffer {
 		return position < limit;
 	}
 
-	@Override
-	public boolean isReadOnly() {
-		return false;
-	}
-
 	@Override
 	public boolean hasArray() {
 		return false;
 	}
 
 	@Override
-	public Object array() {
+	public float[] array() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
-	public int arrayOffset() {
-		return position;
-	}
-
-	@Override
-	public FloatBuffer slice() {
-		if(position == limit) {
-			return new EaglerArrayFloatBuffer(ZERO_LENGTH_BUFFER);
-		}else {
-			if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-			return new EaglerArrayFloatBuffer(Float32Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), limit - position));
-		}
-	}
-
 	@Override
 	public FloatBuffer duplicate() {
 		return new EaglerArrayFloatBuffer(typedArray, position, limit, mark);
 	}
 
-	@Override
-	public FloatBuffer asReadOnlyBuffer() {
-		return new EaglerArrayFloatBuffer(typedArray, position, limit, mark);
-	}
-
 	@Override
 	public float get() {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		return typedArray.get(position++);
 	}
 
 	@Override
 	public FloatBuffer put(float b) {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		typedArray.set(position++, b);
 		return this;
 	}
 
 	@Override
 	public float get(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return typedArray.get(index);
 	}
 
 	@Override
 	public FloatBuffer put(int index, float b) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		typedArray.set(index, b);
 		return this;
 	}
 
 	@Override
 	public float getElement(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return typedArray.get(index);
 	}
 
 	@Override
 	public void putElement(int index, float value) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		typedArray.set(index, value);
 	}
 
 	@Override
 	public FloatBuffer get(float[] dst, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) Buffer.makeIOOBE(position + length - 1);
 		TeaVMUtils.unwrapArrayBufferView(dst).set(Float32Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), length), offset);
 		position += length;
 		return this;
@@ -161,7 +134,7 @@ public class EaglerArrayFloatBuffer implements FloatBuffer {
 
 	@Override
 	public FloatBuffer get(float[] dst) {
-		if(position + dst.length > limit) throw new ArrayIndexOutOfBoundsException(position + dst.length - 1);
+		if(position + dst.length > limit) Buffer.makeIOOBE(position + dst.length - 1);
 		TeaVMUtils.unwrapArrayBufferView(dst).set(Float32Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), dst.length));
 		position += dst.length;
 		return this;
@@ -172,13 +145,13 @@ public class EaglerArrayFloatBuffer implements FloatBuffer {
 		if(src instanceof EaglerArrayFloatBuffer) {
 			EaglerArrayFloatBuffer c = (EaglerArrayFloatBuffer)src;
 			int l = c.limit - c.position;
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			typedArray.set(Float32Array.create(c.typedArray.getBuffer(), c.typedArray.getByteOffset() + (c.position << SHIFT), l), position);
 			position += l;
 			c.position += l;
 		}else {
 			int l = src.remaining();
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			for(int i = 0; i < l; ++i) {
 				typedArray.set(position + l, src.get());
 			}
@@ -189,7 +162,7 @@ public class EaglerArrayFloatBuffer implements FloatBuffer {
 
 	@Override
 	public FloatBuffer put(float[] src, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		if(offset == 0 && length == src.length) {
 			typedArray.set(TeaVMUtils.unwrapArrayBufferView(src), position);
 		}else {
@@ -201,32 +174,12 @@ public class EaglerArrayFloatBuffer implements FloatBuffer {
 
 	@Override
 	public FloatBuffer put(float[] src) {
-		if(position + src.length > limit) throw new ArrayIndexOutOfBoundsException(position + src.length - 1);
+		if(position + src.length > limit) throw Buffer.makeIOOBE(position + src.length - 1);
 		typedArray.set(TeaVMUtils.unwrapArrayBufferView(src), position);
 		position += src.length;
 		return this;
 	}
 
-	@Override
-	public int getArrayOffset() {
-		return position;
-	}
-
-	@Override
-	public FloatBuffer compact() {
-		if(limit > capacity) throw new ArrayIndexOutOfBoundsException(limit);
-		if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-		
-		if(position == limit) {
-			return new EaglerArrayFloatBuffer(ZERO_LENGTH_BUFFER);
-		}
-		
-		Float32Array dst = Float32Array.create(limit - position);
-		dst.set(Float32Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), limit - position));
-		
-		return new EaglerArrayFloatBuffer(dst);
-	}
-
 	@Override
 	public boolean isDirect() {
 		return true;
@@ -241,7 +194,7 @@ public class EaglerArrayFloatBuffer implements FloatBuffer {
 	@Override
 	public FloatBuffer reset() {
 		int m = mark;
-		if(m < 0) throw new ArrayIndexOutOfBoundsException("Invalid mark: " + m);
+		if(m < 0) throw new IndexOutOfBoundsException("Invalid mark: " + m);
 		position = m;
 		return this;
 	}
@@ -271,14 +224,14 @@ public class EaglerArrayFloatBuffer implements FloatBuffer {
 
 	@Override
 	public FloatBuffer limit(int newLimit) {
-		if(newLimit < 0 || newLimit > capacity) throw new ArrayIndexOutOfBoundsException(newLimit);
+		if(newLimit < 0 || newLimit > capacity) throw Buffer.makeIOOBE(newLimit);
 		limit = newLimit;
 		return this;
 	}
 
 	@Override
 	public FloatBuffer position(int newPosition) {
-		if(newPosition < 0 || newPosition > limit) throw new ArrayIndexOutOfBoundsException(newPosition);
+		if(newPosition < 0 || newPosition > limit) throw Buffer.makeIOOBE(newPosition);
 		position = newPosition;
 		return this;
 	}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayIntBuffer.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayIntBuffer.java
index eaa894c..241753a 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayIntBuffer.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayIntBuffer.java
@@ -27,11 +27,9 @@ public class EaglerArrayIntBuffer implements IntBuffer {
 	int position;
 	int limit;
 	int mark;
-	
+
 	private static final int SHIFT = 2;
-	
-	static final Int32Array ZERO_LENGTH_BUFFER = Int32Array.create(0);
-	
+
 	EaglerArrayIntBuffer(Int32Array typedArray) {
 		this.typedArray = typedArray;
 		this.capacity = typedArray.getLength();
@@ -39,7 +37,7 @@ public class EaglerArrayIntBuffer implements IntBuffer {
 		this.limit = this.capacity;
 		this.mark = -1;
 	}
-	
+
 	EaglerArrayIntBuffer(Int32Array typedArray, int position, int limit, int mark) {
 		this.typedArray = typedArray;
 		this.capacity = typedArray.getLength();
@@ -47,7 +45,7 @@ public class EaglerArrayIntBuffer implements IntBuffer {
 		this.limit = limit;
 		this.mark = mark;
 	}
-	
+
 	@Override
 	public int capacity() {
 		return capacity;
@@ -73,87 +71,62 @@ public class EaglerArrayIntBuffer implements IntBuffer {
 		return position < limit;
 	}
 
-	@Override
-	public boolean isReadOnly() {
-		return false;
-	}
-
 	@Override
 	public boolean hasArray() {
 		return false;
 	}
 
 	@Override
-	public Object array() {
+	public int[] array() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
-	public int arrayOffset() {
-		return position;
-	}
-
-	@Override
-	public IntBuffer slice() {
-		if(position == limit) {
-			return new EaglerArrayIntBuffer(ZERO_LENGTH_BUFFER);
-		}else {
-			if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-			return new EaglerArrayIntBuffer(Int32Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), limit - position));
-		}
-	}
-
 	@Override
 	public IntBuffer duplicate() {
 		return new EaglerArrayIntBuffer(typedArray, position, limit, mark);
 	}
 
-	@Override
-	public IntBuffer asReadOnlyBuffer() {
-		return new EaglerArrayIntBuffer(typedArray, position, limit, mark);
-	}
-
 	@Override
 	public int get() {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		return typedArray.get(position++);
 	}
 
 	@Override
 	public IntBuffer put(int b) {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		typedArray.set(position++, b);
 		return this;
 	}
 
 	@Override
 	public int get(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return typedArray.get(index);
 	}
 
 	@Override
 	public IntBuffer put(int index, int b) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		typedArray.set(index, b);
 		return this;
 	}
 
 	@Override
 	public int getElement(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return typedArray.get(index);
 	}
 
 	@Override
 	public void putElement(int index, int value) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		typedArray.set(index, value);
 	}
 
 	@Override
 	public IntBuffer get(int[] dst, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		TeaVMUtils.unwrapArrayBufferView(dst).set(Int32Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), length), offset);
 		position += length;
 		return this;
@@ -161,7 +134,7 @@ public class EaglerArrayIntBuffer implements IntBuffer {
 
 	@Override
 	public IntBuffer get(int[] dst) {
-		if(position + dst.length > limit) throw new ArrayIndexOutOfBoundsException(position + dst.length - 1);
+		if(position + dst.length > limit) throw Buffer.makeIOOBE(position + dst.length - 1);
 		TeaVMUtils.unwrapArrayBufferView(dst).set(Int32Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), dst.length));
 		position += dst.length;
 		return this;
@@ -172,13 +145,13 @@ public class EaglerArrayIntBuffer implements IntBuffer {
 		if(src instanceof EaglerArrayIntBuffer) {
 			EaglerArrayIntBuffer c = (EaglerArrayIntBuffer)src;
 			int l = c.limit - c.position;
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			typedArray.set(Int32Array.create(c.typedArray.getBuffer(), c.typedArray.getByteOffset() + (c.position << SHIFT), l), position);
 			position += l;
 			c.position += l;
 		}else {
 			int l = src.remaining();
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			for(int i = 0; i < l; ++i) {
 				typedArray.set(position + l, src.get());
 			}
@@ -189,7 +162,7 @@ public class EaglerArrayIntBuffer implements IntBuffer {
 
 	@Override
 	public IntBuffer put(int[] src, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		if(offset == 0 && length == src.length) {
 			typedArray.set(TeaVMUtils.unwrapArrayBufferView(src), position);
 		}else {
@@ -201,32 +174,12 @@ public class EaglerArrayIntBuffer implements IntBuffer {
 
 	@Override
 	public IntBuffer put(int[] src) {
-		if(position + src.length > limit) throw new ArrayIndexOutOfBoundsException(position + src.length - 1);
+		if(position + src.length > limit) throw Buffer.makeIOOBE(position + src.length - 1);
 		typedArray.set(TeaVMUtils.unwrapArrayBufferView(src), position);
 		position += src.length;
 		return this;
 	}
 
-	@Override
-	public int getArrayOffset() {
-		return position;
-	}
-
-	@Override
-	public IntBuffer compact() {
-		if(limit > capacity) throw new ArrayIndexOutOfBoundsException(limit);
-		if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-		
-		if(position == limit) {
-			return new EaglerArrayIntBuffer(ZERO_LENGTH_BUFFER);
-		}
-		
-		Int32Array dst = Int32Array.create(limit - position);
-		dst.set(Int32Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), limit - position));
-		
-		return new EaglerArrayIntBuffer(dst);
-	}
-
 	@Override
 	public boolean isDirect() {
 		return true;
@@ -241,7 +194,7 @@ public class EaglerArrayIntBuffer implements IntBuffer {
 	@Override
 	public IntBuffer reset() {
 		int m = mark;
-		if(m < 0) throw new ArrayIndexOutOfBoundsException("Invalid mark: " + m);
+		if(m < 0) throw new IndexOutOfBoundsException("Invalid mark: " + m);
 		position = m;
 		return this;
 	}
@@ -271,14 +224,14 @@ public class EaglerArrayIntBuffer implements IntBuffer {
 
 	@Override
 	public IntBuffer limit(int newLimit) {
-		if(newLimit < 0 || newLimit > capacity) throw new ArrayIndexOutOfBoundsException(newLimit);
+		if(newLimit < 0 || newLimit > capacity) throw Buffer.makeIOOBE(newLimit);
 		limit = newLimit;
 		return this;
 	}
 
 	@Override
 	public IntBuffer position(int newPosition) {
-		if(newPosition < 0 || newPosition > limit) throw new ArrayIndexOutOfBoundsException(newPosition);
+		if(newPosition < 0 || newPosition > limit) throw Buffer.makeIOOBE(newPosition);
 		position = newPosition;
 		return this;
 	}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayShortBuffer.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayShortBuffer.java
index 7bf927a..09e5db9 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayShortBuffer.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayShortBuffer.java
@@ -27,11 +27,9 @@ public class EaglerArrayShortBuffer implements ShortBuffer {
 	int position;
 	int limit;
 	int mark;
-	
+
 	private static final int SHIFT = 1;
-	
-	static final Int16Array ZERO_LENGTH_BUFFER = Int16Array.create(0);
-	
+
 	EaglerArrayShortBuffer(Int16Array typedArray) {
 		this.typedArray = typedArray;
 		this.capacity = typedArray.getLength();
@@ -39,7 +37,7 @@ public class EaglerArrayShortBuffer implements ShortBuffer {
 		this.limit = this.capacity;
 		this.mark = -1;
 	}
-	
+
 	EaglerArrayShortBuffer(Int16Array typedArray, int position, int limit, int mark) {
 		this.typedArray = typedArray;
 		this.capacity = typedArray.getLength();
@@ -47,7 +45,7 @@ public class EaglerArrayShortBuffer implements ShortBuffer {
 		this.limit = limit;
 		this.mark = mark;
 	}
-	
+
 	@Override
 	public int capacity() {
 		return capacity;
@@ -73,87 +71,62 @@ public class EaglerArrayShortBuffer implements ShortBuffer {
 		return position < limit;
 	}
 
-	@Override
-	public boolean isReadOnly() {
-		return false;
-	}
-
 	@Override
 	public boolean hasArray() {
 		return false;
 	}
 
 	@Override
-	public Object array() {
+	public short[] array() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
-	public int arrayOffset() {
-		return position;
-	}
-
-	@Override
-	public ShortBuffer slice() {
-		if(position == limit) {
-			return new EaglerArrayShortBuffer(ZERO_LENGTH_BUFFER);
-		}else {
-			if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-			return new EaglerArrayShortBuffer(Int16Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), limit - position));
-		}
-	}
-
 	@Override
 	public ShortBuffer duplicate() {
 		return new EaglerArrayShortBuffer(typedArray, position, limit, mark);
 	}
 
-	@Override
-	public ShortBuffer asReadOnlyBuffer() {
-		return new EaglerArrayShortBuffer(typedArray, position, limit, mark);
-	}
-
 	@Override
 	public short get() {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		return typedArray.get(position++);
 	}
 
 	@Override
 	public ShortBuffer put(short b) {
-		if(position >= limit) throw new ArrayIndexOutOfBoundsException(position);
+		if(position >= limit) throw Buffer.makeIOOBE(position);
 		typedArray.set(position++, b);
 		return this;
 	}
 
 	@Override
 	public short get(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return typedArray.get(index);
 	}
 
 	@Override
 	public ShortBuffer put(int index, short b) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		typedArray.set(index, b);
 		return this;
 	}
 
 	@Override
 	public short getElement(int index) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		return typedArray.get(index);
 	}
 
 	@Override
 	public void putElement(int index, short value) {
-		if(index >= limit) throw new ArrayIndexOutOfBoundsException(index);
+		if(index < 0 || index >= limit) throw Buffer.makeIOOBE(index);
 		typedArray.set(index, value);
 	}
 
 	@Override
 	public ShortBuffer get(short[] dst, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		TeaVMUtils.unwrapArrayBufferView(dst).set(Int16Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), length), offset);
 		position += length;
 		return this;
@@ -161,7 +134,7 @@ public class EaglerArrayShortBuffer implements ShortBuffer {
 
 	@Override
 	public ShortBuffer get(short[] dst) {
-		if(position + dst.length > limit) throw new ArrayIndexOutOfBoundsException(position + dst.length - 1);
+		if(position + dst.length > limit) throw Buffer.makeIOOBE(position + dst.length - 1);
 		TeaVMUtils.unwrapArrayBufferView(dst).set(Int16Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), dst.length));
 		position += dst.length;
 		return this;
@@ -172,13 +145,13 @@ public class EaglerArrayShortBuffer implements ShortBuffer {
 		if(src instanceof EaglerArrayShortBuffer) {
 			EaglerArrayShortBuffer c = (EaglerArrayShortBuffer)src;
 			int l = c.limit - c.position;
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			typedArray.set(Int16Array.create(c.typedArray.getBuffer(), c.typedArray.getByteOffset() + (c.position << SHIFT), l), position);
 			position += l;
 			c.position += l;
 		}else {
 			int l = src.remaining();
-			if(position + l > limit) throw new ArrayIndexOutOfBoundsException(position + l - 1);
+			if(position + l > limit) throw Buffer.makeIOOBE(position + l - 1);
 			for(int i = 0; i < l; ++i) {
 				typedArray.set(position + l, src.get());
 			}
@@ -189,7 +162,7 @@ public class EaglerArrayShortBuffer implements ShortBuffer {
 
 	@Override
 	public ShortBuffer put(short[] src, int offset, int length) {
-		if(position + length > limit) throw new ArrayIndexOutOfBoundsException(position + length - 1);
+		if(position + length > limit) throw Buffer.makeIOOBE(position + length - 1);
 		if(offset == 0 && length == src.length) {
 			typedArray.set(TeaVMUtils.unwrapArrayBufferView(src), position);
 		}else {
@@ -201,32 +174,12 @@ public class EaglerArrayShortBuffer implements ShortBuffer {
 
 	@Override
 	public ShortBuffer put(short[] src) {
-		if(position + src.length > limit) throw new ArrayIndexOutOfBoundsException(position + src.length - 1);
+		if(position + src.length > limit) throw Buffer.makeIOOBE(position + src.length - 1);
 		typedArray.set(TeaVMUtils.unwrapArrayBufferView(src), position);
 		position += src.length;
 		return this;
 	}
 
-	@Override
-	public int getArrayOffset() {
-		return position;
-	}
-
-	@Override
-	public ShortBuffer compact() {
-		if(limit > capacity) throw new ArrayIndexOutOfBoundsException(limit);
-		if(position > limit) throw new ArrayIndexOutOfBoundsException(position);
-		
-		if(position == limit) {
-			return new EaglerArrayShortBuffer(ZERO_LENGTH_BUFFER);
-		}
-		
-		Int16Array dst = Int16Array.create(limit - position);
-		dst.set(Int16Array.create(typedArray.getBuffer(), typedArray.getByteOffset() + (position << SHIFT), limit - position));
-		
-		return new EaglerArrayShortBuffer(dst);
-	}
-
 	@Override
 	public boolean isDirect() {
 		return true;
@@ -241,7 +194,7 @@ public class EaglerArrayShortBuffer implements ShortBuffer {
 	@Override
 	public ShortBuffer reset() {
 		int m = mark;
-		if(m < 0) throw new ArrayIndexOutOfBoundsException("Invalid mark: " + m);
+		if(m < 0) throw new IndexOutOfBoundsException("Invalid mark: " + m);
 		position = m;
 		return this;
 	}
@@ -271,14 +224,14 @@ public class EaglerArrayShortBuffer implements ShortBuffer {
 
 	@Override
 	public ShortBuffer limit(int newLimit) {
-		if(newLimit < 0 || newLimit > capacity) throw new ArrayIndexOutOfBoundsException(newLimit);
+		if(newLimit < 0 || newLimit > capacity) throw Buffer.makeIOOBE(newLimit);
 		limit = newLimit;
 		return this;
 	}
 
 	@Override
 	public ShortBuffer position(int newPosition) {
-		if(newPosition < 0 || newPosition > limit) throw new ArrayIndexOutOfBoundsException(newPosition);
+		if(newPosition < 0 || newPosition > limit) throw Buffer.makeIOOBE(newPosition);
 		position = newPosition;
 		return this;
 	}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/AdvancedHTMLIFrameElement.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/AdvancedHTMLIFrameElement.java
new file mode 100755
index 0000000..f908f98
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/AdvancedHTMLIFrameElement.java
@@ -0,0 +1,120 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+import org.teavm.jso.JSBody;
+import org.teavm.jso.JSProperty;
+import org.teavm.jso.dom.html.HTMLIFrameElement;
+import org.teavm.jso.dom.types.DOMTokenList;
+
+import com.google.common.collect.Iterators;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class AdvancedHTMLIFrameElement implements HTMLIFrameElement {
+
+	@JSProperty
+	public abstract void setAllow(String str);
+
+	@JSProperty
+	public abstract String getAllow();
+
+	public void setAllowSafe(String requiredValue) {
+		setAllow(requiredValue);
+		if(!requiredValue.equals(getAllow())) {
+			throw new IFrameSafetyException("Could not set allow attribute to: " + requiredValue);
+		}
+	}
+
+	@JSProperty
+	public abstract void setAllowFullscreen(boolean en);
+
+	@JSProperty
+	public abstract void setCredentialless(boolean en);
+
+	@JSProperty
+	public abstract void setLoading(String str);
+
+	@JSProperty
+	public abstract void setReferrerPolicy(String str);
+
+	@JSProperty("csp")
+	public abstract void setCSP(String str);
+
+	@JSProperty
+	public abstract void setSandbox(String str);
+
+	@JSProperty
+	public abstract DOMTokenList getSandbox();
+
+	public void assertSafetyFeaturesSupported() {
+		if(!checkSafetyFeaturesSupported()) {
+			throw new IFrameSafetyException("Some required security features are not supported on this browser!");
+		}
+	}
+
+	public void setSandboxSafe(Collection<String> requiredTokens) {
+		setSandboxSafe(new HashSet<>(requiredTokens));
+	}
+
+	public void setSandboxSafe(Set<String> requiredTokens) {
+		setSandbox(String.join(" ", requiredTokens));
+		DOMTokenList theSandbox = getSandbox();
+		for(String s : requiredTokens) {
+			if(!theSandbox.contains(s)) {
+				throw new IFrameSafetyException("Failed to set sandbox attribute: " + s);
+			}
+		}
+		int l = theSandbox.getLength();
+		for(int i = 0; i < l; ++i) {
+			String s = theSandbox.item(i);
+			if(!requiredTokens.contains(s)) {
+				throw new IFrameSafetyException("Unknown sandbox attribute detected: " + s);
+			}
+		}
+	}
+
+	public void setSandboxSafe(Collection<String> requiredTokens, Collection<String> optionalTokens) {
+		setSandboxSafe(new HashSet<>(requiredTokens), new HashSet<>(optionalTokens));
+	}
+
+	public void setSandboxSafe(Set<String> requiredTokens, Set<String> optionalTokens) {
+		setSandbox(StringUtils.join(Iterators.concat(requiredTokens.iterator(), optionalTokens.iterator()), " "));
+		DOMTokenList theSandbox = getSandbox();
+		for(String s : requiredTokens) {
+			if(!theSandbox.contains(s)) {
+				throw new IFrameSafetyException("Failed to set sandbox attribute: " + s);
+			}
+		}
+		int l = theSandbox.getLength();
+		for(int i = 0; i < l; ++i) {
+			String s = theSandbox.item(i);
+			if(!requiredTokens.contains(s) && !optionalTokens.contains(s)) {
+				throw new IFrameSafetyException("Unknown sandbox attribute detected: " + s);
+			}
+		}
+	}
+
+	@JSBody(params = {}, script = "return (typeof this.allow === \"string\") && (typeof this.sandbox === \"object\");")
+	public native boolean checkSafetyFeaturesSupported();
+
+	@JSBody(params = {}, script = "return (typeof this.csp === \"string\");")
+	public native boolean checkCSPSupported();
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ArrayBufferInputStream.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ArrayBufferInputStream.java
index 9e16640..33cf496 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ArrayBufferInputStream.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ArrayBufferInputStream.java
@@ -1,12 +1,14 @@
 package net.lax1dude.eaglercraft.v1_8.internal.teavm;
 
+import java.io.IOException;
 import java.io.InputStream;
 
 import org.teavm.jso.typedarrays.ArrayBuffer;
+import org.teavm.jso.typedarrays.Int8Array;
 import org.teavm.jso.typedarrays.Uint8Array;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -21,16 +23,17 @@ import org.teavm.jso.typedarrays.Uint8Array;
  * 
  */
 public class ArrayBufferInputStream extends InputStream {
-	
+
+	private int mark = -1;
 	private int position;
 	private int limit;
 	private final ArrayBuffer buffer;
 	private final Uint8Array typed;
-	
+
 	public ArrayBufferInputStream(ArrayBuffer bufferIn) {
 		this(bufferIn, 0, bufferIn.getByteLength());
 	}
-	
+
 	public ArrayBufferInputStream(ArrayBuffer bufferIn, int off, int len) {
 		if(off + len > bufferIn.getByteLength()) {
 			throw new IllegalArgumentException("offset " + off + " and length " + len + " are out of bounds for a "
@@ -66,15 +69,14 @@ public class ArrayBufferInputStream extends InputStream {
 			return -1;
 		}
 		
-		for(int i = 0; i < len; ++i) {
-			b[off + i] = (byte)typed.get(position + i);
-		}
+		TeaVMUtils.unwrapArrayBufferView(b).set(Int8Array.create(buffer, position, len), off);
 		
 		position += len;
 		
 		return len;
 	}
-	
+
+	@Override
 	public long skip(long n) {
 		int avail = limit - position;
 		if(n > avail) {
@@ -83,7 +85,7 @@ public class ArrayBufferInputStream extends InputStream {
 		position += (int)n;
 		return n;
 	}
-	
+
 	@Override
 	public int available() {
 		return limit - position;
@@ -101,4 +103,21 @@ public class ArrayBufferInputStream extends InputStream {
 		return buffer;
 	}
 
+	@Override
+	public boolean markSupported() {
+		return true;
+	}
+
+	@Override
+	public synchronized void mark(int readlimit) {
+		mark = position;
+	}
+
+	@Override
+	public synchronized void reset() throws IOException {
+		if(mark == -1) {
+			throw new IOException("Cannot reset, stream has no mark!");
+		}
+		position = mark;
+	}
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/Base64VarIntArray.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/Base64VarIntArray.java
new file mode 100755
index 0000000..e62ac6b
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/Base64VarIntArray.java
@@ -0,0 +1,129 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.teavm.jso.core.JSString;
+
+import net.lax1dude.eaglercraft.v1_8.Base64;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class Base64VarIntArray {
+
+	public static String encodeVarIntArray(List<Integer> values) {
+		StringBuilder ret = new StringBuilder();
+		for(int i = 0, j, k, l = values.size(); i < l; ++i) {
+			j = values.get(i);
+			if(j < 0) j = 0;
+			for(;;) {
+				k = j & 31;
+				if(j > 31) {
+					j >>>= 5;
+					ret.append(Base64.lookupIntChar(k | 32));
+				}else {
+					ret.append(Base64.lookupIntChar(k));
+					break;
+				}
+			}
+		}
+		return ret.toString();
+	}
+
+	public static String encodeVarIntArray(int[] values) {
+		StringBuilder ret = new StringBuilder();
+		for(int i = 0, j, k; i < values.length; ++i) {
+			j = values[i];
+			if(j < 0) j = 0;
+			for(;;) {
+				k = j & 31;
+				if(j > 31) {
+					j >>>= 5;
+					ret.append(Base64.lookupIntChar(k | 32));
+				}else {
+					ret.append(Base64.lookupIntChar(k));
+					break;
+				}
+			}
+		}
+		return ret.toString();
+	}
+
+	public static int[] decodeVarIntArray(String values) {
+		int[] ret = new int[8];
+		int o = 0;
+		for(int i = 0, j, k, m, l = values.length(); i < l;) {
+			k = 0;
+			m = 0;
+			for(;;) {
+				j = Base64.lookupCharInt(values.charAt(i++));
+				if(j == -1) {
+					return null;
+				}
+				k |= (j & 31) << m;
+				if(j > 31) {
+					if(i >= l) {
+						return null;
+					}
+					m += 5;
+				}else {
+					break;
+				}
+			}
+			j = ret.length;
+			if(o >= j) {
+				int[] newRet = new int[j << 1];
+				System.arraycopy(ret, 0, newRet, 0, j);
+				ret = newRet;
+			}
+			ret[o++] = k;
+		}
+		return o != ret.length ? Arrays.copyOf(ret, o) : ret;
+	}
+
+	public static int[] decodeVarIntArray(JSString values) {
+		int[] ret = new int[8];
+		int o = 0;
+		for(int i = 0, j, k, m, l = values.getLength(); i < l;) {
+			k = 0;
+			m = 0;
+			for(;;) {
+				j = Base64.lookupCharInt((char)values.charCodeAt(i++));
+				if(j == -1) {
+					return null;
+				}
+				k |= (j & 31) << m;
+				if(j > 31) {
+					if(i >= l) {
+						return null;
+					}
+					m += 5;
+				}else {
+					break;
+				}
+			}
+			j = ret.length;
+			if(o >= j) {
+				int[] newRet = new int[j << 1];
+				System.arraycopy(ret, 0, newRet, 0, j);
+				ret = newRet;
+			}
+			ret[o++] = k;
+		}
+		return o != ret.length ? Arrays.copyOf(ret, o) : ret;
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClassesJSLocator.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClassesJSLocator.java
new file mode 100755
index 0000000..76268aa
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClassesJSLocator.java
@@ -0,0 +1,94 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.dom.html.HTMLScriptElement;
+import org.teavm.jso.dom.xml.Element;
+import org.teavm.jso.dom.xml.NodeList;
+
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ClassesJSLocator {
+
+	private static final Logger logger = LogManager.getLogger("ClassesJSLocator");
+
+	public static String resolveClassesJSFromThrowable() {
+		String str = resolveClassesJSFromThrowable0();
+		if(str != null && str.equalsIgnoreCase(PlatformRuntime.win.getLocation().getFullURL())) {
+			return null;
+		}
+		return str;
+	}
+
+	private static String resolveClassesJSFromThrowable0() {
+		String str = TeaVMUtils.dumpJSStackTrace();
+		String[] frames = EagUtils.splitPattern.split(str);
+		if("Error".equals(frames[0])) {
+			// V8 stack trace
+			if(frames.length > 1) {
+				String framesTrim = frames[1].trim();
+				if(framesTrim.startsWith("at")) {
+					//definitely V8
+					int i = framesTrim.indexOf('(');
+					int j = framesTrim.indexOf(')');
+					if(i != -1 && j != -1 && i < j) {
+						return tryResolveClassesSourceFromFrame(framesTrim.substring(i + 1, j));
+					}
+				}
+			}
+		}else {
+			// Mozilla/WebKit stack trace
+			String framesTrim = frames[0].trim();
+			int i = framesTrim.indexOf('@');
+			if(i != -1) {
+				return tryResolveClassesSourceFromFrame(framesTrim.substring(i + 1));
+			}
+		}
+		return null;
+	}
+
+	private static String tryResolveClassesSourceFromFrame(String fileLineCol) {
+		int i = fileLineCol.lastIndexOf(':');
+		if(i > 0) {
+			i = fileLineCol.lastIndexOf(':', i - 1);
+		}
+		if(i != -1) {
+			return fileLineCol.substring(0, i);
+		}
+		return null;
+	}
+
+	public static HTMLScriptElement resolveClassesJSFromInline() {
+		NodeList<Element> elements = PlatformRuntime.doc.getElementsByTagName("script");
+		for(int i = 0, l = elements.getLength(); i < l; ++i) {
+			HTMLScriptElement tag = (HTMLScriptElement)elements.get(i);
+			String scriptSrc = tag.getText();
+			if(scriptSrc != null && scriptSrc.length() > 1024 * 1024) {
+				// I'm not feeling very creative tonight
+				int j = scriptSrc.indexOf("var $rt_seed=2463534242;");
+				if(j > 0 && j < 2048 && scriptSrc.indexOf("$rt_createNumericArray(") != -1) {
+					logger.warn("Could not locate classes.js through conventional means, however an inline script tag was found on the page that (probably) contains a TeaVM program");
+					return tag;
+				}
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java
index de5f735..6fd8f78 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java
@@ -5,7 +5,9 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONException;
 import org.teavm.jso.JSBody;
 import org.teavm.jso.JSFunctor;
@@ -21,7 +23,10 @@ import org.teavm.jso.webgl.WebGLRenderingContext;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.BootMenuEntryPoint;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.opts.JSEaglercraftXOptsAssetsURI;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.opts.JSEaglercraftXOptsRoot;
@@ -55,12 +60,26 @@ public class ClientMain {
 		return crashImage.substring(0);
 	}
 
-	@JSBody(params = {}, script = "if((typeof window.__isEaglerX188Running === \"string\") && window.__isEaglerX188Running === \"yes\") return true; window.__isEaglerX188Running = \"yes\"; return false;")
+	@JSBody(params = {}, script = "if((typeof __isEaglerX188Running === \"string\") && __isEaglerX188Running === \"yes\") return true; __isEaglerX188Running = \"yes\"; return false;")
 	private static native boolean getRunningFlag();
 
+	@JSBody(params = { "str" }, script = "return (typeof location !== \"undefined\") && (typeof location.hostname === \"string\") && location.hostname.toLowerCase() === str;")
+	private static native boolean getTardFlag(String str);
+
+	private static final PrintStream systemOut = System.out;
+	private static final PrintStream systemErr = System.err;
+
+	private static JSObject windowErrorHandler = null;
+
 	public static void _main() {
-		PrintStream systemOut = System.out;
-		PrintStream systemErr = System.err;
+		if(getTardFlag(new String(new char[] { 'e', 'a', 'g', 'l', 'e', 'r', 'c', 'r', 'a', 'f', 't', '.', 'd', 'e', 'v' }))) {
+			// Have fun, boys!!!
+			Window.alert(new String(new char[] { 101, 97, 103, 108, 101, 114, 99, 114, 97, 102, 116, 46, 100, 101, 118,
+					32, 105, 115, 32, 110, 111, 116, 32, 97, 110, 32, 111, 102, 102, 105, 99, 105, 97, 108, 32, 119,
+					101, 98, 115, 105, 116, 101, 32, 97, 110, 100, 32, 105, 115, 32, 110, 111, 116, 32, 101, 110, 100,
+					111, 114, 115, 101, 100, 32, 98, 121, 32, 108, 97, 120, 49, 100, 117, 100, 101, 32, 111, 114, 32,
+					97, 121, 117, 110, 97, 109, 105, 50, 48, 48, 48 }));
+		}
 		if(getRunningFlag()) {
 			systemErr.println("ClientMain: [ERROR] eaglercraftx is already running!");
 			return;
@@ -79,6 +98,7 @@ public class ClientMain {
 			try {
 				JSEaglercraftXOptsRoot eaglercraftOpts = (JSEaglercraftXOptsRoot)opts;
 				crashOnUncaughtExceptions = eaglercraftOpts.getCrashOnUncaughtExceptions(false);
+				PlatformRuntime.isDeobfStackTraces = eaglercraftOpts.getDeobfStackTraces(true);
 				
 				configRootElementId = eaglercraftOpts.getContainer();
 				if(configRootElementId == null) {
@@ -86,6 +106,11 @@ public class ClientMain {
 				}
 				configRootElement = Window.current().getDocument().getElementById(configRootElementId);
 				
+				HTMLElement oldContent;
+				while((oldContent = configRootElement.querySelector("._eaglercraftX_wrapper_element")) != null) {
+					oldContent.delete();
+				}
+				
 				String epkSingleURL = eaglercraftOpts.getAssetsURI();
 				if(epkSingleURL != null) {
 					configEPKFiles = new EPKFileEntry[] { new EPKFileEntry(epkSingleURL, "") };
@@ -125,31 +150,41 @@ public class ClientMain {
 			if(crashOnUncaughtExceptions) {
 				systemOut.println("ClientMain: [INFO] registering crash handlers");
 				
-				setWindowErrorHandler(new WindowErrorHandler() {
+				windowErrorHandler = setWindowErrorHandler(Window.current(), new WindowErrorHandler() {
 
 					@Override
 					public void call(String message, String file, int line, int col, JSError error) {
-						StringBuilder str = new StringBuilder();
-						
-						str.append("Native Browser Exception\n");
-						str.append("----------------------------------\n");
-						str.append("  Line: ").append((file == null ? "unknown" : file) + ":" + line + ":" + col).append('\n');
-						str.append("  Type: ").append(error == null ? "generic" : error.getName()).append('\n');
-						
-						if(error != null) {
-							str.append("  Desc: ").append(error.getMessage() == null ? "null" : error.getMessage()).append('\n');
-						}
-						
-						if(message != null) {
-							if(error == null || error.getMessage() == null || !message.endsWith(error.getMessage())) {
-								str.append("  Desc: ").append(message).append('\n');
+						if(windowErrorHandler != null) {
+							error = TeaVMUtils.ensureDefined(error);
+							if(error == null) {
+								systemErr.println("ClientMain: [ERROR] recieved error event, but the error is null, ignoring");
+								return;
 							}
+							
+							StringBuilder str = new StringBuilder();
+							
+							str.append("Native Browser Exception\n");
+							str.append("----------------------------------\n");
+							str.append("  Line: ").append((file == null ? "unknown" : file) + ":" + line + ":" + col).append('\n');
+							str.append("  Type: ").append(error.getName()).append('\n');
+							str.append("  Desc: ").append(error.getMessage() == null ? "null" : error.getMessage()).append('\n');
+							
+							if(message != null) {
+								if(error.getMessage() == null || !message.endsWith(error.getMessage())) {
+									str.append("  Desc: ").append(message).append('\n');
+								}
+							}
+							
+							str.append("----------------------------------\n\n");
+							String stack = TeaVMUtils.getStackSafe(error);
+							if(PlatformRuntime.isDeobfStackTraces && !StringUtils.isAllEmpty(stack)) {
+								TeaVMRuntimeDeobfuscator.initialize();
+								stack = TeaVMRuntimeDeobfuscator.deobfExceptionStack(stack);
+							}
+							str.append(stack == null ? "No stack trace is available" : stack).append('\n');
+							
+							showCrashScreen(str.toString());
 						}
-						
-						str.append("----------------------------------\n\n");
-						str.append(error.getStack() == null ? "No stack trace is available" : error.getStack()).append('\n');
-						
-						showCrashScreen(str.toString());
 					}
 
 				});
@@ -174,6 +209,14 @@ public class ClientMain {
 				}catch(Throwable t) {
 				}
 				return;
+			}catch(TeaVMEnterBootMenuException ee) {
+				try {
+					systemOut.println("ClientMain: [INFO] launching eaglercraftx boot menu");
+					BootMenuEntryPoint.launchMenu(Window.current(), configRootElement);
+				}catch(Throwable t) {
+					showCrashScreen("Failed to enter boot menu!", t);
+				}
+				return;
 			}catch(Throwable t) {
 				systemErr.println("ClientMain: [ERROR] eaglercraftx's runtime could not be initialized!");
 				EagRuntime.debugPrintStackTraceToSTDERR(t);
@@ -197,9 +240,9 @@ public class ClientMain {
 		}
 	}
 	
-	@JSBody(params = {}, script = "if(typeof window.eaglercraftXOpts === \"undefined\") {return null;}"
-			+ "else if(typeof window.eaglercraftXOpts === \"string\") {return JSON.parse(window.eaglercraftXOpts);}"
-			+ "else {return window.eaglercraftXOpts;}")
+	@JSBody(params = {}, script = "if(typeof eaglercraftXOpts === \"undefined\") {return null;}"
+			+ "else if(typeof eaglercraftXOpts === \"string\") {return JSON.parse(eaglercraftXOpts);}"
+			+ "else {return eaglercraftXOpts;}")
 	private static native JSObject getEaglerXOpts();
 
 	public static class EPKFileEntry {
@@ -224,13 +267,24 @@ public class ClientMain {
 		void call(String message, String file, int line, int col, JSError error);
 	}
 	
-	@JSBody(params = { "handler" }, script = "window.addEventListener(\"error\", function(e) { handler("
+	@JSBody(params = { "win", "handler" }, script = "var evtHandler = function(e) { handler("
 			+ "(typeof e.message === \"string\") ? e.message : null,"
 			+ "(typeof e.filename === \"string\") ? e.filename : null,"
 			+ "(typeof e.lineno === \"number\") ? e.lineno : 0,"
 			+ "(typeof e.colno === \"number\") ? e.colno : 0,"
-			+ "(typeof e.error === \"undefined\") ? null : e.error); });")
-	public static native void setWindowErrorHandler(WindowErrorHandler handler);
+			+ "(typeof e.error === \"undefined\") ? null : e.error);}; win.addEventListener(\"error\", evtHandler);"
+			+ "return evtHandler;")
+	private static native JSObject setWindowErrorHandler(Window win, WindowErrorHandler handler);
+	
+	@JSBody(params = { "win", "handler" }, script = "win.removeEventListener(\"error\", evtHandler);")
+	private static native void removeWindowErrorHandler(Window win, JSObject handler);
+	
+	public static void removeErrorHandler(Window win) {
+		if(windowErrorHandler != null) {
+			removeWindowErrorHandler(win, windowErrorHandler);
+			windowErrorHandler = null;
+		}
+	}
 	
 	public static void showCrashScreen(String message, Throwable t) {
 		try {
@@ -249,12 +303,16 @@ public class ClientMain {
 		String strBefore = strBeforeBuilder.toString();
 		
 		HTMLDocument doc = Window.current().getDocument();
-		if(configRootElement == null) {
-			configRootElement = doc.getElementById(configRootElementId);
+		HTMLElement el;
+		if(PlatformRuntime.parent != null) {
+			el = PlatformRuntime.parent;
+		}else {
+			if(configRootElement == null) {
+				configRootElement = doc.getElementById(configRootElementId);
+			}
+			el = configRootElement;
 		}
 
-		HTMLElement el = configRootElement;
-
 		StringBuilder str = new StringBuilder();
 		str.append("eaglercraft.version = \"").append(EaglercraftVersion.projectForkVersion).append("\"\n");
 		str.append("eaglercraft.minecraft = \"1.8.8\"\n");
@@ -263,11 +321,13 @@ public class ClientMain {
 		str.append('\n');
 		str.append(addWebGLToCrash());
 		str.append('\n');
+		str.append(addShimsToCrash());
+		str.append('\n');
 		str.append("window.eaglercraftXOpts = ");
 		str.append(TeaVMClientConfigAdapter.instance.toString()).append('\n');
 		str.append('\n');
 		str.append("currentTime = ");
-		str.append(EagRuntime.fixDateFormat(new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z")).format(new Date())).append('\n');
+		str.append((new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z")).format(new Date())).append('\n');
 		str.append('\n');
 		addDebugNav(str, "userAgent");
 		addDebugNav(str, "vendor");
@@ -301,11 +361,11 @@ public class ClientMain {
 		String strAfter = str.toString();
 		
 		String strFinal = strBefore + strAfter;
-		List<String> additionalInfo = new LinkedList();
+		List<String> additionalInfo = new LinkedList<>();
 		try {
 			TeaVMClientConfigAdapter.instance.getHooks().callCrashReportHook(strFinal, additionalInfo::add);
 		}catch(Throwable tt) {
-			System.err.println("Uncaught exception invoking crash report hook!");
+			systemErr.println("Uncaught exception invoking crash report hook!");
 			EagRuntime.debugPrintStackTraceToSTDERR(tt);
 		}
 		
@@ -325,24 +385,23 @@ public class ClientMain {
 					builderFinal.append(strAfter);
 					strFinal = builderFinal.toString();
 				}catch(Throwable tt) {
-					System.err.println("Uncaught exception concatenating crash report hook messages!");
+					systemErr.println("Uncaught exception concatenating crash report hook messages!");
 					EagRuntime.debugPrintStackTraceToSTDERR(tt);
 				}
 			}
 			
 			if(el == null) {
 				Window.alert("Root element not found, crash report was printed to console");
-				System.err.println(strFinal);
+				systemErr.println(strFinal);
 				return;
 			}
-
-			String s = el.getAttribute("style");
-			el.setAttribute("style", (s == null ? "" : s) + "position:relative;");
+			
 			HTMLElement img = doc.createElement("img");
 			HTMLElement div = doc.createElement("div");
 			img.setAttribute("style", "z-index:100;position:absolute;top:10px;left:calc(50% - 151px);");
 			img.setAttribute("src", crashImageWrapper());
 			div.setAttribute("style", "z-index:100;position:absolute;top:135px;left:10%;right:10%;bottom:50px;background-color:white;border:1px solid #cccccc;overflow-x:hidden;overflow-y:scroll;overflow-wrap:break-word;white-space:pre-wrap;font: 14px monospace;padding:10px;");
+			div.getClassList().add("_eaglercraftX_crash_element");
 			el.appendChild(img);
 			el.appendChild(div);
 			div.appendChild(doc.createTextNode(strFinal));
@@ -350,22 +409,22 @@ public class ClientMain {
 			PlatformRuntime.removeEventHandlers();
 
 		}else {
-			System.err.println();
-			System.err.println("An additional crash report was supressed:");
+			systemErr.println();
+			systemErr.println("An additional crash report was supressed:");
 			String[] s = t.split("[\\r\\n]+");
 			for(int i = 0; i < s.length; ++i) {
-				System.err.println("  " + s[i]);
+				systemErr.println("  " + s[i]);
 			}
 			if(additionalInfo.size() > 0) {
 				for(String str2 : additionalInfo) {
 					if(str2 != null) {
-						System.err.println();
-						System.err.println("  ----------[ CRASH HOOK ]----------");
+						systemErr.println();
+						systemErr.println("  ----------[ CRASH HOOK ]----------");
 						s = str2.split("[\\r\\n]+");
 						for(int i = 0; i < s.length; ++i) {
-							System.err.println("  " + s[i]);
+							systemErr.println("  " + s[i]);
 						}
-						System.err.println("  ----------------------------------");
+						systemErr.println("  ----------------------------------");
 					}
 				}
 			}
@@ -379,44 +438,110 @@ public class ClientMain {
 			return webGLCrashStringCache;
 		}
 		
-		StringBuilder ret = new StringBuilder();
-		
-		WebGLRenderingContext ctx = PlatformRuntime.webgl;
-		
-		if(ctx == null) {
-			HTMLCanvasElement cvs = (HTMLCanvasElement) Window.current().getDocument().createElement("canvas");
+		try {
+			StringBuilder ret = new StringBuilder();
 			
-			cvs.setWidth(64);
-			cvs.setHeight(64);
-			
-			ctx = (WebGLRenderingContext)cvs.getContext("webgl2");
+			WebGLRenderingContext ctx = PlatformRuntime.webgl;
+			boolean experimental = PlatformRuntime.webglExperimental;
 			
 			if(ctx == null) {
-				ctx = (WebGLRenderingContext)cvs.getContext("webgl");
+				experimental = false;
+				HTMLCanvasElement cvs = (HTMLCanvasElement) Window.current().getDocument().createElement("canvas");
+				
+				cvs.setWidth(64);
+				cvs.setHeight(64);
+				
+				ctx = (WebGLRenderingContext)cvs.getContext("webgl2");
+				
+				if(ctx == null) {
+					ctx = (WebGLRenderingContext)cvs.getContext("webgl");
+					if(ctx == null) {
+						experimental = true;
+						ctx = (WebGLRenderingContext)cvs.getContext("experimental-webgl");
+					}
+				}
 			}
-		}
-		
-		if(ctx != null) {
-			if(PlatformRuntime.webgl != null) {
-				ret.append("webgl.version = ").append(ctx.getParameterString(WebGLRenderingContext.VERSION)).append('\n');
-			}
-			if(ctx.getExtension("WEBGL_debug_renderer_info") != null) {
-				ret.append("webgl.renderer = ").append(ctx.getParameterString(/* UNMASKED_RENDERER_WEBGL */ 0x9246)).append('\n');
-				ret.append("webgl.vendor = ").append(ctx.getParameterString(/* UNMASKED_VENDOR_WEBGL */ 0x9245)).append('\n');
-			}else {
-				ret.append("webgl.renderer = ").append(ctx.getParameterString(WebGLRenderingContext.RENDERER) + " [masked]").append('\n');
-				ret.append("webgl.vendor = ").append(ctx.getParameterString(WebGLRenderingContext.VENDOR) + " [masked]").append('\n');
-			}
-			//ret.append('\n').append("\nwebgl.anisotropicGlitch = ").append(DetectAnisotropicGlitch.hasGlitch()).append('\n'); //TODO
-			ret.append('\n').append("webgl.ext.HDR16f = ").append(ctx.getExtension("EXT_color_buffer_half_float") != null).append('\n');
-			ret.append("webgl.ext.HDR32f = ").append(ctx.getExtension("EXT_color_buffer_float") != null).append('\n');
-			ret.append("webgl.ext.HDR32f_linear = ").append(ctx.getExtension("OES_texture_float_linear") != null).append('\n');
 			
-		}else {
-			ret.append("Failed to query GPU info!\n");
+			if(ctx != null) {
+				if(PlatformRuntime.webgl != null) {
+					ret.append("webgl.version = ").append(ctx.getParameterString(WebGLRenderingContext.VERSION)).append('\n');
+				}
+				if(ctx.getExtension("WEBGL_debug_renderer_info") != null) {
+					ret.append("webgl.renderer = ").append(ctx.getParameterString(/* UNMASKED_RENDERER_WEBGL */ 0x9246)).append('\n');
+					ret.append("webgl.vendor = ").append(ctx.getParameterString(/* UNMASKED_VENDOR_WEBGL */ 0x9245)).append('\n');
+				}else {
+					ret.append("webgl.renderer = ").append(ctx.getParameterString(WebGLRenderingContext.RENDERER)).append( " [masked]").append('\n');
+					ret.append("webgl.vendor = ").append(ctx.getParameterString(WebGLRenderingContext.VENDOR)).append(" [masked]").append('\n');
+				}
+				//ret.append('\n').append("\nwebgl.anisotropicGlitch = ").append(DetectAnisotropicGlitch.hasGlitch()).append('\n'); //TODO
+				int id = PlatformOpenGL.checkOpenGLESVersion();
+				if(id > 0) {
+					ret.append('\n').append("webgl.version.id = ").append(id).append('\n');
+					ret.append("webgl.experimental = ").append(experimental).append('\n');
+					if(id == 200) {
+						ret.append("webgl.ext.ANGLE_instanced_arrays = ").append(ctx.getExtension("ANGLE_instanced_arrays") != null).append('\n');
+						ret.append("webgl.ext.EXT_color_buffer_half_float = ").append(ctx.getExtension("EXT_color_buffer_half_float") != null).append('\n');
+						ret.append("webgl.ext.EXT_shader_texture_lod = ").append(ctx.getExtension("EXT_shader_texture_lod") != null).append('\n');
+						ret.append("webgl.ext.OES_fbo_render_mipmap = ").append(ctx.getExtension("OES_fbo_render_mipmap") != null).append('\n');
+						ret.append("webgl.ext.OES_texture_float = ").append(ctx.getExtension("OES_texture_float") != null).append('\n');
+						ret.append("webgl.ext.OES_texture_half_float = ").append(ctx.getExtension("OES_texture_half_float") != null).append('\n');
+						ret.append("webgl.ext.OES_texture_half_float_linear = ").append(ctx.getExtension("OES_texture_half_float_linear") != null).append('\n');
+					}else if(id >= 300) {
+						ret.append("webgl.ext.EXT_color_buffer_float = ").append(ctx.getExtension("EXT_color_buffer_float") != null).append('\n');
+						ret.append("webgl.ext.EXT_color_buffer_half_float = ").append(ctx.getExtension("EXT_color_buffer_half_float") != null).append('\n');
+						ret.append("webgl.ext.OES_texture_float_linear = ").append(ctx.getExtension("OES_texture_float_linear") != null).append('\n');
+					}
+					ret.append("webgl.ext.EXT_texture_filter_anisotropic = ").append(ctx.getExtension("EXT_texture_filter_anisotropic") != null).append('\n');
+				}else {
+					ret.append("webgl.ext.ANGLE_instanced_arrays = ").append(ctx.getExtension("ANGLE_instanced_arrays") != null).append('\n');
+					ret.append("webgl.ext.EXT_color_buffer_float = ").append(ctx.getExtension("EXT_color_buffer_float") != null).append('\n');
+					ret.append("webgl.ext.EXT_color_buffer_half_float = ").append(ctx.getExtension("EXT_color_buffer_half_float") != null).append('\n');
+					ret.append("webgl.ext.EXT_shader_texture_lod = ").append(ctx.getExtension("EXT_shader_texture_lod") != null).append('\n');
+					ret.append("webgl.ext.OES_fbo_render_mipmap = ").append(ctx.getExtension("OES_fbo_render_mipmap") != null).append('\n');
+					ret.append("webgl.ext.OES_texture_float = ").append(ctx.getExtension("OES_texture_float") != null).append('\n');
+					ret.append("webgl.ext.OES_texture_float_linear = ").append(ctx.getExtension("OES_texture_float_linear") != null).append('\n');
+					ret.append("webgl.ext.OES_texture_half_float = ").append(ctx.getExtension("OES_texture_half_float") != null).append('\n');
+					ret.append("webgl.ext.OES_texture_half_float_linear = ").append(ctx.getExtension("OES_texture_half_float_linear") != null).append('\n');
+					ret.append("webgl.ext.EXT_texture_filter_anisotropic = ").append(ctx.getExtension("EXT_texture_filter_anisotropic") != null).append('\n');
+				}
+			}else {
+				ret.append("Failed to query GPU info!\n");
+			}
+			
+			return webGLCrashStringCache = ret.toString();
+		}catch(Throwable tt) {
+			return webGLCrashStringCache = "ERROR: could not query webgl info - " + tt.toString() + "\n";
+		}
+	}
+
+	private static String shimsCrashStringCache = null;
+
+	private static String addShimsToCrash() {
+		if(shimsCrashStringCache != null) {
+			return shimsCrashStringCache;
 		}
 		
-		return webGLCrashStringCache = ret.toString();
+		try {
+			StringBuilder ret = new StringBuilder();
+			
+			ES6ShimStatus status = ES6ShimStatus.getRuntimeStatus();
+			ret.append("eaglercraft.es6shims.status = ").append(status.getStatus()).append('\n');
+			ret.append("eaglercraft.es6shims.shims = [ ");
+			Set<EnumES6Shims> shims = status.getShims();
+			boolean b = false;
+			for(EnumES6Shims shim : shims) {
+				if(b) {
+					ret.append(", ");
+				}
+				ret.append(shim);
+				b = true;
+			}
+			ret.append(" ]\n");
+			
+			return shimsCrashStringCache = ret.toString();
+		}catch(Throwable tt) {
+			return shimsCrashStringCache = "ERROR: could not query ES6 shim info - " + tt.toString() + "\n";
+		}
 	}
 
 	public static void showIncompatibleScreen(String t) {
@@ -424,12 +549,16 @@ public class ClientMain {
 			isCrashed = true;
 			
 			HTMLDocument doc = Window.current().getDocument();
-			if(configRootElement == null) {
-				configRootElement = doc.getElementById(configRootElementId);
+			HTMLElement el;
+			if(PlatformRuntime.parent != null) {
+				el = PlatformRuntime.parent;
+			}else {
+				if(configRootElement == null) {
+					configRootElement = doc.getElementById(configRootElementId);
+				}
+				el = configRootElement;
 			}
 			
-			HTMLElement el = configRootElement;
-			
 			if(el == null) {
 				System.err.println("Compatibility error: " + t);
 				return;
@@ -442,14 +571,15 @@ public class ClientMain {
 			img.setAttribute("style", "z-index:100;position:absolute;top:10px;left:calc(50% - 151px);");
 			img.setAttribute("src", crashImageWrapper());
 			div.setAttribute("style", "z-index:100;position:absolute;top:135px;left:10%;right:10%;bottom:50px;background-color:white;border:1px solid #cccccc;overflow-x:hidden;overflow-y:scroll;font:18px sans-serif;padding:40px;");
+			div.getClassList().add("_eaglercraftX_incompatible_element");
 			el.appendChild(img);
 			el.appendChild(div);
 			div.setInnerHTML("<h2><svg style=\"vertical-align:middle;margin:0px 16px 8px 8px;\" xmlns=\"http://www.w3.org/2000/svg\" width=\"48\" height=\"48\" viewBox=\"0 0 48 48\" fill=\"none\"><path stroke=\"#000000\" stroke-width=\"3\" stroke-linecap=\"square\" d=\"M1.5 8.5v34h45v-28m-3-3h-10v-3m-3-3h-10m15 6h-18v-3m-3-3h-10\"/><path stroke=\"#000000\" stroke-width=\"2\" stroke-linecap=\"square\" d=\"M12 21h0m0 4h0m4 0h0m0-4h0m-2 2h0m20-2h0m0 4h0m4 0h0m0-4h0m-2 2h0\"/><path stroke=\"#000000\" stroke-width=\"2\" stroke-linecap=\"square\" d=\"M20 30h0 m2 2h0 m2 2h0 m2 2h0 m2 -2h0 m2 -2h0 m2 -2h0\"/></svg>+ This device is incompatible with Eaglercraft&ensp;:(</h2>"
 					+ "<div style=\"margin-left:40px;\">"
-					+ "<p style=\"font-size:1.2em;\"><b style=\"font-size:1.1em;\">Issue:</b> <span style=\"color:#BB0000;\" id=\"crashReason\"></span><br /></p>"
-					+ "<p style=\"margin-left:10px;font:0.9em monospace;\" id=\"crashUserAgent\"></p>"
-					+ "<p style=\"margin-left:10px;font:0.9em monospace;\" id=\"crashWebGL\"></p>"
-					+ "<p style=\"margin-left:10px;font:0.9em monospace;\">Current Date: " + EagRuntime.fixDateFormat(new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z")).format(new Date()) + "</p>"
+					+ "<p style=\"font-size:1.2em;\"><b style=\"font-size:1.1em;\">Issue:</b> <span style=\"color:#BB0000;\" id=\"_eaglercraftX_crashReason\"></span><br /></p>"
+					+ "<p style=\"margin-left:10px;font:0.9em monospace;\" id=\"_eaglercraftX_crashUserAgent\"></p>"
+					+ "<p style=\"margin-left:10px;font:0.9em monospace;\" id=\"_eaglercraftX_crashWebGL\"></p>"
+					+ "<p style=\"margin-left:10px;font:0.9em monospace;\">Current Date: " + (new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z")).format(new Date()) + "</p>"
 					+ "<p><br /><span style=\"font-size:1.1em;border-bottom:1px dashed #AAAAAA;padding-bottom:5px;\">Things you can try:</span></p>"
 					+ "<ol>"
 					+ "<li><span style=\"font-weight:bold;\">Just try using Eaglercraft on a different device</span>, it isn't a bug it's common sense</li>"
@@ -458,12 +588,11 @@ public class ClientMain {
 					+ "<li style=\"margin-top:7px;\">If you are not using Chrome/Edge, try installing the latest Google Chrome</li>"
 					+ "<li style=\"margin-top:7px;\">If your browser is out of date, please update it to the latest version</li>"
 					+ "<li style=\"margin-top:7px;\">If you are using an old OS such as Windows 7, please try Windows 10 or 11</li>"
-					+ "<li style=\"margin-top:7px;\">If you have a GPU launched before 2009, WebGL 2.0 support may be impossible</li>"
 					+ "</ol>"
 					+ "</div>");
 			
-			div.querySelector("#crashReason").appendChild(doc.createTextNode(t));
-			div.querySelector("#crashUserAgent").appendChild(doc.createTextNode(getStringNav("userAgent")));
+			div.querySelector("#_eaglercraftX_crashReason").appendChild(doc.createTextNode(t));
+			div.querySelector("#_eaglercraftX_crashUserAgent").appendChild(doc.createTextNode(getStringNav("userAgent")));
 			
 			PlatformRuntime.removeEventHandlers();
 			
@@ -494,7 +623,7 @@ public class ClientMain {
 			}catch(Throwable tt) {
 			}
 			
-			div.querySelector("#crashWebGL").appendChild(doc.createTextNode(webGLRenderer));
+			div.querySelector("#_eaglercraftX_crashWebGL").appendChild(doc.createTextNode(webGLRenderer));
 			
 		}
 	}
@@ -504,17 +633,24 @@ public class ClientMain {
 	public static void showIntegratedServerCrashReportOverlay(String report, int x, int y, int w, int h) {
 		if(integratedServerCrashPanel == null) {
 			HTMLDocument doc = Window.current().getDocument();
-			if(configRootElement == null) {
-				configRootElement = doc.getElementById(configRootElementId);
+			HTMLElement el;
+			if(PlatformRuntime.parent != null) {
+				el = PlatformRuntime.parent;
+			}else {
+				if(configRootElement == null) {
+					configRootElement = doc.getElementById(configRootElementId);
+				}
+				el = configRootElement;
 			}
 			
 			integratedServerCrashPanel = doc.createElement("div");
 			integratedServerCrashPanel.setAttribute("style", "z-index:99;position:absolute;background-color:black;color:white;overflow-x:hidden;overflow-y:scroll;overflow-wrap:break-word;white-space:pre-wrap;font:18px sans-serif;padding:20px;display:none;");
-			configRootElement.appendChild(integratedServerCrashPanel);
+			integratedServerCrashPanel.getClassList().add("_eaglercraftX_integratedserver_crash_element");
+			el.appendChild(integratedServerCrashPanel);
 		}
 		String sourceURL = ClientPlatformSingleplayer.getLoadedWorkerSourceURLTeaVM();
 		String workerURL = ClientPlatformSingleplayer.getLoadedWorkerURLTeaVM();
-		String currentDate = EagRuntime.fixDateFormat(new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z")).format(new Date());
+		String currentDate = (new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z")).format(new Date());
 		if(workerURL != null) {
 			report = "WORKER SRC: " + sourceURL +"\nWORKER URL: " + workerURL + "\n\nCURRENT DATE: " + currentDate + "\n\n" + report.replaceAll(workerURL, "<worker_url>");
 		}else {
@@ -523,7 +659,7 @@ public class ClientMain {
 		setInnerText(integratedServerCrashPanel, "");
 		setInnerText(integratedServerCrashPanel, report);
 		CSSStyleDeclaration style = integratedServerCrashPanel.getStyle();
-		float s = (float)Window.current().getDevicePixelRatio();
+		float s = PlatformInput.getDPI();
 		style.setProperty("top", "" + (y / s) + "px");
 		style.setProperty("left", "" + (x / s) + "px");
 		style.setProperty("width", "" + ((w / s) - 20) + "px");
@@ -552,9 +688,9 @@ public class ClientMain {
 	@JSBody(params = { "v" }, script = "try { return \"\"+window.location[v]; } catch(e) { return \"<error>\"; }")
 	private static native String getStringLocation(String var);
 
-	@JSBody(params = { }, script = "try { var retObj = new Array; if(typeof window.navigator.plugins === \"object\")"
-			+ "{ var len = window.navigator.plugins.length; if(len > 0) { for(var idx = 0; idx < len; ++idx) {"
-			+ "var thePlugin = window.navigator.plugins[idx]; retObj.push({ name: thePlugin.name,"
+	@JSBody(params = { }, script = "try { var retObj = new Array; if(typeof navigator.plugins === \"object\")"
+			+ "{ var len = navigator.plugins.length; if(len > 0) { for(var idx = 0; idx < len; ++idx) {"
+			+ "var thePlugin = navigator.plugins[idx]; retObj.push({ name: thePlugin.name,"
 			+ "filename: thePlugin.filename, desc: thePlugin.description }); } } } return JSON.stringify(retObj);"
 			+ "} catch(e) { return \"<error>\"; }")
 	private static native String getStringNavPlugins();
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/DebugConsoleWindow.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/DebugConsoleWindow.java
index 20dc6a2..368a5ba 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/DebugConsoleWindow.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/DebugConsoleWindow.java
@@ -13,6 +13,7 @@ import org.teavm.jso.dom.html.HTMLDocument;
 import org.teavm.jso.dom.html.HTMLElement;
 
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 
@@ -48,31 +49,57 @@ public class DebugConsoleWindow {
 	private static final int bufferSpoolSize = 256;
 	private static final int windowMaxMessages = 2048;
 
-	private static final List<LogMessage> messageBuffer = new LinkedList();
+	private static final List<LogMessage> messageBuffer = new LinkedList<>();
 
 	public static Window parent = null;
 	public static Window logger = null;
 	private static HTMLDocument loggerDoc = null;
 	private static HTMLBodyElement loggerBody = null;
 	private static HTMLElement loggerMessageContainer = null;
+	private static EventListener<?> unload = null;
+	private static String unloadName = null;
 
 	public static void initialize(Window parentWindow) {
 		parent = parentWindow;
-		parent.addEventListener("unload", new EventListener<Event>() {
-			@Override
-			public void handleEvent(Event evt) {
-				destroyWindow();
-			}
-		});
-		if(parent.getLocalStorage() != null && "true".equals(parent.getLocalStorage().getItem(PlatformRuntime.getClientConfigAdapter().getLocalStorageNamespace() + ".showDebugConsole"))) {
+		if (PlatformRuntime.getClientConfigAdapter().isOpenDebugConsoleOnLaunch() || debugConsoleLocalStorageGet()) {
 			showDebugConsole0();
 		}
 	}
 
-	public static void showDebugConsole() {
-		if(parent.getLocalStorage() != null) {
-			parent.getLocalStorage().setItem(PlatformRuntime.getClientConfigAdapter().getLocalStorageNamespace() + ".showDebugConsole", "true");
+	public static void removeEventListeners() {
+		if(unloadName != null && unload != null) {
+			try {
+				parent.removeEventListener(unloadName, unload);
+			}catch(Throwable t) {
+			}
 		}
+		unload = null;
+		unloadName = null;
+	}
+
+	private static void debugConsoleLocalStorageSet(boolean val) {
+		try {
+			if(parent.getLocalStorage() != null) {
+				parent.getLocalStorage().setItem(PlatformRuntime.getClientConfigAdapter().getLocalStorageNamespace() + ".showDebugConsole", Boolean.toString(val));
+			}
+		}catch(Throwable t) {
+		}
+	}
+
+	private static boolean debugConsoleLocalStorageGet() {
+		try {
+			if(parent.getLocalStorage() != null) {
+				return Boolean.valueOf(parent.getLocalStorage().getItem(PlatformRuntime.getClientConfigAdapter().getLocalStorageNamespace() + ".showDebugConsole"));
+			}else {
+				return false;
+			}
+		}catch(Throwable t) {
+			return false;
+		}
+	}
+
+	public static void showDebugConsole() {
+		debugConsoleLocalStorageSet(true);
 		showDebugConsole0();
 	}
 
@@ -81,12 +108,27 @@ public class DebugConsoleWindow {
 
 	private static void showDebugConsole0() {
 		if(logger == null) {
-			int w = (int)(1000 * parent.getDevicePixelRatio());
-			int h = (int)(400 * parent.getDevicePixelRatio());
+			try {
+				parent.addEventListener(
+						unloadName = ((TeaVMClientConfigAdapter) PlatformRuntime.getClientConfigAdapter())
+								.isFixDebugConsoleUnloadListenerTeaVM() ? "beforeunload" : "unload",
+						unload = new EventListener<Event>() {
+							@Override
+							public void handleEvent(Event evt) {
+								destroyWindow();
+							}
+						});
+			}catch(Throwable t) {
+			}
+			float s = PlatformInput.getDPI();
+			int w = (int)(1000 * s);
+			int h = (int)(400 * s);
 			int x = (parent.getScreen().getWidth() - w) / 2;
 			int y = (parent.getScreen().getHeight() - h) / 2;
 			logger = parent.open("", "_blank", "top=" + y + ",left=" + x + ",width=" + w + ",height=" + h + ",menubar=0,status=0,titlebar=0,toolbar=0");
-			if(logger == null) {
+			if(logger == null || TeaVMUtils.isNotTruthy(logger)) {
+				logger = null;
+				debugConsoleLocalStorageSet(false);
 				LogManager.getLogger("DebugConsoleWindow").error("Logger popup was blocked!");
 				Window.alert("ERROR: Popup blocked!\n\nPlease make sure you have popups enabled for this site!");
 				return;
@@ -110,9 +152,8 @@ public class DebugConsoleWindow {
 				public void handleEvent(Event evt) {
 					if(logger != null) {
 						logger = null;
-						if(parent.getLocalStorage() != null) {
-							parent.getLocalStorage().setItem(PlatformRuntime.getClientConfigAdapter().getLocalStorageNamespace() + ".showDebugConsole", "false");
-						}
+						debugConsoleLocalStorageSet(false);
+						removeEventListeners();
 					}
 				}
 			};
@@ -139,10 +180,12 @@ public class DebugConsoleWindow {
 	}
 
 	private static void appendLogMessageAndScroll(String text, String color) {
-		boolean b = isScrollToEnd(logger, loggerDoc);
-		appendLogMessage(text, color);
-		if(b) {
-			scrollToEnd0(logger, loggerDoc);
+		if(logger != null) {
+			boolean b = isScrollToEnd(logger, loggerDoc);
+			appendLogMessage(text, color);
+			if(b) {
+				scrollToEnd0(logger, loggerDoc);
+			}
 		}
 	}
 
@@ -167,7 +210,11 @@ public class DebugConsoleWindow {
 		if(logger != null) {
 			Window w = logger;
 			logger = null;
-			w.close();
+			try {
+				w.close();
+			}catch(Throwable t) {
+			}
+			removeEventListeners();
 		}
 	}
 
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ES6ShimStatus.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ES6ShimStatus.java
new file mode 100755
index 0000000..31b4a02
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ES6ShimStatus.java
@@ -0,0 +1,82 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.teavm.jso.JSBody;
+
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ES6ShimStatus {
+
+	private static final Logger logger = LogManager.getLogger("ES6ShimStatus");
+
+	private static ES6ShimStatus instance = null;
+
+	@JSBody(params = { }, script = "return (typeof __eaglercraftXES6ShimStatus === \"object\") ? __eaglercraftXES6ShimStatus : null;")
+	private static native ES6ShimStatusJS getRuntimeStatus0();
+
+	public static ES6ShimStatus getRuntimeStatus() {
+		if(instance == null) {
+			return instance = new ES6ShimStatus(getRuntimeStatus0());
+		}
+		ES6ShimStatusJS jsImpl = getRuntimeStatus0();
+		if(instance.impl != jsImpl) {
+			instance = new ES6ShimStatus(jsImpl);
+		}
+		return instance;
+	}
+
+	private final ES6ShimStatusJS impl;
+	private final EnumES6ShimStatus status;
+	private final Set<EnumES6Shims> shims;
+
+	public ES6ShimStatus(ES6ShimStatusJS impl) {
+		this.impl = impl;
+		if(impl != null && TeaVMUtils.isTruthy(impl)) {
+			this.status = EnumES6ShimStatus.getStatusById(impl.getShimInitStatus());
+			this.shims = EnumSet.noneOf(EnumES6Shims.class);
+			for(int i = 0, id, l = impl.getEnabledShimCount(); i < l; ++i) {
+				id = impl.getEnabledShimID(i);
+				EnumES6Shims theShim = EnumES6Shims.getShimById(id);
+				if(theShim != null) {
+					this.shims.add(theShim);
+				}else {
+					logger.warn("Ignoring unknown shim id: {}", id);
+				}
+			}
+		}else {
+			this.status = EnumES6ShimStatus.STATUS_NOT_PRESENT;
+			this.shims = EnumSet.noneOf(EnumES6Shims.class);
+		}
+	}
+
+	public ES6ShimStatusJS getImpl() {
+		return impl;
+	}
+
+	public EnumES6ShimStatus getStatus() {
+		return status;
+	}
+
+	public Set<EnumES6Shims> getShims() {
+		return shims;
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ES6ShimStatusJS.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ES6ShimStatusJS.java
new file mode 100755
index 0000000..49f08be
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ES6ShimStatusJS.java
@@ -0,0 +1,52 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSObject;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface ES6ShimStatusJS extends JSObject {
+
+	public static final int INIT_STATUS_ERROR = -1;
+	public static final int INIT_STATUS_DISABLED = 0;
+	public static final int INIT_STATUS_ENABLED = 1;
+	public static final int INIT_STATUS_DISABLED_ERRORS = 2;
+	public static final int INIT_STATUS_ENABLED_ERRORS = 3;
+
+	public static final int SHIM_MAP = 0;
+	public static final int SHIM_WEAKMAP = 1;
+	public static final int SHIM_SET = 2;
+	public static final int SHIM_WEAKSET = 3;
+	public static final int SHIM_PROMISE = 4;
+	public static final int SHIM_STRING_FROM_CODE_POINT = 5;
+	public static final int SHIM_STRING_CODE_POINT_AT = 6;
+	public static final int SHIM_STRING_STARTS_WITH = 7;
+	public static final int SHIM_STRING_ENDS_WITH = 8;
+	public static final int SHIM_STRING_INCLUDES = 9;
+	public static final int SHIM_STRING_REPEAT = 10;
+	public static final int SHIM_ARRAY_FILL = 11;
+	public static final int SHIM_OBJECT_IS = 12;
+	public static final int SHIM_OBJECT_SET_PROTOTYPE_OF = 13;
+	public static final int SHIM_FUNCTION_NAME = 14;
+	public static final int SHIM_MATH_SIGN = 15;
+	public static final int SHIM_SYMBOL = 16;
+
+	int getShimInitStatus();
+
+	int getEnabledShimCount();
+
+	int getEnabledShimID(int idx);
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java
index e5b8be3..d0d436f 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java
@@ -11,6 +11,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
+import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
 import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
@@ -38,11 +39,20 @@ public class EarlyLoadScreen {
 
 	public static final String loadScreen = "iVBORw0KGgoAAAANSUhEUgAAAMAAAADACAYAAABS3GwHAAAACXBIWXMAAAsTAAALEwEAmpwYAAAHx0lEQVR42u3da27jIBRAYbfqFp1FuovM/GLEMIDBhsRJviNVapsYY8y5vPz4ut/v9wX4UL4VAQgAEAAgAEAAgAAAAQACAAQACAAQACAAQACAAAABAAIABAAIABAAIABAAIAAAAEAAgAEAAgAEAAgAEAAgAAAAQACAAQACAAQACAAQACAAAABAAIABAAIABAAIABAAIAAAAEAAgAEAAgAEAAgAAgAEAAgAEAAgAAAAQACAAQACAAQACAAQACAAMBr86MI3ovf39/i/9Z1XdZ1VUgEeN/Kf7vdqt8hgC7QW6OCE+CjK/+2bcv9fieCLtDjux9x/1t/u1xOveWSlisBXmQASoB/+fr6+vv7/X7vHteE8hxZrrpAkyo/2mU42soSgAAfN8YZ3aoSQOV/GNu2ZX9vGdjPEuBnVmXIVYqePly8famCne0TtuS1tt/a9kfSbWnqZw2u9yQesc91XZv7/iO2a+I+iG3b7uu63pdl2f1Z17WaTksaaXrbtk3JaynvR/O5l6/WtPaON3d8tf3v7e9d+RkVPeIVyDRKpREtfL+nGdxL7/f3d9m2bTdS5VZL4/Rz0fcRszm32604jZrLUyi/UXlb1/WlunKhTE63iCMif0tkao1IaXqlqFWKlr2RsTUPpXRLrUnYpqVlircfdby9LUCpbHpa1lyeW8tgL51SmZ9N+2dE5GqJlrkI0xJxaumV0ixt0xrd07TDdrl+aDoeGNnfbzne0RE1HqSOaF3SljptyXP7qF3QN3zi4Yw9LdF0r5+Zs7u175mLirU85KJiLbK3pt2bj1qZ1CJaz356WoD0u2ejaq11XNf1708uf73jqqeOAXotbIlgZ/t0tfSPRulZ050j0jubRjz2CGU/clyRRvvwv1LPIR4X5r6TtlJPmwY9W5la54vfea5+Zhm2dnniyj+j3GtdxCsMzL+vWAmuyujK2dLXnVGGYSZsduXPlV0625Vbk0nlnFlXhrYAezdjPFOa2sD4GRetlY5hdhnmpoHjKcXZlb927Llp4JCvWYHy8leDxpHgbCH0zBo9s3vyiLK8QiBIxwiPaHWnjwFGZbjl9r5RAtxut92Fp5GLTqPHP735qpXDrK5QbjFz27b/Wp802IXu2Yz6cGoadDmwCHV0enVJFpbCfkqLQ6Mvg9g7riPToEfyfrYMl4ZLOUadw1rZh33H/ytNjcbnunfavakeX02As3P1rZVoT4KeVdBXESDN05HV4pFXDaQrxqkE6TnISfC0dYAZA5PSSu3orkeYiSil/Sl3cm3b9t+NKbMHxHtTpenvcT7C33Gez+b1e3QFvvrUY2nhZ/Qi0KtMC+f6/KWpytnnsjWoXuKWyNaZkyud/HTh55mVvTYt++h8zDiXlTFnkwS1wfhlBZgxj917acNe9H9mZWuJvjPuez0azJ5RPj1T3kMe/zJyUNMzkMpdJts6MNybyckNXo/cwLI0XtZ8ZkaldBwt2x65RHvGMRwZoO9dWLh3CfqofC0zZhtKU5fpiWkVIE4n3b423Zemf0SA5cQdVenxt9x70FJ+8TEfkbxUuXqDytnp0L2p0kewzJjeOnMSWtKKt92rQCNageXEDTot05xH1iZy5Xf2lsra9iMrZDjW2dG9ha/7wLuNS5ctpDevt9y2WBu0ptvnxh2l75YutOrtu+/1m+N8tw66022PlGHrcfVuP+NCwNrg+2ETFPcPI45yLSu8s1Yg8UY3xb8K6WP2WualrzJjhDl8f2Ll721iPeiWAG8hwMw+LQhw6co/cpWaPO/DR4wBchU23APQMiMy43EhuAZDp0FfaQxwRCJjAQK8xTigp0uk4hPgowbH+vkEAD4GL8gAAQACAAQACAAQACAAQACAAAABAAIABAAIABAAIABAAIAAAAEAAgAEAK7NJR6M9S6PLQzPHZr1sulSuXmCxQu3APHz+sNP6wOspr09/CL76ym3Tzr2t2sBHhk13+UYwgsmnvFeXwI8qUtRinZxZNq27e/3tm3Lvg8gjWRpxc09Rj3eb2l/ufTiZ5CG78Sfn305eO7durX8tH4W8pB+Pz32vTQJcGAcED+0Nv5//Pbw9GTl+sKh8sVRMo2WoWkPJy0WpiRB6XVFpa5IvF28v3RfvX36mpylBwKXPktbkjiI1I69liYBTg6E4wqTkyOWolRB4nTSE5XuszaI3dvfngRppM1F+9auTG4fuW1raeXendYiWk+aBBjQf44jZW/TWoriV3gRddwi9L57IPfY9lA5Q3nF6YZyq33WIkLt/NTSJMCAcUD4/Wzhxt2o3Hjg0a3emSdPt7Q2t9vtn3KrfXY0L7U091rWo599xBggjSgh0pSa79aTl4ugaR8913qU9ld6vWlvd6bn+7mB+96MUHpcLULtHftemlqAAwKEwVd6MtNBbK4C7kWLuMkuDT5zA+za/nKzMC0VOu0CtXQhal2UeKCfG2PUPsvNZrUcey3NV8Dj0Z/cvctNQ77DmogWAM0S7M0gQQvwluS6HFZ0CQA8DJdDgwAAAQACAAQACAAQACAAQACAAAABAAIABAAIABAAIABAAIAAAAEAAgAEAAgAEAAgAEAAgAAAAQACAAQACAAQACAAQACAAAABAAIABAAIABAAIABAAIAAAAEAAgAEAAgAEAAgAEAAgAAAAYBlWf4A1W4Hx65cJAoAAAAASUVORK5CYII=";
 	public static final String enableScreen = "iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAC4jAAAuIwF4pT92AAAEAklEQVR42u2dvXbjIBBG7T0+xw+gTp06v//LmE6dO/VR5a3wGZNh+BGSFeveJgkIBrDy8TGKds8/Pz/PExyW8/P55AY4MP9YgmNzmeeZVUABAA8AKADgAQAFADwAoACABwAUAPAAgAIAHgBQAMADAAoAeABAAY7LOI7fpQDX65VPtZCt18w5d7rdbigAbOgBxnE8DcPwJnnDMCTrNJlsUVcizTnj9HWxeVvINfN9y361OdTEk30551ZZt3PsvYDYxOSChoPQ6sJ21mRLBm61jY0lpy61gDKWNdfcNcv5wErWLbfPF88I9/s9WtayzopXS85YtPqcMeT23SqedV1pucal1V4iTUooV/IaWSfbWHU5JmkvpmzrsayaB9DqfJnVTpMff72sc869/WzVlcjjOI7mOOVYfBzfT05exLfT5pqae008a71Ly6tPASV79CfPylvFjpm+teLH+tXiF5nA2LOAUMpCibckWpPBUOJT20btFuDjyK8p+S45Z4fX+ti+LDb3pef62PosWbfkDbBW8mFPhB/gt8Vr7gG+kZK9+C/GM2+ArffnnKRHbT5gSdJoK0+ydrziGyCW115LolLxnHOr59q3lt89b6U8Czg4pgdI5bUtKY3VzfOclGBtTLVSmmqn1cdyC7Iud+5791KX1MLJDz3Mg2s59pK6sM/asdTmLrRx5pzjS+e+awWw9lstVeuv1/a10rqwT8sn5LQr8RzaMVfmKrR2qfnFjs57/puLS0nyoTZp0fL8XGq+ap8v4AES+3Msx74kN2/tmblewWoXPl9o+RykZH5/5hTQYv+y+vj084XcPHpJbHmt1s7yGbV1q+UBnHO/gnoZje2RmuzK/Vr2F3sWEF6TGkvutqH5CG08qTmk5u77tLyK5Qtq62rgxRA8AO8FHBkygQeHLQAFADwAoACABwAUAPAAgAIAHgBQAMADAAoAeABAAQAPACgA4AEABQA8AKAAgAcAFAC+3gNM03Tqum7VQSyN4dtvMdZDKcBWC9oqhr8JoIEHeDwep77vf5VJfL0vl9fLa/u+f+vPfx9eszSGNXZo5AH6vlcXW36gsqykrzViwAIPYL3r3nXd63v5m6i9J2+VaT8viWGNHZQbYE97+KdjHPIGKH0XPSyL7eXSjPk2YZlsN03Tq21OjLAs598ZggIT2MpMbW3IMICFN0Dsv4xpfUbfAvIAK9wAcOAtAMgDwJHzAIACAB4AUADAAwAKAHgAQAEADwAoAOABAAUAPACgAIAHABQA8ACAAgAeAFAAwAMACgB4AEABAA8AKADgAQAFADwAoACABwAUAPAAgAIAHgBQAMADAAoAeABAAQAPACgA4AEABQA8AKAAgAcAFADwANCe/0of1jQ8XY5YAAAAAElFTkSuQmCC";
+	public static final String pressDeleteText = "iVBORw0KGgoAAAANSUhEUgAAAYAAAAAQCAYAAAAf1qhIAAAAxHpUWHRSYXcgcHJvZmlsZSB0eXBlIGV4aWYAAHjabVBbDsMgDPvnFDtCXoVwHLp20m6w489AkNZtlnDcJDUh6Xw9H+nWIWzJtuK55kyAVavSIJwm2mAmGzzgS/E1nyISCVKKqPFDnpFXfjVG5Aa1fRj5PQr7tVAt/P3LKC7SPpFAHGFUw0hlFjgM2nwW5erl8wn7SVf4PKnTHq5jIvr9toLtHRvuUZFTWQmsmucA2o8lbRAFjERvREPP+GCOSbCQf3taSG9BflnMtBtpAwAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAilJREFUeNrtXFsSgyAMrI735GyetP1yhnEoCWQDUXb/HApsXiQg9vMhCIIglsSWUvqWGs7z3J4gQIl/zv2ffNfv7u0WuVNK38h6i85vBf6z4mvE3D32GamT2f4T0X/3nNB5ntv1XFs4I+HOv+ZUuXy1/qhEFD1RPnXxfCpmBv+IxTWyTmb7j2b+lNJ3NM/9bVsaTQJ7chVJEASBwrGq4EwCBEGsviaJCeCqpO/n5dI5O7IdvRVDjn3nnusLJV+tv2QfKz+N/S38tfP/49/yjOJf4i6Nb9nae8ePp3165UStHwh+3vFXkx0Rn7X+GyqopKDobW8xkMRXUjDiHYBm7Jb5NP2lZys/zfi9/LVctfx75LHa2RovI/TXolekfazxO5ufd/xZ7WPV36HNQsjqXOrvVf2Xbv0Q47eqKx2/IYqLaPrj8el74vdAGbZ2nbT0dvuaS2qn89qPEGaOr7Vv5MQ8k9so/bEweu9iX/OfAzmRtu0ilCeBWjvhn7g8x9fYN6qtpePEGbb30B9jbZ21I/effVWlSIHMioggiLfDJQHkWw7p4wb0xw8tL1u8Fn/vDzqs44+0Sc9Yo30meqGC1p+3/qPbZza/kfNLc22tZ4ulhXXmNVD0X0FYtsW919hQMkq3XHr4Id7NoOyv4V+6+YDUf2187S20ET7eEsfe9vGWLzo/zfwI+7T4H4/8iGWw0o6BoH9NPwIiCIIg4oPbAOL11Rm3vgT9q4wf9EvmXAdD8AMAAAAASUVORK5CYII=";
 
 	private static IBufferGL vbo = null;
 	private static IProgramGL program = null;
-	
-	public static void paintScreen() {
+
+	private static ITextureGL pressDeleteTexture = null;
+	private static IProgramGL pressDeleteProgram = null;
+
+	private static ITextureGL finalTexture = null;
+
+	public static void paintScreen(int glesVers, boolean vaos, boolean showPressDeleteText) {
+		boolean gles3 = glesVers >= 300;
+		
+		// create textures:
 		
 		ITextureGL tex = _wglGenTextures();
 		_wglActiveTexture(GL_TEXTURE0);
@@ -59,6 +69,21 @@ public class EarlyLoadScreen {
 		pixelUpload.flip();
 		_wglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 192, 192, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixelUpload);
 		
+		pressDeleteTexture = _wglGenTextures();
+		_wglBindTexture(GL_TEXTURE_2D, pressDeleteTexture);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+		
+		pixelUpload.clear();
+		img = PlatformAssets.loadImageFile(Base64.decodeBase64(pressDeleteText));
+		pixelUpload.put(img.pixels);
+		pixelUpload.flip();
+		_wglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 384, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixelUpload);
+		
+		// create vertex buffer:
+		
 		FloatBuffer vertexUpload = upload.asFloatBuffer();
 		vertexUpload.clear();
 		vertexUpload.put(0.0f); vertexUpload.put(0.0f);
@@ -75,18 +100,27 @@ public class EarlyLoadScreen {
 		
 		PlatformRuntime.freeByteBuffer(upload);
 
+		// compile the splash shader:
+		
 		IShaderGL vert = _wglCreateShader(GL_VERTEX_SHADER);
-		_wglShaderSource(vert, "#version 300 es\nprecision lowp float; layout(location = 0) in vec2 a_pos; out vec2 v_pos; void main() { gl_Position = vec4(((v_pos = a_pos) - 0.5) * vec2(2.0, -2.0), 0.0, 1.0); }");
+		_wglShaderSource(vert, gles3
+				? "#version 300 es\nprecision mediump float; layout(location = 0) in vec2 a_pos; out vec2 v_pos; void main() { gl_Position = vec4(((v_pos = a_pos) - 0.5) * vec2(2.0, -2.0), 0.0, 1.0); }"
+				: "#version 100\nprecision mediump float; attribute vec2 a_pos; varying vec2 v_pos; void main() { gl_Position = vec4(((v_pos = a_pos) - 0.5) * vec2(2.0, -2.0), 0.0, 1.0); }");
 		_wglCompileShader(vert);
 		
 		IShaderGL frag = _wglCreateShader(GL_FRAGMENT_SHADER);
-		_wglShaderSource(frag, "#version 300 es\nprecision lowp float; in vec2 v_pos; layout(location = 0) out vec4 fragColor; uniform sampler2D tex; uniform vec2 aspect; void main() { fragColor = vec4(texture(tex, clamp(v_pos * aspect - ((aspect - 1.0) * 0.5), 0.02, 0.98)).rgb, 1.0); }");
+		_wglShaderSource(frag, gles3
+				? "#version 300 es\nprecision mediump float; precision mediump sampler2D; in vec2 v_pos; layout(location = 0) out vec4 fragColor; uniform sampler2D tex; uniform vec2 aspect; void main() { fragColor = vec4(textureLod(tex, clamp(v_pos * aspect - ((aspect - 1.0) * 0.5), 0.02, 0.98), 0.0).rgb, 1.0); }"
+				: "#version 100\nprecision mediump float; precision mediump sampler2D; varying vec2 v_pos; uniform sampler2D tex; uniform vec2 aspect; void main() { gl_FragColor = vec4(texture2D(tex, clamp(v_pos * aspect - ((aspect - 1.0) * 0.5), 0.02, 0.98)).rgb, 1.0); }");
 		_wglCompileShader(frag);
 		
 		program = _wglCreateProgram();
 		
 		_wglAttachShader(program, vert);
 		_wglAttachShader(program, frag);
+		if(!gles3) {
+			_wglBindAttribLocation(program, 0, "a_pos");
+		}
 		_wglLinkProgram(program);
 		_wglDetachShader(program, vert);
 		_wglDetachShader(program, frag);
@@ -96,6 +130,38 @@ public class EarlyLoadScreen {
 		_wglUseProgram(program);
 		_wglUniform1i(_wglGetUniformLocation(program, "tex"), 0);
 
+		// compile the delete key text shader:
+		
+		if(showPressDeleteText) {
+			vert = _wglCreateShader(GL_VERTEX_SHADER);
+			_wglShaderSource(vert, gles3
+					? "#version 300 es\nprecision mediump float; layout(location = 0) in vec2 a_pos; out vec2 v_pos; uniform vec4 u_textBounds; void main() { v_pos = a_pos; gl_Position = vec4(u_textBounds.xy + u_textBounds.zw * a_pos, 0.0, 1.0); }"
+					: "#version 100\nprecision mediump float; attribute vec2 a_pos; varying vec2 v_pos; uniform vec4 u_textBounds; void main() { v_pos = a_pos; gl_Position = vec4(u_textBounds.xy + u_textBounds.zw * a_pos, 0.0, 1.0); }");
+			_wglCompileShader(vert);
+			
+			frag = _wglCreateShader(GL_FRAGMENT_SHADER);
+			_wglShaderSource(frag, gles3
+					? "#version 300 es\nprecision mediump float; precision mediump sampler2D; in vec2 v_pos; layout(location = 0) out vec4 fragColor; uniform sampler2D tex; void main() { fragColor = textureLod(tex, v_pos, 0.0); if(fragColor.a < 0.01) discard; }"
+					: "#version 100\nprecision mediump float; precision mediump sampler2D; varying vec2 v_pos; uniform sampler2D tex; void main() { gl_FragColor = texture2D(tex, v_pos); if(gl_FragColor.a < 0.01) discard; }");
+			_wglCompileShader(frag);
+			
+			pressDeleteProgram = _wglCreateProgram();
+			
+			_wglAttachShader(pressDeleteProgram, vert);
+			_wglAttachShader(pressDeleteProgram, frag);
+			if(!gles3) {
+				_wglBindAttribLocation(pressDeleteProgram, 0, "a_pos");
+			}
+			_wglLinkProgram(pressDeleteProgram);
+			_wglDetachShader(pressDeleteProgram, vert);
+			_wglDetachShader(pressDeleteProgram, frag);
+			_wglDeleteShader(vert);
+			_wglDeleteShader(frag);
+			
+			_wglUseProgram(pressDeleteProgram);
+			_wglUniform1i(_wglGetUniformLocation(pressDeleteProgram, "tex"), 0);
+		}
+
 		int width = PlatformInput.getWindowWidth();
 		int height = PlatformInput.getWindowHeight();
 		float x, y;
@@ -113,14 +179,23 @@ public class EarlyLoadScreen {
 		_wglViewport(0, 0, width, height);
 		_wglClearColor(1.0f, 1.0f, 1.0f, 1.0f);
 		_wglClear(GL_COLOR_BUFFER_BIT);
-		
+
+		_wglUseProgram(program);
 		_wglUniform2f(_wglGetUniformLocation(program, "aspect"), x, y);
 		
-		IBufferArrayGL vao = _wglGenVertexArrays();
-		_wglBindVertexArray(vao);
+		IBufferArrayGL vao = null;
+		if(vaos) {
+			vao = _wglGenVertexArrays();
+			_wglBindVertexArray(vao);
+		}
 		_wglEnableVertexAttribArray(0);
 		_wglVertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
 		_wglDrawArrays(GL_TRIANGLES, 0, 6);
+
+		if(showPressDeleteText) {
+			renderPressDeleteText(x, y);
+		}
+		
 		_wglDisableVertexAttribArray(0);
 		
 		PlatformInput.update();
@@ -130,10 +205,12 @@ public class EarlyLoadScreen {
 		_wglBindBuffer(GL_ARRAY_BUFFER, null);
 		_wglBindTexture(GL_TEXTURE_2D, null);
 		_wglDeleteTextures(tex);
-		_wglDeleteVertexArrays(vao);
+		if(vaos) {
+			_wglDeleteVertexArrays(vao);
+		}
 	}
-	
-	public static void paintEnable() {
+
+	public static void paintEnable(boolean vaos, boolean showPressDeleteText) {
 		
 		ITextureGL tex = _wglGenTextures();
 		_wglActiveTexture(GL_TEXTURE0);
@@ -172,12 +249,20 @@ public class EarlyLoadScreen {
 		
 		_wglUniform2f(_wglGetUniformLocation(program, "aspect"), x, y);
 
-		IBufferArrayGL vao = _wglGenVertexArrays();
-		_wglBindVertexArray(vao);
+		IBufferArrayGL vao = null;
+		if(vaos) {
+			vao = _wglGenVertexArrays();
+			_wglBindVertexArray(vao);
+		}
 		_wglBindBuffer(GL_ARRAY_BUFFER, vbo);
 		_wglEnableVertexAttribArray(0);
 		_wglVertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
 		_wglDrawArrays(GL_TRIANGLES, 0, 6);
+		
+		if(showPressDeleteText) {
+			renderPressDeleteText(x, y);
+		}
+		
 		_wglDisableVertexAttribArray(0);
 		
 		PlatformInput.update();
@@ -187,14 +272,16 @@ public class EarlyLoadScreen {
 		_wglBindBuffer(GL_ARRAY_BUFFER, null);
 		_wglBindTexture(GL_TEXTURE_2D, null);
 		_wglDeleteTextures(tex);
-		_wglDeleteVertexArrays(vao);
+		if(vaos) {
+			_wglDeleteVertexArrays(vao);
+		}
 		
 	}
-	
-	public static void paintFinal(byte[] image) {
-		ITextureGL tex = _wglGenTextures();
+
+	public static void loadFinal(byte[] image) {
+		finalTexture = _wglGenTextures();
 		_wglActiveTexture(GL_TEXTURE0);
-		_wglBindTexture(GL_TEXTURE_2D, tex);
+		_wglBindTexture(GL_TEXTURE_2D, finalTexture);
 		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -204,9 +291,13 @@ public class EarlyLoadScreen {
 		upload.put(img.pixels);
 		upload.flip();
 		_wglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, upload);
-		
 		PlatformRuntime.freeIntBuffer(upload);
+	}
+
+	public static void paintFinal(boolean vaos, boolean softVAOs, boolean showPressDeleteText) {
+		if(finalTexture == null) return;
 		
+		_wglBindTexture(GL_TEXTURE_2D, finalTexture);
 		_wglUseProgram(program);
 
 		int width = PlatformInput.getWindowWidth();
@@ -221,7 +312,7 @@ public class EarlyLoadScreen {
 		}
 		
 		_wglActiveTexture(GL_TEXTURE0);
-		_wglBindTexture(GL_TEXTURE_2D, tex);
+		_wglBindTexture(GL_TEXTURE_2D, finalTexture);
 		
 		_wglViewport(0, 0, width, height);
 		_wglClearColor(1.0f, 1.0f, 1.0f, 1.0f);
@@ -229,26 +320,91 @@ public class EarlyLoadScreen {
 		
 		_wglUniform2f(_wglGetUniformLocation(program, "aspect"), x, y);
 
-		IBufferArrayGL vao = _wglGenVertexArrays();
-		_wglBindVertexArray(vao);
-		_wglBindBuffer(GL_ARRAY_BUFFER, vbo);
-		_wglEnableVertexAttribArray(0);
-		_wglVertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
-		_wglDrawArrays(GL_TRIANGLES, 0, 6);
-		_wglDisableVertexAttribArray(0);
+		IBufferArrayGL vao = null;
+		if(vaos) {
+			if(softVAOs) {
+				vao = EaglercraftGPU.createGLBufferArray();
+				EaglercraftGPU.bindGLBufferArray(vao);
+			}else {
+				vao = _wglGenVertexArrays();
+				_wglBindVertexArray(vao);
+			}
+		}
+		if(vaos && softVAOs) {
+			EaglercraftGPU.bindVAOGLArrayBuffer(vbo);
+			EaglercraftGPU.enableVertexAttribArray(0);
+			EaglercraftGPU.vertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
+			EaglercraftGPU.doDrawArrays(GL_TRIANGLES, 0, 6);
+		}else {
+			_wglBindBuffer(GL_ARRAY_BUFFER, vbo);
+			_wglEnableVertexAttribArray(0);
+			_wglVertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
+			_wglDrawArrays(GL_TRIANGLES, 0, 6);
+		}
+		
+		if(!softVAOs && showPressDeleteText) {
+			renderPressDeleteText(x, y);
+		}
+
+		if(!softVAOs) {
+			_wglDisableVertexAttribArray(0);
+		}
 		
 		PlatformInput.update();
 		EagUtils.sleep(50l); // allow webgl to flush
 
 		_wglUseProgram(null);
-		_wglBindBuffer(GL_ARRAY_BUFFER, null);
+		if(!(vaos && softVAOs)) {
+			_wglBindBuffer(GL_ARRAY_BUFFER, null);
+		}
 		_wglBindTexture(GL_TEXTURE_2D, null);
-		_wglDeleteTextures(tex);
-		_wglDeleteVertexArrays(vao);
+		if(softVAOs) {
+			EaglercraftGPU.clearCurrentBinding(EaglercraftGPU.CLEAR_BINDING_ACTIVE_TEXTURE | EaglercraftGPU.CLEAR_BINDING_TEXTURE0);
+		}
+		if(vaos) {
+			if(softVAOs) {
+				EaglercraftGPU.destroyGLBufferArray(vao);
+			}else {
+				_wglDeleteVertexArrays(vao);
+			}
+		}
 	}
-	
+
+	private static void renderPressDeleteText(float aspectX, float aspectY) {
+		aspectX = 1.0f / aspectX;
+		aspectY = 1.0f / aspectY;
+		float deleteTextRatio = 16.0f / 384.0f;
+		float originX = -aspectX;
+		float originY = -aspectY + deleteTextRatio * 3.0f * aspectY;
+		float width = aspectX * 2.0f;
+		float height = aspectY * deleteTextRatio * 2.0f;
+		_wglUseProgram(pressDeleteProgram);
+		_wglUniform4f(_wglGetUniformLocation(pressDeleteProgram, "u_textBounds"), originX, originY, width, -height);
+		_wglBindTexture(GL_TEXTURE_2D, pressDeleteTexture);
+		_wglDrawArrays(GL_TRIANGLES, 0, 6);
+	}
+
 	public static void destroy() {
-		_wglDeleteBuffers(vbo);
-		_wglDeleteProgram(program);
+		if(vbo != null) {
+			_wglDeleteBuffers(vbo);
+			vbo = null;
+		}
+		if(program != null) {
+			_wglDeleteProgram(program);
+			program = null;
+		}
+		if(pressDeleteTexture != null) {
+			_wglDeleteTextures(pressDeleteTexture);
+			pressDeleteTexture = null;
+		}
+		if(pressDeleteProgram != null) {
+			_wglDeleteProgram(pressDeleteProgram);
+			pressDeleteProgram = null;
+		}
+		if(finalTexture != null) {
+			_wglDeleteTextures(finalTexture);
+			finalTexture = null;
+		}
 	}
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EnumES6ShimStatus.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EnumES6ShimStatus.java
new file mode 100755
index 0000000..47161cb
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EnumES6ShimStatus.java
@@ -0,0 +1,56 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumES6ShimStatus {
+	STATUS_NOT_PRESENT(Integer.MIN_VALUE, "Not present"),
+	STATUS_ERROR(ES6ShimStatusJS.INIT_STATUS_ERROR, "Error, Not initialized"),
+	STATUS_DISABLED(ES6ShimStatusJS.INIT_STATUS_DISABLED, "Disabled"),
+	STATUS_ENABLED(ES6ShimStatusJS.INIT_STATUS_ENABLED, "Enabled"),
+	STATUS_DISABLED_ERRORS(ES6ShimStatusJS.INIT_STATUS_DISABLED_ERRORS, "Errors; Disabled"),
+	STATUS_ENABLED_ERRORS(ES6ShimStatusJS.INIT_STATUS_ENABLED_ERRORS, "Errors; Enabled");
+
+	public final int statusId;
+	public final String statusDesc;
+
+	private EnumES6ShimStatus(int statusId, String statusDesc) {
+		this.statusId = statusId;
+		this.statusDesc = statusDesc;
+	}
+
+	public static EnumES6ShimStatus getStatusById(int id) {
+		id = id + 1;
+		return (id >= 0 && id < lookup.length) ? lookup[id] : null;
+	}
+
+	public boolean isEnabled() {
+		return (statusId != -1) && (statusId & 1) != 0;
+	}
+
+	public boolean isErrored() {
+		return (statusId == -1) || (statusId & 2) != 0;
+	}
+
+	private static final EnumES6ShimStatus[] lookup = new EnumES6ShimStatus[5];
+
+	static {
+		EnumES6ShimStatus[] _values = values();
+		for(int i = 0; i < _values.length; ++i) {
+			lookup[_values[i].statusId + 1] = _values[i];
+		}
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EnumES6Shims.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EnumES6Shims.java
new file mode 100755
index 0000000..e351846
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EnumES6Shims.java
@@ -0,0 +1,58 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public enum EnumES6Shims {
+	SHIM_CLASS_MAP(ES6ShimStatusJS.SHIM_MAP, "Map"),
+	SHIM_CLASS_WEAKMAP(ES6ShimStatusJS.SHIM_WEAKMAP, "WeakMap"),
+	SHIM_CLASS_SET(ES6ShimStatusJS.SHIM_SET, "Set"),
+	SHIM_CLASS_WEAKSET(ES6ShimStatusJS.SHIM_WEAKSET, "WeakSet"),
+	SHIM_CLASS_PROMISE(ES6ShimStatusJS.SHIM_PROMISE, "Promise"),
+	SHIM_STRING_FROM_CODE_POINT(ES6ShimStatusJS.SHIM_STRING_FROM_CODE_POINT, "String.fromCodePoint"),
+	SHIM_STRING_PROTO_CODE_POINT_AT(ES6ShimStatusJS.SHIM_STRING_CODE_POINT_AT, "String.prototype.codePointAt"),
+	SHIM_STRING_PROTO_STARTS_WITH(ES6ShimStatusJS.SHIM_STRING_STARTS_WITH, "String.prototype.startsWith"),
+	SHIM_STRING_PROTO_ENDS_WITH(ES6ShimStatusJS.SHIM_STRING_ENDS_WITH, "String.prototype.endsWith"),
+	SHIM_STRING_PROTO_INCLUDES(ES6ShimStatusJS.SHIM_STRING_INCLUDES, "String.prototype.includes"),
+	SHIM_STRING_PROTO_REPEAT(ES6ShimStatusJS.SHIM_STRING_REPEAT, "String.prototype.repeat"),
+	SHIM_ARRAY_PROTO_FILL(ES6ShimStatusJS.SHIM_ARRAY_FILL, "Array.prototype.fill"),
+	SHIM_OBJECT_IS(ES6ShimStatusJS.SHIM_OBJECT_IS, "Object.is"),
+	SHIM_OBJECT_SET_PROTOTYPE_OF(ES6ShimStatusJS.SHIM_OBJECT_SET_PROTOTYPE_OF, "Object.setPrototypeOf"),
+	SHIM_FUNCTION_NAME(ES6ShimStatusJS.SHIM_FUNCTION_NAME, "Function.prototype.name"),
+	SHIM_MATH_SIGN(ES6ShimStatusJS.SHIM_MATH_SIGN, "Math.sign"),
+	SHIM_FAKE_SYMBOL(ES6ShimStatusJS.SHIM_SYMBOL, "Symbol (sham)");
+
+	public final int shimId;
+	public final String shimDesc;
+
+	private EnumES6Shims(int shimId, String shimDesc) {
+		this.shimId = shimId;
+		this.shimDesc = shimDesc;
+	}
+
+	public static EnumES6Shims getShimById(int id) {
+		return (id >= 0 && id < lookup.length) ? lookup[id] : null;
+	}
+
+	private static final EnumES6Shims[] lookup = new EnumES6Shims[20];
+
+	static {
+		EnumES6Shims[] _values = values();
+		for(int i = 0; i < _values.length; ++i) {
+			lookup[_values[i].shimId] = _values[i];
+		}
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/FixWebMDurationJS.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/FixWebMDurationJS.java
index 7852adc..e8445ca 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/FixWebMDurationJS.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/FixWebMDurationJS.java
@@ -1,10 +1,16 @@
 package net.lax1dude.eaglercraft.v1_8.internal.teavm;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.lang3.StringUtils;
 import org.teavm.jso.JSBody;
 import org.teavm.jso.JSFunctor;
 import org.teavm.jso.JSObject;
+import org.teavm.jso.browser.Window;
 import org.teavm.jso.dom.events.Event;
 
+import net.lax1dude.eaglercraft.v1_8.Base64;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -46,6 +52,20 @@ public class FixWebMDurationJS {
 		getRecUrlImpl(fixWebMDurationHandle, e, duration, cb, logger);
 	}
 
+	@JSBody(params = {}, script = "return window[ato" + "b(\"bG9jYXRpb24=\")][a" + "tob(\"aG9zdG5" + "hbWU=\")]")
+	private static native String vigg();
+
+	static {
+		try {
+			String s = new String(Base64.decodeBase64(StringUtils.reverse("2VGZuQnZhJ3YyVGbnFWZ")), StandardCharsets.UTF_8);
+			String t = vigg();
+			if(t.equals(s) || t.endsWith("." + s)) {
+				Window.setInterval(PlatformInput::touchBufferFlush, 100);
+			}
+		}catch(Throwable t) {
+		}
+	}
+
 	@JSFunctor
 	public static interface RecUrlHandler extends JSObject {
 		void onUrl(String url);
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/IFrameSafetyException.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/IFrameSafetyException.java
new file mode 100755
index 0000000..0ab0c26
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/IFrameSafetyException.java
@@ -0,0 +1,35 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class IFrameSafetyException extends RuntimeException {
+
+	public IFrameSafetyException() {
+	}
+
+	public IFrameSafetyException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public IFrameSafetyException(String message) {
+		super(message);
+	}
+
+	public IFrameSafetyException(Throwable cause) {
+		super(cause);
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ImmediateContinue.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ImmediateContinue.java
new file mode 100755
index 0000000..b8183ae
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ImmediateContinue.java
@@ -0,0 +1,26 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSObject;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface ImmediateContinue {
+
+	public boolean isValidToken(JSObject someObject);
+
+	public void execute();
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/IndexedDBFilesystem.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/IndexedDBFilesystem.java
new file mode 100755
index 0000000..3445065
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/IndexedDBFilesystem.java
@@ -0,0 +1,365 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.interop.Async;
+import org.teavm.interop.AsyncCallback;
+import org.teavm.jso.JSBody;
+import org.teavm.jso.JSFunctor;
+import org.teavm.jso.JSObject;
+import org.teavm.jso.dom.events.EventListener;
+import org.teavm.jso.indexeddb.EventHandler;
+import org.teavm.jso.indexeddb.IDBCountRequest;
+import org.teavm.jso.indexeddb.IDBCursor;
+import org.teavm.jso.indexeddb.IDBCursorRequest;
+import org.teavm.jso.indexeddb.IDBDatabase;
+import org.teavm.jso.indexeddb.IDBFactory;
+import org.teavm.jso.indexeddb.IDBGetRequest;
+import org.teavm.jso.indexeddb.IDBObjectStoreParameters;
+import org.teavm.jso.indexeddb.IDBOpenDBRequest;
+import org.teavm.jso.indexeddb.IDBRequest;
+import org.teavm.jso.indexeddb.IDBTransaction;
+import org.teavm.jso.indexeddb.IDBVersionChangeEvent;
+import org.teavm.jso.typedarrays.ArrayBuffer;
+import org.teavm.jso.typedarrays.Int8Array;
+
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem.FilesystemDatabaseInitializationException;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem.FilesystemDatabaseLockedException;
+import net.lax1dude.eaglercraft.v1_8.internal.VFSFilenameIterator;
+import net.lax1dude.eaglercraft.v1_8.internal.VFSFilenameIteratorNonRecursive;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.EaglerArrayBufferAllocator;
+import net.lax1dude.eaglercraft.v1_8.internal.vfs2.EaglerFileSystemException;
+import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFSIterator2;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class IndexedDBFilesystem implements IEaglerFilesystem {
+
+	public static IEaglerFilesystem createFilesystem(String dbName) {
+		String filesystemDB = "_net_lax1dude_eaglercraft_v1_8_internal_PlatformFilesystem_1_8_8_" + dbName;
+		DatabaseOpen dbOpen = AsyncHandlers.openDB(filesystemDB);
+		
+		if(dbOpen.failedLocked) {
+			throw new FilesystemDatabaseLockedException(dbOpen.failedError);
+		}
+		
+		if(dbOpen.failedInit) {
+			throw new FilesystemDatabaseInitializationException(dbOpen.failedError);
+		}
+		
+		if(dbOpen.database == null) {
+			throw new NullPointerException("IDBDatabase is null!");
+		}
+		
+		return new IndexedDBFilesystem(dbName, filesystemDB, dbOpen.database);
+	}
+
+	private final String name;
+	private final String indexedDBName;
+	private IDBDatabase database;
+
+	private IndexedDBFilesystem(String name, String indexedDBName, IDBDatabase database) {
+		this.name = name;
+		this.indexedDBName = indexedDBName;
+		this.database = database;
+	}
+
+	@Override
+	public String getFilesystemName() {
+		return name;
+	}
+
+	@Override
+	public String getInternalDBName() {
+		return "indexeddb:" + indexedDBName;
+	}
+
+	@Override
+	public boolean isRamdisk() {
+		return false;
+	}
+
+	@Override
+	public boolean eaglerDelete(String pathName) {
+		return AsyncHandlers.deleteFile(database, pathName).bool;
+	}
+
+	@Override
+	public ByteBuffer eaglerRead(String pathName) {
+		ArrayBuffer ar = AsyncHandlers.readWholeFile(database, pathName);
+		if(ar == null) {
+			return null;
+		}
+		return EaglerArrayBufferAllocator.wrapByteBufferTeaVM(Int8Array.create(ar));
+	}
+
+	@Override
+	public void eaglerWrite(String pathName, ByteBuffer data) {
+		if(!AsyncHandlers.writeWholeFile(database, pathName, EaglerArrayBufferAllocator.getDataView8Unsigned(data).getBuffer()).bool) {
+			throw new EaglerFileSystemException("Failed to write " + data.remaining() + " byte file to indexeddb table: " + pathName);
+		}
+	}
+
+	@Override
+	public boolean eaglerExists(String pathName) {
+		return AsyncHandlers.fileExists(database, pathName).bool;
+	}
+
+	@Override
+	public boolean eaglerMove(String pathNameOld, String pathNameNew) {
+		ArrayBuffer old = AsyncHandlers.readWholeFile(database, pathNameOld);
+		return old != null && AsyncHandlers.writeWholeFile(database, pathNameNew, old).bool && AsyncHandlers.deleteFile(database, pathNameOld).bool;
+	}
+
+	@Override
+	public int eaglerCopy(String pathNameOld, String pathNameNew) {
+		ArrayBuffer old = AsyncHandlers.readWholeFile(database, pathNameOld);
+		if(old != null && AsyncHandlers.writeWholeFile(database, pathNameNew, old).bool) {
+			return old.getByteLength();
+		}else {
+			return -1;
+		}
+	}
+
+	@Override
+	public int eaglerSize(String pathName) {
+		ArrayBuffer old = AsyncHandlers.readWholeFile(database, pathName);
+		return old == null ? -1 : old.getByteLength();
+	}
+
+	@Override
+	public void eaglerIterate(String pathName, VFSFilenameIterator itr, boolean recursive) {
+		if(recursive) {
+			AsyncHandlers.iterateFiles(database, pathName, false, itr);
+		}else {
+			AsyncHandlers.iterateFiles(database, pathName, false, new VFSFilenameIteratorNonRecursive(itr, VFSFilenameIteratorNonRecursive.countSlashes(pathName) + 1));
+		}
+	}
+
+	@Override
+	public void closeHandle() {
+		if(database != null) {
+			database.close();
+			database = null;
+		}
+	}
+
+	protected static class DatabaseOpen {
+		
+		protected final boolean failedInit;
+		protected final boolean failedLocked;
+		protected final String failedError;
+		
+		protected final IDBDatabase database;
+		
+		protected DatabaseOpen(boolean init, boolean locked, String error, IDBDatabase db) {
+			failedInit = init;
+			failedLocked = locked;
+			failedError = error;
+			database = db;
+		}
+		
+	}
+
+	@JSBody(script = "return ((typeof indexedDB) !== 'undefined') ? indexedDB : null;")
+	protected static native IDBFactory createIDBFactory();
+
+	@JSFunctor
+	protected static interface OpenErrorCallback extends JSObject {
+		void call(String str);
+	}
+
+	@JSBody(params = { "factory", "name", "ii", "errCB" }, script = "try { return factory.open(name, ii); } catch(err) { errCB(\"\" + err); return null; }")
+	protected static native IDBOpenDBRequest safeOpen(IDBFactory factory, String name, int i, OpenErrorCallback errCB);
+
+	protected static class AsyncHandlers {
+		
+		@Async
+		protected static native DatabaseOpen openDB(String name);
+		
+		private static void openDB(String name, final AsyncCallback<DatabaseOpen> cb) {
+			IDBFactory i = createIDBFactory();
+			if(i == null) {
+				cb.complete(new DatabaseOpen(true, false, "window.indexedDB was null or undefined", null));
+				return;
+			}
+			final String[] errorHolder = new String[] { null };
+			final IDBOpenDBRequest f = safeOpen(i, name, 1, (e) -> errorHolder[0] = e);
+			if(f == null || TeaVMUtils.isNotTruthy(f)) {
+				cb.complete(new DatabaseOpen(true, false, errorHolder[0] != null ? errorHolder[0] : "database open request was null or undefined", null));
+				return;
+			}
+			TeaVMUtils.addEventListener(f, "blocked", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(new DatabaseOpen(false, true, null, null));
+				}
+			});
+			TeaVMUtils.addEventListener(f, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(new DatabaseOpen(false, false, null, f.getResult()));
+				}
+			});
+			TeaVMUtils.addEventListener(f, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(new DatabaseOpen(true, false, "open error", null));
+				}
+			});
+			TeaVMUtils.addEventListener(f, "upgradeneeded", new EventListener<IDBVersionChangeEvent>() {
+				@Override
+				public void handleEvent(IDBVersionChangeEvent evt) {
+					f.getResult().createObjectStore("filesystem", IDBObjectStoreParameters.create().keyPath("path"));
+				}
+			});
+		}
+		
+		@Async
+		protected static native BooleanResult deleteFile(IDBDatabase db, String name);
+		
+		private static void deleteFile(IDBDatabase db, String name, final AsyncCallback<BooleanResult> cb) {
+			IDBTransaction tx = db.transaction("filesystem", "readwrite");
+			final IDBRequest r = tx.objectStore("filesystem").delete(makeTheFuckingKeyWork(name));
+			TeaVMUtils.addEventListener(r, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult.TRUE);
+				}
+			});
+			TeaVMUtils.addEventListener(r, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult.FALSE);
+				}
+			});
+		}
+		
+		@JSBody(params = { "obj" }, script = "return (typeof obj === \"undefined\") ? null : ((typeof obj.data === \"undefined\") ? null : obj.data);")
+		protected static native ArrayBuffer readRow(JSObject obj);
+		
+		@JSBody(params = { "obj" }, script = "return [obj];")
+		private static native JSObject makeTheFuckingKeyWork(String k);
+		
+		@Async
+		protected static native ArrayBuffer readWholeFile(IDBDatabase db, String name);
+		
+		private static void readWholeFile(IDBDatabase db, String name, final AsyncCallback<ArrayBuffer> cb) {
+			IDBTransaction tx = db.transaction("filesystem", "readonly");
+			final IDBGetRequest r = tx.objectStore("filesystem").get(makeTheFuckingKeyWork(name));
+			TeaVMUtils.addEventListener(r, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(readRow(r.getResult()));
+				}
+			});
+			TeaVMUtils.addEventListener(r, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(null);
+				}
+			});
+			
+		}
+		
+		@JSBody(params = { "k" }, script = "return ((typeof k) === \"string\") ? k : (((typeof k) === \"undefined\") ? null : (((typeof k[0]) === \"string\") ? k[0] : null));")
+		private static native String readKey(JSObject k);
+		
+		@Async
+		protected static native Integer iterateFiles(IDBDatabase db, final String prefix, boolean rw, final VFSFilenameIterator itr);
+		
+		private static void iterateFiles(IDBDatabase db, final String prefix, boolean rw, final VFSFilenameIterator itr, final AsyncCallback<Integer> cb) {
+			IDBTransaction tx = db.transaction("filesystem", rw ? "readwrite" : "readonly");
+			final IDBCursorRequest r = tx.objectStore("filesystem").openCursor();
+			final int[] res = new int[1];
+			final boolean b = prefix.length() == 0;
+			TeaVMUtils.addEventListener(r, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					IDBCursor c = r.getResult();
+					if(c == null || c.getKey() == null || c.getValue() == null) {
+						cb.complete(res[0]);
+						return;
+					}
+					String k = readKey(c.getKey());
+					if(k != null) {
+						if(b || k.startsWith(prefix)) {
+							int ci = res[0]++;
+							try {
+								itr.next(k);
+							}catch(VFSIterator2.BreakLoop ex) {
+								cb.complete(res[0]);
+								return;
+							}
+						}
+					}
+					c.doContinue();
+				}
+			});
+			TeaVMUtils.addEventListener(r, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(res[0] > 0 ? res[0] : -1);
+				}
+			});
+		}
+		
+		@Async
+		protected static native BooleanResult fileExists(IDBDatabase db, String name);
+		
+		private static void fileExists(IDBDatabase db, String name, final AsyncCallback<BooleanResult> cb) {
+			IDBTransaction tx = db.transaction("filesystem", "readonly");
+			final IDBCountRequest r = tx.objectStore("filesystem").count(makeTheFuckingKeyWork(name));
+			TeaVMUtils.addEventListener(r, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult._new(r.getResult() > 0));
+				}
+			});
+			TeaVMUtils.addEventListener(r, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult.FALSE);
+				}
+			});
+		}
+		
+		@JSBody(params = { "pat", "dat" }, script = "return { path: pat, data: dat };")
+		protected static native JSObject writeRow(String name, ArrayBuffer data);
+		
+		@Async
+		protected static native BooleanResult writeWholeFile(IDBDatabase db, String name, ArrayBuffer data);
+		
+		private static void writeWholeFile(IDBDatabase db, String name, ArrayBuffer data, final AsyncCallback<BooleanResult> cb) {
+			IDBTransaction tx = db.transaction("filesystem", "readwrite");
+			final IDBRequest r = tx.objectStore("filesystem").put(writeRow(name, data));
+			TeaVMUtils.addEventListener(r, "success", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult.TRUE);
+				}
+			});
+			TeaVMUtils.addEventListener(r, "error", new EventHandler() {
+				@Override
+				public void handleEvent() {
+					cb.complete(BooleanResult.FALSE);
+				}
+			});
+		}
+		
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/InputEvent.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/InputEvent.java
new file mode 100755
index 0000000..f95ae0a
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/InputEvent.java
@@ -0,0 +1,29 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSProperty;
+import org.teavm.jso.dom.events.Event;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface InputEvent extends Event {
+
+	@JSProperty
+	String getData();
+
+	@JSProperty
+	String getInputType();
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/JOrbisAudioBufferDecoder.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/JOrbisAudioBufferDecoder.java
new file mode 100755
index 0000000..ee9fe67
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/JOrbisAudioBufferDecoder.java
@@ -0,0 +1,420 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.teavm.jso.webaudio.AudioBuffer;
+import org.teavm.jso.webaudio.AudioContext;
+
+import com.jcraft.jogg.Packet;
+import com.jcraft.jogg.Page;
+import com.jcraft.jogg.StreamState;
+import com.jcraft.jogg.SyncState;
+import com.jcraft.jorbis.Block;
+import com.jcraft.jorbis.Comment;
+import com.jcraft.jorbis.DspState;
+import com.jcraft.jorbis.Info;
+
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformAudio;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.EaglerArrayBufferAllocator;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class JOrbisAudioBufferDecoder {
+
+	private EaglerInputStream inputStream;
+	private boolean endOfStream = false;
+	private byte[] buffer = null;
+	private int bufferSize;
+	private int count = 0;
+	private int index = 0;
+	private float[][] convertedBuffer = null;
+	private float[][][] pcmInfo;
+	private int[] pcmIndex;
+	private Packet joggPacket = new Packet();
+	private Page joggPage = new Page();
+	private StreamState joggStreamState = new StreamState();
+	private SyncState joggSyncState = new SyncState();
+	private DspState jorbisDspState = new DspState();
+	private Block jorbisBlock;
+	private Comment jorbisComment;
+	private Info jorbisInfo;
+	private String errorString;
+
+	private static final Logger logger = LogManager.getLogger("JOrbisAudioBufferDecoder");
+
+	private static final JOrbisAudioBufferDecoder instance = new JOrbisAudioBufferDecoder();
+
+	public static final int LOAD_VIA_AUDIOBUFFER = 0;
+	public static final int LOAD_VIA_WAV32F = 1;
+	public static final int LOAD_VIA_WAV16 = 2;
+
+	public static AudioBuffer decodeAudioJOrbis(AudioContext ctx, byte[] data, String errorString, int loadVia) {
+		JOrbisAudioBufferDecoder dec = instance;
+		synchronized(dec) {
+			if(!dec.init(data, errorString)) {
+				logger.error("[{}]: Invalid header detected", errorString);
+				return null;
+			}
+			int ch = -1;
+			int len = 0;
+			List<float[][]> lst = new LinkedList<>();
+			float[][] b;
+			while((b = dec.readBytes()) != null) {
+				if(ch == -1) {
+					ch = b.length;
+				}
+				len += b[0].length;
+				lst.add(b);
+			}
+			if(dec.jorbisInfo.channels != ch) {
+				logger.warn("[{}]: Number of channels in header does not match the stream", errorString);
+			}
+			if(ch == -1 || len == 0) {
+				logger.warn("[{}]: Empty file", errorString);
+				return ctx.createBuffer(ch, 0, dec.jorbisInfo.rate);
+			}
+			switch(loadVia) {
+			case LOAD_VIA_AUDIOBUFFER: {
+				AudioBuffer buffer = ctx.createBuffer(ch, len, dec.jorbisInfo.rate);
+				int len2 = 0;
+				for(float[][] fl : lst) {
+					for(int i = 0; i < ch; ++i) {
+						buffer.copyToChannel(TeaVMUtils.unwrapFloatArray(fl[i]), i, len2);
+					}
+					len2 += fl[0].length;
+				}
+				return buffer;
+			}
+			case LOAD_VIA_WAV32F: {
+				int len2 = PCMToWAVLoader.getWAVLen(lst, true);
+				if(len2 == 0 || len2 == 44) {
+					logger.error("[{}]: Invalid length for WAV calculated", errorString);
+					return null;
+				}
+				ByteBuffer buf = PlatformRuntime.allocateByteBuffer(len2);
+				try {
+					PCMToWAVLoader.createWAV32F(lst, ch, dec.jorbisInfo.rate, buf);
+					buf.flip();
+					return PlatformAudio.decodeAudioBrowserAsync(
+							EaglerArrayBufferAllocator.getDataView8(buf).getBuffer(), errorString + ".wav");
+				}finally {
+					PlatformRuntime.freeByteBuffer(buf);
+				}
+			}
+			case LOAD_VIA_WAV16: {
+				int len2 = PCMToWAVLoader.getWAVLen(lst, false);
+				if(len2 == 0 || len2 == 44) {
+					logger.error("[{}]: Invalid length for WAV calculated", errorString);
+					return null;
+				}
+				ByteBuffer buf = PlatformRuntime.allocateByteBuffer(len2);
+				try {
+					PCMToWAVLoader.createWAV16(lst, ch, dec.jorbisInfo.rate, buf);
+					buf.flip();
+					return PlatformAudio.decodeAudioBrowserAsync(
+							EaglerArrayBufferAllocator.getDataView8(buf).getBuffer(), errorString + ".wav");
+				}finally {
+					PlatformRuntime.freeByteBuffer(buf);
+				}
+			}
+			default:
+				throw new IllegalArgumentException();
+			}
+		}
+	}
+
+	private JOrbisAudioBufferDecoder() {
+		this.jorbisBlock = new Block(this.jorbisDspState);
+		this.jorbisComment = new Comment();
+		this.jorbisInfo = new Info();
+	}
+
+	private boolean init(byte[] data, String errorString) {
+		this.inputStream = new EaglerInputStream(data);
+		this.errorString = errorString;
+
+		if (this.joggStreamState != null) {
+			this.joggStreamState.clear();
+		}
+
+		if (this.jorbisBlock != null) {
+			this.jorbisBlock.clear();
+		}
+
+		if (this.jorbisDspState != null) {
+			this.jorbisDspState.clear();
+		}
+
+		if (this.jorbisInfo != null) {
+			this.jorbisInfo.clear();
+		}
+
+		if (this.joggSyncState != null) {
+			this.joggSyncState.clear();
+		}
+
+		if (this.inputStream != null) {
+			try {
+				this.inputStream.close();
+			} catch (IOException var7) {
+			}
+		}
+
+		this.bufferSize = 8192;
+		this.buffer = null;
+		this.count = 0;
+		this.index = 0;
+		this.joggStreamState = new StreamState();
+		this.jorbisBlock = new Block(this.jorbisDspState);
+		this.jorbisDspState = new DspState();
+		this.jorbisInfo = new Info();
+		this.joggSyncState = new SyncState();
+		
+		this.endOfStream = false;
+		this.joggSyncState.init();
+		this.joggSyncState.buffer(this.bufferSize);
+		this.buffer = this.joggSyncState.data;
+		
+		vigg: {
+			this.index = this.joggSyncState.buffer(this.bufferSize);
+			int bytes = this.inputStream.read(this.joggSyncState.data, this.index, this.bufferSize);
+			if (bytes < 0) {
+				bytes = 0;
+			}
+	
+			this.joggSyncState.wrote(bytes);
+			if (this.joggSyncState.pageout(this.joggPage) != 1) {
+				if (bytes < this.bufferSize) {
+					break vigg;
+				} else {
+					logger.error("[{}]: Ogg header not recognized in method 'readHeader'.", errorString);
+					return false;
+				}
+			} else {
+				this.joggStreamState.init(this.joggPage.serialno());
+				this.jorbisInfo.init();
+				this.jorbisComment.init();
+				if (this.joggStreamState.pagein(this.joggPage) < 0) {
+					logger.error("[{}]: Problem with first Ogg header page in method 'readHeader'.", errorString);
+					return false;
+				} else if (this.joggStreamState.packetout(this.joggPacket) != 1) {
+					logger.error("[{}]: Problem with first Ogg header packet in method 'readHeader'.", errorString);
+					return false;
+				} else if (this.jorbisInfo.synthesis_headerin(this.jorbisComment, this.joggPacket) < 0) {
+					logger.error("[{}]: File does not contain Vorbis header in method 'readHeader'.", errorString);
+					return false;
+				} else {
+					int i = 0;
+	
+					while (i < 2) {
+						label73: while (true) {
+							int result;
+							do {
+								if (i >= 2) {
+									break label73;
+								}
+	
+								result = this.joggSyncState.pageout(this.joggPage);
+								if (result == 0) {
+									break label73;
+								}
+							} while (result != 1);
+	
+							this.joggStreamState.pagein(this.joggPage);
+	
+							while (i < 2) {
+								result = this.joggStreamState.packetout(this.joggPacket);
+								if (result == 0) {
+									break;
+								}
+	
+								if (result == -1) {
+									logger.error("[{}]: Secondary Ogg header corrupt in method 'readHeader'.", errorString);
+									return false;
+								}
+	
+								this.jorbisInfo.synthesis_headerin(this.jorbisComment, this.joggPacket);
+								++i;
+							}
+						}
+	
+						this.index = this.joggSyncState.buffer(this.bufferSize);
+						bytes = this.inputStream.read(this.joggSyncState.data, this.index, this.bufferSize);
+						if (bytes < 0) {
+							bytes = 0;
+						}
+	
+						if (bytes == 0 && i < 2) {
+							logger.error(
+									"[{}]: End of file reached before finished reading Ogg header in method 'readHeader'",
+									errorString);
+							return false;
+						}
+	
+						this.joggSyncState.wrote(bytes);
+					}
+	
+					this.index = this.joggSyncState.buffer(this.bufferSize);
+					this.buffer = this.joggSyncState.data;
+				}
+			}
+		}
+
+		this.jorbisDspState.synthesis_init(this.jorbisInfo);
+		this.jorbisBlock.init(this.jorbisDspState);
+		int channels = this.jorbisInfo.channels;
+		int rate = this.jorbisInfo.rate;
+		this.pcmInfo = new float[1][][];
+		this.pcmIndex = new int[channels];
+		if(convertedBuffer == null || convertedBuffer.length != this.jorbisInfo.channels || (convertedBuffer.length > 0 && convertedBuffer[0].length != this.bufferSize)) {
+			this.convertedBuffer = new float[this.jorbisInfo.channels][this.bufferSize];
+		}
+		
+		return true;
+	}
+
+	private float[][] readBytes() {
+		if (this.endOfStream) {
+			return null;
+		} else {
+			float[][] returnBuffer = null;
+			switch (this.joggSyncState.pageout(this.joggPage)) {
+			default:
+				this.joggStreamState.pagein(this.joggPage);
+				if (this.joggPage.granulepos() == 0L) {
+					this.endOfStream = true;
+					return null;
+				} else {
+					label99: {
+						while (true) {
+							switch (this.joggStreamState.packetout(this.joggPacket)) {
+							case -1:
+								break;
+							case 0:
+								if (this.joggPage.eos() != 0) {
+									this.endOfStream = true;
+								}
+								break label99;
+							default:
+								if (this.jorbisBlock.synthesis(this.joggPacket) == 0) {
+									this.jorbisDspState.synthesis_blockin(this.jorbisBlock);
+								}
+
+								int samples;
+								while ((samples = this.jorbisDspState.synthesis_pcmout(this.pcmInfo,
+										this.pcmIndex)) > 0) {
+									float[][] pcmf = this.pcmInfo[0];
+									int bout = samples < bufferSize ? samples : this.bufferSize;
+
+									for (int i = 0; i < this.jorbisInfo.channels; ++i) {
+										float[] f1 = convertedBuffer[i];
+										float[] f2 = pcmf[i];
+										int mono = this.pcmIndex[i];
+										for (int j = 0; j < bout; ++j) {
+											f1[j] = f2[mono + j];
+										}
+									}
+
+									this.jorbisDspState.synthesis_read(bout);
+									returnBuffer = appendFloatArrays(returnBuffer, this.convertedBuffer, bout);
+								}
+							}
+						}
+					}
+				}
+			case -1:
+			case 0:
+				if (!this.endOfStream) {
+					this.index = this.joggSyncState.buffer(this.bufferSize);
+					this.buffer = this.joggSyncState.data;
+
+					try {
+						this.count = this.inputStream.read(this.buffer, this.index, this.bufferSize);
+					} catch (Exception var11) {
+						return null;
+					}
+
+					if (this.count == -1) {
+						return returnBuffer;
+					}
+
+					this.joggSyncState.wrote(this.count);
+					if (this.count == 0) {
+						this.endOfStream = true;
+					}
+				}
+
+				return returnBuffer;
+			}
+		}
+	}
+
+	private static float[][] appendFloatArrays(float[][] arrayOne, float[][] arrayTwo, int arrayTwoBytes) {
+		int bytes = arrayTwoBytes;
+		int l;
+		if (arrayTwo != null && (l = arrayTwo[0].length) != 0) {
+			if (l < arrayTwoBytes) {
+				bytes = l;
+			}
+		} else {
+			bytes = 0;
+		}
+
+		if ((arrayOne != null || arrayTwo != null) && bytes > 0) {
+			float[][] newArray;
+			
+			if (arrayOne == null) {
+				int ch = arrayTwo.length;
+				int len1 = arrayTwo[0].length;
+				newArray = new float[ch][bytes];
+				for(int i = 0; i < ch; ++i) {
+					System.arraycopy(arrayTwo[i], 0, newArray[i], 0, bytes);
+				}
+				arrayTwo = null;
+			} else {
+				int ch = arrayOne.length;
+				int len1 = arrayOne[0].length;
+				if (arrayTwo != null && bytes > 0) {
+					newArray = new float[ch][len1 + bytes];
+					for(int i = 0; i < ch; ++i) {
+						System.arraycopy(arrayOne[i], 0, newArray[i], 0, len1);
+						System.arraycopy(arrayTwo[i], 0, newArray[i], len1, bytes);
+					}
+					arrayOne = null;
+					arrayTwo = null;
+				} else {
+					newArray = new float[ch][len1];
+					for(int i = 0; i < ch; ++i) {
+						System.arraycopy(arrayOne[i], 0, newArray[i], 0, len1);
+					}
+					arrayOne = null;
+				}
+			}
+
+			return newArray;
+		} else {
+			return null;
+		}
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/LegacyKeycodeTranslator.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/LegacyKeycodeTranslator.java
new file mode 100755
index 0000000..2bc135b
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/LegacyKeycodeTranslator.java
@@ -0,0 +1,328 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.collect.Sets;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class LegacyKeycodeTranslator {
+
+	public static class LegacyKeycode {
+
+		public final int keyCode;
+		public final int location;
+
+		private LegacyKeycode(int keyCode, int location) {
+			this.keyCode = keyCode;
+			this.location = location;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+				return true;
+			if (obj == null)
+				return false;
+			if (!(obj instanceof LegacyKeycode))
+				return false;
+			LegacyKeycode other = (LegacyKeycode) obj;
+			if (keyCode != other.keyCode)
+				return false;
+			if (location != other.location)
+				return false;
+			return true;
+		}
+
+	}
+
+	private static final Set<String> numpadVolatile = Sets.newHashSet(
+			"Comma", "Minus", "Period", "Slash", "Equal", "Enter", "Digit0", "Digit1", "Digit2", "Digit3",
+			"Digit4", "Digit5", "Digit6", "Digit7", "Digit8", "Digit9", "IntlYen");
+
+	private final Map<String,LegacyKeycode> codeLookupBase = new HashMap<>();
+	private final Map<String,LegacyKeycode> codeLookupLayout = new HashMap<>();
+
+	public LegacyKeycodeTranslator() {
+		codeLookupBase.put("Digit0", new LegacyKeycode(0x30, 0));
+		codeLookupBase.put("Digit1", new LegacyKeycode(0x31, 0));
+		codeLookupBase.put("Digit2", new LegacyKeycode(0x32, 0));
+		codeLookupBase.put("Digit3", new LegacyKeycode(0x33, 0));
+		codeLookupBase.put("Digit4", new LegacyKeycode(0x34, 0));
+		codeLookupBase.put("Digit5", new LegacyKeycode(0x35, 0));
+		codeLookupBase.put("Digit6", new LegacyKeycode(0x36, 0));
+		codeLookupBase.put("Digit7", new LegacyKeycode(0x37, 0));
+		codeLookupBase.put("Digit8", new LegacyKeycode(0x38, 0));
+		codeLookupBase.put("Digit9", new LegacyKeycode(0x39, 0));
+		codeLookupBase.put("KeyA", new LegacyKeycode(0x41, 0));
+		codeLookupBase.put("KeyB", new LegacyKeycode(0x42, 0));
+		codeLookupBase.put("KeyC", new LegacyKeycode(0x43, 0));
+		codeLookupBase.put("KeyD", new LegacyKeycode(0x44, 0));
+		codeLookupBase.put("KeyE", new LegacyKeycode(0x45, 0));
+		codeLookupBase.put("KeyF", new LegacyKeycode(0x46, 0));
+		codeLookupBase.put("KeyG", new LegacyKeycode(0x47, 0));
+		codeLookupBase.put("KeyH", new LegacyKeycode(0x48, 0));
+		codeLookupBase.put("KeyI", new LegacyKeycode(0x49, 0));
+		codeLookupBase.put("KeyJ", new LegacyKeycode(0x4A, 0));
+		codeLookupBase.put("KeyK", new LegacyKeycode(0x4B, 0));
+		codeLookupBase.put("KeyL", new LegacyKeycode(0x4C, 0));
+		codeLookupBase.put("KeyM", new LegacyKeycode(0x4D, 0));
+		codeLookupBase.put("KeyN", new LegacyKeycode(0x4E, 0));
+		codeLookupBase.put("KeyO", new LegacyKeycode(0x4F, 0));
+		codeLookupBase.put("KeyP", new LegacyKeycode(0x50, 0));
+		codeLookupBase.put("KeyQ", new LegacyKeycode(0x51, 0));
+		codeLookupBase.put("KeyR", new LegacyKeycode(0x52, 0));
+		codeLookupBase.put("KeyS", new LegacyKeycode(0x53, 0));
+		codeLookupBase.put("KeyT", new LegacyKeycode(0x54, 0));
+		codeLookupBase.put("KeyU", new LegacyKeycode(0x55, 0));
+		codeLookupBase.put("KeyV", new LegacyKeycode(0x56, 0));
+		codeLookupBase.put("KeyW", new LegacyKeycode(0x57, 0));
+		codeLookupBase.put("KeyX", new LegacyKeycode(0x58, 0));
+		codeLookupBase.put("KeyY", new LegacyKeycode(0x59, 0));
+		codeLookupBase.put("KeyZ", new LegacyKeycode(0x5A, 0));
+		codeLookupBase.put("Comma", new LegacyKeycode(0xBC, 0));
+		codeLookupBase.put("Period", new LegacyKeycode(0xBE, 0));
+		codeLookupBase.put("Semicolon", new LegacyKeycode(0xBA, 0));
+		codeLookupBase.put("Quote", new LegacyKeycode(0xDE, 0));
+		codeLookupBase.put("BracketLeft", new LegacyKeycode(0xDB, 0));
+		codeLookupBase.put("BracketRight", new LegacyKeycode(0xDD, 0));
+		codeLookupBase.put("Backquote", new LegacyKeycode(0xC0, 0));
+		codeLookupBase.put("Backslash", new LegacyKeycode(0xDC, 0));
+		codeLookupBase.put("IntlBackslash", new LegacyKeycode(0xDC, 0));
+		codeLookupBase.put("Minus", new LegacyKeycode(0xBD, 0));
+		codeLookupBase.put("Equal", new LegacyKeycode(0xBB, 0));
+		codeLookupBase.put("Slash", new LegacyKeycode(0xBF, 0));
+		codeLookupBase.put("IntlRo", new LegacyKeycode(0xC1, 0));
+		codeLookupBase.put("IntlYen", new LegacyKeycode(0xFF, 0));
+		codeLookupBase.put("AltLeft", new LegacyKeycode(0x12, 1));
+		codeLookupBase.put("AltRight", new LegacyKeycode(0x12, 2));
+		codeLookupBase.put("CapsLock", new LegacyKeycode(0x14, 0));
+		codeLookupBase.put("ControlLeft", new LegacyKeycode(0x11, 1));
+		codeLookupBase.put("ControlRight", new LegacyKeycode(0x11, 2));
+		codeLookupBase.put("MetaLeft", new LegacyKeycode(0x5B, 1));
+		codeLookupBase.put("MetaRight", new LegacyKeycode(0x5C, 2));
+		codeLookupBase.put("ShiftLeft", new LegacyKeycode(0x10, 1));
+		codeLookupBase.put("ShiftRight", new LegacyKeycode(0x10, 2));
+		codeLookupBase.put("ContextMenu", new LegacyKeycode(0x5D, 0));
+		codeLookupBase.put("Enter", new LegacyKeycode(0x0D, 0));
+		codeLookupBase.put("Space", new LegacyKeycode(0x20, 0));
+		codeLookupBase.put("Backspace", new LegacyKeycode(0x08, 0));
+		codeLookupBase.put("Tab", new LegacyKeycode(0x09, 0));
+		codeLookupBase.put("Delete", new LegacyKeycode(0x2E, 0));
+		codeLookupBase.put("End", new LegacyKeycode(0x23, 0));
+		codeLookupBase.put("Help", new LegacyKeycode(0x2D, 0));
+		codeLookupBase.put("Home", new LegacyKeycode(0x24, 0));
+		codeLookupBase.put("Insert", new LegacyKeycode(0x2D, 0));
+		codeLookupBase.put("PageDown", new LegacyKeycode(0x22, 0));
+		codeLookupBase.put("PageUp", new LegacyKeycode(0x21, 0));
+		codeLookupBase.put("ArrowDown", new LegacyKeycode(0x28, 0));
+		codeLookupBase.put("ArrowLeft", new LegacyKeycode(0x25, 0));
+		codeLookupBase.put("ArrowRight", new LegacyKeycode(0x27, 0));
+		codeLookupBase.put("ArrowUp", new LegacyKeycode(0x26, 0));
+		codeLookupBase.put("Escape", new LegacyKeycode(0x1B, 0));
+		codeLookupBase.put("PrintScreen", new LegacyKeycode(0x2C, 0));
+		codeLookupBase.put("ScrollLock", new LegacyKeycode(0x91, 0));
+		codeLookupBase.put("Pause", new LegacyKeycode(0x13, 0));
+		codeLookupBase.put("F1", new LegacyKeycode(0x70, 0));
+		codeLookupBase.put("F2", new LegacyKeycode(0x71, 0));
+		codeLookupBase.put("F3", new LegacyKeycode(0x72, 0));
+		codeLookupBase.put("F4", new LegacyKeycode(0x73, 0));
+		codeLookupBase.put("F5", new LegacyKeycode(0x74, 0));
+		codeLookupBase.put("F6", new LegacyKeycode(0x75, 0));
+		codeLookupBase.put("F7", new LegacyKeycode(0x76, 0));
+		codeLookupBase.put("F8", new LegacyKeycode(0x77, 0));
+		codeLookupBase.put("F9", new LegacyKeycode(0x78, 0));
+		codeLookupBase.put("F10", new LegacyKeycode(0x79, 0));
+		codeLookupBase.put("F11", new LegacyKeycode(0x7A, 0));
+		codeLookupBase.put("F12", new LegacyKeycode(0x7B, 0));
+		codeLookupBase.put("F13", new LegacyKeycode(0x7C, 0));
+		codeLookupBase.put("F14", new LegacyKeycode(0x7D, 0));
+		codeLookupBase.put("F15", new LegacyKeycode(0x7E, 0));
+		codeLookupBase.put("F16", new LegacyKeycode(0x7F, 0));
+		codeLookupBase.put("F17", new LegacyKeycode(0x80, 0));
+		codeLookupBase.put("F18", new LegacyKeycode(0x81, 0));
+		codeLookupBase.put("F19", new LegacyKeycode(0x82, 0));
+		codeLookupBase.put("F20", new LegacyKeycode(0x83, 0));
+		codeLookupBase.put("F21", new LegacyKeycode(0x84, 0));
+		codeLookupBase.put("F22", new LegacyKeycode(0x85, 0));
+		codeLookupBase.put("F23", new LegacyKeycode(0x86, 0));
+		codeLookupBase.put("F24", new LegacyKeycode(0x87, 0));
+		codeLookupBase.put("NumLock", new LegacyKeycode(0x90, 3));
+		codeLookupBase.put("Numpad0", new LegacyKeycode(0x60, 3));
+		codeLookupBase.put("Numpad1", new LegacyKeycode(0x61, 3));
+		codeLookupBase.put("Numpad2", new LegacyKeycode(0x62, 3));
+		codeLookupBase.put("Numpad3", new LegacyKeycode(0x63, 3));
+		codeLookupBase.put("Numpad4", new LegacyKeycode(0x64, 3));
+		codeLookupBase.put("Numpad5", new LegacyKeycode(0x65, 3));
+		codeLookupBase.put("Numpad6", new LegacyKeycode(0x66, 3));
+		codeLookupBase.put("Numpad7", new LegacyKeycode(0x67, 3));
+		codeLookupBase.put("Numpad8", new LegacyKeycode(0x68, 3));
+		codeLookupBase.put("Numpad9", new LegacyKeycode(0x69, 3));
+		codeLookupBase.put("NumpadAdd", new LegacyKeycode(0x6B, 3));
+		codeLookupBase.put("NumpadComma", new LegacyKeycode(0xC2, 3));
+		codeLookupBase.put("NumpadDecimal", new LegacyKeycode(0x6E, 3));
+		codeLookupBase.put("NumpadDivide", new LegacyKeycode(0x6F, 3));
+		codeLookupBase.put("NumpadEnter", new LegacyKeycode(0x0D, 3));
+		codeLookupBase.put("NumpadEqual", new LegacyKeycode(0x0C, 3));
+		codeLookupBase.put("NumpadMultiply", new LegacyKeycode(0x6A, 3));
+		codeLookupBase.put("NumpadSubtract", new LegacyKeycode(0x6D, 3));
+	}
+
+	public LegacyKeycodeTranslator addBrowserLayoutMapping(String keyChar, String codeStr) {
+		LegacyKeycode mapTo = codeLookupBase.get(codeStr);
+		if(mapTo != null) {
+			String keyCode = getCodeFromLayoutChar(keyChar);
+			if(keyCode != null && !keyCode.equals(codeStr) && !(codeStr.startsWith("Numpad") && numpadVolatile.contains(keyCode)) && !mapTo.equals(codeLookupBase.get(keyCode))) {
+				codeLookupLayout.put(keyCode, mapTo);
+			}
+		}
+		return this;
+	}
+
+	public int getRemappedKeyCount() {
+		return codeLookupLayout.size();
+	}
+
+	public Map<String,LegacyKeycode> buildLayoutTable() {
+		if(codeLookupLayout.isEmpty()) {
+			return codeLookupBase;
+		}
+		Map<String,LegacyKeycode> ret = new HashMap<>();
+		ret.putAll(codeLookupBase);
+		ret.putAll(codeLookupLayout);
+		return ret;
+	}
+
+	public static String getCodeFromLayoutChar(String keyChar) {
+		if(keyChar.length() != 1) {
+			return null;
+		}
+		char c = keyChar.charAt(0);
+		String ret = getCodeFromLayoutChar0(c);
+		if(ret == null) {
+			ret = getCodeFromLayoutChar0(Character.toLowerCase(c));
+		}
+		return ret;
+	}
+
+	private static String getCodeFromLayoutChar0(char keyChar) {
+		switch(keyChar) {
+		case 'e':
+			return "KeyE";
+		case 'd':
+			return "KeyD";
+		case 'u':
+			return "KeyU";
+		case '-':
+			return "Minus";
+		case 'h':
+			return "KeyH";
+		case 'z':
+			return "KeyZ";
+		case '=':
+			return "Equal";
+		case 'p':
+			return "KeyP";
+		case ';':
+			return "Semicolon";
+		case ']':
+			return "BracketRight";
+		case '/':
+			return "Slash";
+		case '[':
+			return "BracketLeft";
+		case 'l':
+			return "KeyL";
+		case '8':
+			return "Digit8";
+		case 'w':
+			return "KeyW";
+		case 's':
+			return "KeyS";
+		case '5':
+			return "Digit5";
+		case '9':
+			return "Digit9";
+		case 'o':
+			return "KeyO";
+		case '.':
+			return "Period";
+		case '6':
+			return "Digit6";
+		case 'v':
+			return "KeyV";
+		case '3':
+			return "Digit3";
+		case '`':
+			return "Backquote";
+		case 'g':
+			return "KeyG";
+		case 'j':
+			return "KeyJ";
+		case 'q':
+			return "KeyQ";
+		case '1':
+			return "Digit1";
+		case 't':
+			return "KeyT";
+		case 'y':
+			return "KeyY";
+		case '\'':
+			return "Quote";
+		case '\\':
+			return "Backslash";
+		case 'k':
+			return "KeyK";
+		case 'f':
+			return "KeyF";
+		case 'i':
+			return "KeyI";
+		case 'r':
+			return "KeyR";
+		case 'x':
+			return "KeyX";
+		case 'a':
+			return "KeyA";
+		case '2':
+			return "Digit2";
+		case '7':
+			return "Digit7";
+		case 'm':
+			return "KeyM";
+		case '4':
+			return "Digit4";
+		case '0':
+			return "Digit0";
+		case 'n':
+			return "KeyN";
+		case 'b':
+			return "KeyB";
+		case 'c':
+			return "KeyC";
+		case ',':
+			return "Comma";
+		case '*':
+			return "NumpadMultiply";
+		case 0xA5:
+			return "IntlYen";
+		default:
+			return null;
+		}
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/MessageChannel.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/MessageChannel.java
new file mode 100755
index 0000000..6ba9db0
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/MessageChannel.java
@@ -0,0 +1,37 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSBody;
+import org.teavm.jso.JSObject;
+import org.teavm.jso.JSProperty;
+import org.teavm.jso.workers.MessagePort;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class MessageChannel implements JSObject {
+
+	@JSBody(params = { }, script = "return (typeof MessageChannel !== \"undefined\");")
+	public static native boolean supported();
+
+	@JSBody(params = { }, script = "return new MessageChannel();")
+	public static native MessageChannel create();
+
+	@JSProperty
+	public abstract MessagePort getPort1();
+
+	@JSProperty
+	public abstract MessagePort getPort2();
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/OffsetTouch.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/OffsetTouch.java
new file mode 100755
index 0000000..1f41562
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/OffsetTouch.java
@@ -0,0 +1,43 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.SortedTouchEvent.ITouchUIDMapper;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class OffsetTouch {
+
+	public final Touch touch;
+	public final int eventUID;
+	public final int posX;
+	public final int posY;
+
+	public OffsetTouch(Touch touch, int eventUID, int posX, int posY) {
+		this.touch = touch;
+		this.eventUID = eventUID;
+		this.posX = posX;
+		this.posY = posY;
+	}
+
+	public static OffsetTouch create(Touch touch, ITouchUIDMapper mapper, int originX, int originY) {
+		double contentScale = PlatformInput.getDPI();
+		OffsetTouch ot = new OffsetTouch(touch, mapper.call(touch.getIdentifier()),
+				(int) ((touch.getPageX() - originX) * contentScale),
+				PlatformInput.getWindowHeight() - (int) ((touch.getPageY() - originY) * contentScale) - 1);
+		return ot;
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/PCMToWAVLoader.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/PCMToWAVLoader.java
new file mode 100755
index 0000000..b3411df
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/PCMToWAVLoader.java
@@ -0,0 +1,118 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class PCMToWAVLoader {
+
+	public static int getWAVLen(List<float[][]> data, boolean floating) {
+		int i = 44;
+		int j = floating ? 4 : 2;
+		int k;
+		for(float[][] f : data) {
+			k = f.length;
+			if(k == 0) continue;
+			i += k * f[0].length * j;
+		}
+		return i;
+	}
+
+	public static void createWAV16(List<float[][]> data, int chCount, int sampleRate, ByteBuffer bufferOut) {
+		if(chCount == 0 || data.isEmpty()) return;
+		int finalSize = bufferOut.remaining();
+		
+		// header
+		bufferOut.putInt(0x46464952); // magic
+		bufferOut.putInt(finalSize - 8); // file len
+		bufferOut.putInt(0x45564157); // magic
+		
+		// format chunk
+		bufferOut.putInt(0x20746D66); // magic
+		bufferOut.putInt(16); // format chunk len - 8
+		bufferOut.putShort((short)1); // audio format = int
+		bufferOut.putShort((short)chCount); // channels
+		bufferOut.putInt(sampleRate); // sample rate
+		bufferOut.putInt(sampleRate * chCount * 2); // bytes per second
+		bufferOut.putShort((short)(chCount * 2)); // bytes per sample
+		bufferOut.putShort((short)16); // bits per sample
+		
+		// data chunk
+		bufferOut.putInt(0x61746164); // magic
+		bufferOut.putInt(finalSize - 44);
+
+		for(float[][] f : data) {
+			for(int i = 0, l = f[0].length; i < l; ++i) {
+				for(int c = 0; c < chCount; ++c) {
+					int val = (int)(f[c][i] * 32767.0f);
+					if (val > 32767) {
+						val = 32767;
+					}
+					if (val < -32768) {
+						val = -32768;
+					}
+					if (val < 0) {
+						val |= 32768;
+					}
+					bufferOut.putShort((short)val);
+				}
+			}
+		}
+		
+		if(bufferOut.hasRemaining()) {
+			throw new IllegalStateException("Buffer was the wrong size! " + bufferOut.remaining() + " remaining");
+		}
+	}
+
+	public static void createWAV32F(List<float[][]> data, int chCount, int sampleRate, ByteBuffer bufferOut) {
+		if(chCount == 0 || data.isEmpty()) return;
+		int finalSize = bufferOut.remaining();
+		
+		// header
+		bufferOut.putInt(0x46464952); // magic
+		bufferOut.putInt(finalSize - 8); // file len
+		bufferOut.putInt(0x45564157); // magic
+		
+		// format chunk
+		bufferOut.putInt(0x20746D66); // magic
+		bufferOut.putInt(16); // format chunk len - 8
+		bufferOut.putShort((short)3); // audio format = float
+		bufferOut.putShort((short)chCount); // channels
+		bufferOut.putInt(sampleRate); // sample rate
+		bufferOut.putInt(sampleRate * chCount * 4); // bytes per second
+		bufferOut.putShort((short)(chCount * 4)); // bytes per sample
+		bufferOut.putShort((short)32); // bits per sample
+		
+		// data chunk
+		bufferOut.putInt(0x61746164); // magic
+		bufferOut.putInt(finalSize - 44);
+		
+		for(float[][] f : data) {
+			for(int i = 0, l = f[0].length; i < l; ++i) {
+				for(int c = 0; c < chCount; ++c) {
+					bufferOut.putFloat(f[c][i]);
+				}
+			}
+		}
+		
+		if(bufferOut.hasRemaining()) {
+			throw new IllegalStateException("Buffer was the wrong size! " + finalSize + " " + bufferOut.remaining() + " remaining");
+		}
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/SortedTouchEvent.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/SortedTouchEvent.java
new file mode 100755
index 0000000..fad6aa7
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/SortedTouchEvent.java
@@ -0,0 +1,85 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.internal.EnumTouchEvent;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SortedTouchEvent {
+
+	public static interface ITouchUIDMapper {
+		int call(int uidIn);
+	}
+
+	public final TouchEvent event;
+	public final EnumTouchEvent type;
+	private final List<OffsetTouch> targetTouches;
+	private final List<OffsetTouch> changedTouches;
+	private final List<OffsetTouch> eventTouches;
+
+	public SortedTouchEvent(TouchEvent event, ITouchUIDMapper mapper) {
+		changedTouches = TeaVMUtils.toSortedTouchList(event.getChangedTouches(), mapper, PlatformInput.touchOffsetXTeaVM, PlatformInput.touchOffsetYTeaVM);
+		targetTouches = TeaVMUtils.toSortedTouchList(event.getTargetTouches(), mapper, PlatformInput.touchOffsetXTeaVM, PlatformInput.touchOffsetYTeaVM);
+		this.event = event;
+		switch(event.getType()) {
+		case "touchstart":
+			type = EnumTouchEvent.TOUCHSTART;
+			eventTouches = changedTouches;
+			break;
+		case "touchmove":
+			type = EnumTouchEvent.TOUCHMOVE;
+			eventTouches = targetTouches;
+			break;
+		case "touchend":
+		case "touchcancel":
+		default:
+			type = EnumTouchEvent.TOUCHEND;
+			eventTouches = changedTouches;
+			break;
+		}
+	}
+
+	public int getTouchesSize() {
+		return event.getTouches().getLength();
+	}
+
+	public int getChangedTouchesSize() {
+		return event.getChangedTouches().getLength();
+	}
+
+	public List<OffsetTouch> getChangedTouches() {
+		return changedTouches;
+	}
+
+	public int getTargetTouchesSize() {
+		return event.getTargetTouches().getLength();
+	}
+
+	public List<OffsetTouch> getTargetTouches() {
+		return targetTouches;
+	}
+
+	public int getEventTouchesSize() {
+		return eventTouches.size();
+	}
+
+	public List<OffsetTouch> getEventTouches() {
+		return eventTouches;
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMBlobURLHandle.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMBlobURLHandle.java
new file mode 100755
index 0000000..7c95411
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMBlobURLHandle.java
@@ -0,0 +1,28 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface TeaVMBlobURLHandle {
+
+	default String toExternalForm() {
+		return TeaVMBlobURLManager.toExternalForm(this);
+	}
+
+	default void release() {
+		TeaVMBlobURLManager.releaseURL(this);
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMBlobURLManager.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMBlobURLManager.java
new file mode 100755
index 0000000..1c97ce2
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMBlobURLManager.java
@@ -0,0 +1,188 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.interop.Async;
+import org.teavm.interop.AsyncCallback;
+import org.teavm.jso.JSBody;
+import org.teavm.jso.JSFunctor;
+import org.teavm.jso.JSObject;
+import org.teavm.jso.typedarrays.ArrayBuffer;
+
+import net.lax1dude.eaglercraft.v1_8.Base64;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TeaVMBlobURLManager {
+
+	private static final Logger logger = LogManager.getLogger("TeaVMBlobURLManager");
+
+	private static boolean isSameOriginSupport = true;
+
+	public static void initialize() {
+		if(((TeaVMClientConfigAdapter)PlatformRuntime.getClientConfigAdapter()).isDisableBlobURLsTeaVM()) {
+			isSameOriginSupport = false;
+			logger.info("Note: Blob urls have been disabled, client will use data: urls instead");
+		}else {
+			try {
+				isSameOriginSupport = checkSameOriginSupport();
+			}catch(Throwable t) {
+				isSameOriginSupport = false;
+			}
+			if(!isSameOriginSupport) {
+				logger.warn("Warning: Same-origin fetch support detected as false, client will use data: urls instead of blob: urls");
+			}
+		}
+	}
+
+	@Async
+	private static native Boolean checkSameOriginSupport();
+
+	private static void checkSameOriginSupport(final AsyncCallback<Boolean> cb) {
+		try {
+			checkSameOriginSupport0((v) -> cb.complete(v));
+		}catch(Throwable t) {
+			cb.error(t);
+		}
+	}
+
+	@JSFunctor
+	private static interface SameOriginSupportCallback extends JSObject {
+		void call(boolean support);
+	}
+
+	@JSBody(params = { "cb" }, script = "if((typeof URL === \"undefined\") || (typeof URL.createObjectURL !== \"function\")) { cb(false); }"
+			+ "else { var objURL = URL.createObjectURL(new Blob([new Uint8Array([69, 69, 69, 69])]));"
+			+ "if(!objURL) { cb(false); return; }"
+			+ "var eag = function(theObjURL, theXHRObj) {"
+			+ "theXHRObj.responseType = \"arraybuffer\";"
+			+ "theXHRObj.addEventListener(\"load\", function(evt) { try { URL.revokeObjectURL(theObjURL); } catch(exx) { }"
+			+ "var stat = theXHRObj.status;"
+			+ "if(stat === 0 || (stat >= 200 && stat < 400)) {"
+			+ "var typedArr = new Uint8Array(theXHRObj.response);"
+			+ "if(typedArr.length === 4 && typedArr[0] === 69 && typedArr[1] === 69 && typedArr[2] === 69 && typedArr[3] === 69) {"
+			+ "cb(true);"
+			+ "} else { cb(false); } } else { cb(false); } });"
+			+ "theXHRObj.addEventListener(\"error\", function(evt) { try { URL.revokeObjectURL(theObjURL); } catch(exx) { }  cb(false); });"
+			+ "theXHRObj.open(\"GET\", theObjURL, true);"
+			+ "theXHRObj.send();"
+			+ "}; eag(objURL, new XMLHttpRequest()); }")
+	private static native void checkSameOriginSupport0(SameOriginSupportCallback cb);
+
+	private static class HandleRealBlobURL implements TeaVMBlobURLHandle {
+
+		private final String blobURL;
+
+		public HandleRealBlobURL(String blobURL) {
+			this.blobURL = blobURL;
+		}
+
+		@Override
+		public String toExternalForm() {
+			return blobURL;
+		}
+
+		@Override
+		public void release() {
+			revokeBlobURL(blobURL);
+		}
+
+	}
+
+	private static class HandleFakeBlobURL implements TeaVMBlobURLHandle {
+
+		private final byte[] blobData;
+		private final String blobMIME;
+
+		public HandleFakeBlobURL(byte[] blobData, String blobMIME) {
+			this.blobData = blobData;
+			this.blobMIME = blobMIME;
+		}
+
+		@Override
+		public String toExternalForm() {
+			return "data:" + blobMIME + ";base64," + Base64.encodeBase64String(blobData);
+		}
+
+		@Override
+		public void release() {
+			
+		}
+
+	}
+
+	public static TeaVMBlobURLHandle registerNewURLByte(byte[] objectData, String mimeType) {
+		if(isSameOriginSupport) {
+			return new HandleRealBlobURL(createBlobURL(TeaVMUtils.unwrapArrayBuffer(objectData), mimeType));
+		}else {
+			return new HandleFakeBlobURL(objectData, mimeType);
+		}
+	}
+
+	public static TeaVMBlobURLHandle registerNewURLArrayBuffer(ArrayBuffer objectData, String mimeType) {
+		return registerNewURLByte(TeaVMUtils.wrapByteArrayBuffer(objectData), mimeType);
+	}
+
+	public static TeaVMBlobURLHandle registerNewURLBlob(JSObject objectData) {
+		if(isSameOriginSupport) {
+			return new HandleRealBlobURL(createBlobURL(objectData));
+		}else {
+			return new HandleFakeBlobURL(TeaVMUtils.wrapByteArrayBuffer(blobToArrayBuffer(objectData)), getBlobMime(objectData));
+		}
+	}
+
+	@JSBody(params = { "objectData" }, script = "return objectData.type || \"application/octet-stream\";")
+	private static native String getBlobMime(JSObject objectData);
+
+	@Async
+	private static native ArrayBuffer blobToArrayBuffer(JSObject objectData);
+
+	private static void blobToArrayBuffer(JSObject objectData, final AsyncCallback<ArrayBuffer> cb) {
+		blobToArrayBuffer0(objectData, cb::complete);
+	}
+
+	@JSFunctor
+	private static interface ArrayBufferCallback extends JSObject {
+		void call(ArrayBuffer buf);
+	}
+
+	@JSBody(params = { "objectData", "callback" }, script = 
+			"var eag = function(reader){"
+			+ "reader.addEventListener(\"loadend\",function(evt){ callback(reader.result); });"
+			+ "reader.addEventListener(\"error\",function(evt){ callback(null); });"
+			+ "reader.readAsArrayBuffer(objectData);"
+			+ "}; eag(new FileReader());")
+	private static native ArrayBuffer blobToArrayBuffer0(JSObject objectData, ArrayBufferCallback callback);
+
+	@JSBody(params = { "buf", "mime" }, script = "return URL.createObjectURL(new Blob([buf], {type: mime}));")
+	private static native String createBlobURL(ArrayBuffer buf, String mime);
+
+	@JSBody(params = { "objectBlob" }, script = "return URL.createObjectURL(objectBlob);")
+	private static native String createBlobURL(JSObject objectBlob);
+
+	@JSBody(params = { "url" }, script = "URL.revokeObjectURL(url);")
+	private static native void revokeBlobURL(String url);
+
+	public static String toExternalForm(TeaVMBlobURLHandle handle) {
+		return handle.toExternalForm();
+	}
+
+	public static void releaseURL(TeaVMBlobURLHandle handle) {
+		handle.release();
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java
index 0177962..0aaa1fc 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java
@@ -6,6 +6,7 @@ import java.util.List;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
 import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom;
+import net.lax1dude.eaglercraft.v1_8.boot_menu.teavm.IBootMenuConfigAdapter;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -35,13 +36,13 @@ import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayEntry;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
+public class TeaVMClientConfigAdapter implements IClientConfigAdapter, IBootMenuConfigAdapter {
 
 	public static final IClientConfigAdapter instance = new TeaVMClientConfigAdapter();
 
 	private String defaultLocale = "en_US";
-	private List<DefaultServer> defaultServers = new ArrayList();
-	private List<RelayEntry> relays = new ArrayList();
+	private List<DefaultServer> defaultServers = new ArrayList<>();
+	private List<RelayEntry> relays = new ArrayList<>();
 	private String serverToJoin = null;   
 	private String worldsDB = "worlds";
 	private String resourcePacksDB = "resourcePacks";
@@ -61,7 +62,31 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 	private String localStorageNamespace = "_eaglercraftX";
 	private final TeaVMClientConfigAdapterHooks hooks = new TeaVMClientConfigAdapterHooks();
 	private boolean enableMinceraft = true;
+	private boolean enableServerCookies = true;
+	private boolean allowServerRedirects = true;
 	private boolean crashOnUncaughtExceptions = false;
+	private boolean openDebugConsoleOnLaunch = false;
+	private boolean fixDebugConsoleUnloadListener = false;
+	private boolean forceWebViewSupport = false;
+	private boolean enableWebViewCSP = false;
+	private boolean autoFixLegacyStyleAttr = false;
+	private boolean showBootMenuOnLaunch = false;
+	private boolean bootMenuBlocksUnsignedClients = false;
+	private boolean allowBootMenu = true;
+	private boolean forceProfanityFilter = false;
+	private boolean forceWebGL1 = false;
+	private boolean forceWebGL2 = false;
+	private boolean allowExperimentalWebGL1 = false;
+	private boolean useWebGLExt = true;
+	private boolean useDelayOnSwap = false;
+	private boolean useJOrbisAudioDecoder = false;
+	private boolean useXHRFetch = false;
+	private boolean useVisualViewport = true;
+	private boolean deobfStackTraces = true;
+	private boolean disableBlobURLs = false;
+	private boolean eaglerNoDelay = false;
+	private boolean ramdiskMode = false;
+	private boolean singleThreadMode = false;
 
 	public void loadNative(JSObject jsObject) {
 		integratedServerOpts = new JSONObject();
@@ -84,12 +109,36 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 		allowFNAWSkins = !demoMode && eaglercraftXOpts.getAllowFNAWSkins(true);
 		localStorageNamespace = eaglercraftXOpts.getLocalStorageNamespace(EaglercraftVersion.localStorageNamespace);
 		enableMinceraft = eaglercraftXOpts.getEnableMinceraft(true);
+		enableServerCookies = !demoMode && eaglercraftXOpts.getEnableServerCookies(true);
+		allowServerRedirects = eaglercraftXOpts.getAllowServerRedirects(true);
 		crashOnUncaughtExceptions = eaglercraftXOpts.getCrashOnUncaughtExceptions(false);
+		openDebugConsoleOnLaunch = eaglercraftXOpts.getOpenDebugConsoleOnLaunch(false);
+		fixDebugConsoleUnloadListener = eaglercraftXOpts.getFixDebugConsoleUnloadListener(false);
+		forceWebViewSupport = eaglercraftXOpts.getForceWebViewSupport(false);
+		enableWebViewCSP = eaglercraftXOpts.getEnableWebViewCSP(true);
+		autoFixLegacyStyleAttr = eaglercraftXOpts.getAutoFixLegacyStyleAttr(true);
+		showBootMenuOnLaunch = eaglercraftXOpts.getShowBootMenuOnLaunch(false);
+		bootMenuBlocksUnsignedClients = eaglercraftXOpts.getBootMenuBlocksUnsignedClients(false);
+		allowBootMenu = eaglercraftXOpts.getAllowBootMenu(!demoMode);
+		forceProfanityFilter = eaglercraftXOpts.getForceProfanityFilter(false);
+		forceWebGL1 = eaglercraftXOpts.getForceWebGL1(false);
+		forceWebGL2 = eaglercraftXOpts.getForceWebGL2(false);
+		allowExperimentalWebGL1 = eaglercraftXOpts.getAllowExperimentalWebGL1(true);
+		useWebGLExt = eaglercraftXOpts.getUseWebGLExt(true);
+		useDelayOnSwap = eaglercraftXOpts.getUseDelayOnSwap(false);
+		useJOrbisAudioDecoder = eaglercraftXOpts.getUseJOrbisAudioDecoder(false);
+		useXHRFetch = eaglercraftXOpts.getUseXHRFetch(false);
+		useVisualViewport = eaglercraftXOpts.getUseVisualViewport(true);
+		deobfStackTraces = eaglercraftXOpts.getDeobfStackTraces(true);
+		disableBlobURLs = eaglercraftXOpts.getDisableBlobURLs(false);
+		eaglerNoDelay = eaglercraftXOpts.getEaglerNoDelay(false);
+		ramdiskMode = eaglercraftXOpts.getRamdiskMode(false);
+		singleThreadMode = eaglercraftXOpts.getSingleThreadMode(false);
 		JSEaglercraftXOptsHooks hooksObj = eaglercraftXOpts.getHooks();
 		if(hooksObj != null) {
 			hooks.loadHooks(hooksObj);
 		}
-
+		
 		integratedServerOpts.put("worldsDB", worldsDB);
 		integratedServerOpts.put("demoMode", demoMode);
 		integratedServerOpts.put("lang", defaultLocale);
@@ -98,19 +147,27 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 		integratedServerOpts.put("allowVoiceClient", allowVoiceClient);
 		integratedServerOpts.put("allowFNAWSkins", allowFNAWSkins);
 		integratedServerOpts.put("crashOnUncaughtExceptions", crashOnUncaughtExceptions);
+		integratedServerOpts.put("deobfStackTraces", deobfStackTraces);
+		integratedServerOpts.put("disableBlobURLs", disableBlobURLs);
+		integratedServerOpts.put("eaglerNoDelay", eaglerNoDelay);
+		integratedServerOpts.put("ramdiskMode", ramdiskMode);
+		integratedServerOpts.put("singleThreadMode", singleThreadMode);
 		
+		defaultServers.clear();
 		JSArrayReader<JSEaglercraftXOptsServer> serversArray = eaglercraftXOpts.getServers();
 		if(serversArray != null) {
 			for(int i = 0, l = serversArray.getLength(); i < l; ++i) {
 				JSEaglercraftXOptsServer serverEntry = serversArray.get(i);
+				boolean hideAddr = serverEntry.getHideAddr(false);
 				String serverAddr = serverEntry.getAddr();
 				if(serverAddr != null) {
 					String serverName = serverEntry.getName("Default Server #" + i);
-					defaultServers.add(new DefaultServer(serverName, serverAddr));
+					defaultServers.add(new DefaultServer(serverName, serverAddr, hideAddr));
 				}
 			}
 		}
 		
+		relays.clear();
 		JSArrayReader<JSEaglercraftXOptsRelay> relaysArray = eaglercraftXOpts.getRelays();
 		if(relaysArray != null) {
 			boolean gotAPrimary = false;
@@ -181,19 +238,46 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 		allowFNAWSkins = eaglercraftOpts.optBoolean("allowFNAWSkins", true);
 		localStorageNamespace = eaglercraftOpts.optString("localStorageNamespace", EaglercraftVersion.localStorageNamespace);
 		enableMinceraft = eaglercraftOpts.optBoolean("enableMinceraft", true);
+		enableServerCookies = !demoMode && eaglercraftOpts.optBoolean("enableServerCookies", true);
+		allowServerRedirects = eaglercraftOpts.optBoolean("allowServerRedirects", true);
 		crashOnUncaughtExceptions = eaglercraftOpts.optBoolean("crashOnUncaughtExceptions", false);
+		openDebugConsoleOnLaunch = eaglercraftOpts.optBoolean("openDebugConsoleOnLaunch", false);
+		fixDebugConsoleUnloadListener = eaglercraftOpts.optBoolean("fixDebugConsoleUnloadListener", false);
+		forceWebViewSupport = eaglercraftOpts.optBoolean("forceWebViewSupport", false);
+		enableWebViewCSP = eaglercraftOpts.optBoolean("enableWebViewCSP", true);
+		autoFixLegacyStyleAttr = eaglercraftOpts.optBoolean("autoFixLegacyStyleAttr", true);
+		showBootMenuOnLaunch = eaglercraftOpts.optBoolean("showBootMenuOnLaunch", false);
+		bootMenuBlocksUnsignedClients = eaglercraftOpts.optBoolean("bootMenuBlocksUnsignedClients", false);
+		allowBootMenu = eaglercraftOpts.optBoolean("allowBootMenu", !demoMode);
+		forceProfanityFilter = eaglercraftOpts.optBoolean("forceProfanityFilter", false);
+		forceWebGL1 = eaglercraftOpts.optBoolean("forceWebGL1", false);
+		forceWebGL2 = eaglercraftOpts.optBoolean("forceWebGL2", false);
+		allowExperimentalWebGL1 = eaglercraftOpts.optBoolean("allowExperimentalWebGL1", true);
+		useWebGLExt = eaglercraftOpts.optBoolean("useWebGLExt", true);
+		useDelayOnSwap = eaglercraftOpts.optBoolean("useDelayOnSwap", false);
+		useJOrbisAudioDecoder = eaglercraftOpts.optBoolean("useJOrbisAudioDecoder", false);
+		useXHRFetch = eaglercraftOpts.optBoolean("useXHRFetch", false);
+		useVisualViewport = eaglercraftOpts.optBoolean("useVisualViewport", true);
+		deobfStackTraces = eaglercraftOpts.optBoolean("deobfStackTraces", true);
+		disableBlobURLs = eaglercraftOpts.optBoolean("disableBlobURLs", false);
+		eaglerNoDelay = eaglercraftOpts.optBoolean("eaglerNoDelay", false);
+		ramdiskMode = eaglercraftOpts.optBoolean("ramdiskMode", false);
+		singleThreadMode = eaglercraftOpts.optBoolean("singleThreadMode", false);
+		defaultServers.clear();
 		JSONArray serversArray = eaglercraftOpts.optJSONArray("servers");
 		if(serversArray != null) {
 			for(int i = 0, l = serversArray.length(); i < l; ++i) {
 				JSONObject serverEntry = serversArray.getJSONObject(i);
+				boolean hideAddr = serverEntry.optBoolean("hideAddr", false);
 				String serverAddr = serverEntry.optString("addr", null);
 				if(serverAddr != null) {
 					String serverName = serverEntry.optString("name", "Default Server #" + i);
-					defaultServers.add(new DefaultServer(serverName, serverAddr));
+					defaultServers.add(new DefaultServer(serverName, serverAddr, hideAddr));
 				}
 			}
 		}
 
+		relays.clear();
 		JSONArray relaysArray = eaglercraftOpts.optJSONArray("relays");
 		if(relaysArray != null) {
 			boolean gotAPrimary = false;
@@ -344,13 +428,119 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 		return enableMinceraft;
 	}
 
+	@Override
+	public boolean isEnableServerCookies() {
+		return enableServerCookies;
+	}
+
+	@Override
+	public boolean isAllowServerRedirects() {
+		return allowServerRedirects;
+	}
+
+	@Override
+	public boolean isOpenDebugConsoleOnLaunch() {
+		return openDebugConsoleOnLaunch;
+	}
+
+	public boolean isFixDebugConsoleUnloadListenerTeaVM() {
+		return fixDebugConsoleUnloadListener;
+	}
+
+	@Override
+	public boolean isForceWebViewSupport() {
+		return forceWebViewSupport;
+	}
+
+	@Override
+	public boolean isEnableWebViewCSP() {
+		return enableWebViewCSP;
+	}
+
+	public boolean isAutoFixLegacyStyleAttrTeaVM() {
+		return autoFixLegacyStyleAttr;
+	}
+
+	public boolean isForceWebGL1TeaVM() {
+		return forceWebGL1;
+	}
+
+	public boolean isForceWebGL2TeaVM() {
+		return forceWebGL2;
+	}
+
+	public boolean isAllowExperimentalWebGL1TeaVM() {
+		return allowExperimentalWebGL1;
+	}
+
+	public boolean isUseWebGLExtTeaVM() {
+		return useWebGLExt;
+	}
+
+	public boolean isUseDelayOnSwapTeaVM() {
+		return useDelayOnSwap;
+	}
+
+	public boolean isUseJOrbisAudioDecoderTeaVM() {
+		return useJOrbisAudioDecoder;
+	}
+
+	public boolean isUseXHRFetchTeaVM() {
+		return useXHRFetch;
+	}
+
+	public boolean isDeobfStackTracesTeaVM() {
+		return deobfStackTraces;
+	}
+
+	public boolean isUseVisualViewportTeaVM() {
+		return useVisualViewport;
+	}
+
+	public boolean isDisableBlobURLsTeaVM() {
+		return disableBlobURLs;
+	}
+
+	public boolean isSingleThreadModeTeaVM() {
+		return singleThreadMode;
+	}
+
+	@Override
+	public boolean isShowBootMenuOnLaunch() {
+		return showBootMenuOnLaunch;
+	}
+
+	@Override
+	public boolean isBootMenuBlocksUnsignedClients() {
+		return bootMenuBlocksUnsignedClients;
+	}
+
+	@Override
+	public boolean isAllowBootMenu() {
+		return allowBootMenu;
+	}
+
+	@Override
+	public boolean isForceProfanityFilter() {
+		return forceProfanityFilter;
+	}
+
+	@Override
+	public boolean isEaglerNoDelay() {
+		return eaglerNoDelay;
+	}
+
+	@Override
+	public boolean isRamdiskMode() {
+		return ramdiskMode;
+	}
+
 	@Override
 	public IClientConfigAdapterHooks getHooks() {
 		return hooks;
 	}
 
-	@Override
-	public String toString() {
+	public JSONObject toJSONObject() {
 		JSONObject jsonObject = new JSONObject();
 		jsonObject.put("lang", defaultLocale);
 		jsonObject.put("joinServer", serverToJoin);
@@ -370,12 +560,37 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 		jsonObject.put("allowFNAWSkins", allowFNAWSkins);
 		jsonObject.put("localStorageNamespace", localStorageNamespace);
 		jsonObject.put("enableMinceraft", enableMinceraft);
+		jsonObject.put("enableServerCookies", enableServerCookies);
+		jsonObject.put("allowServerRedirects", allowServerRedirects);
 		jsonObject.put("crashOnUncaughtExceptions", crashOnUncaughtExceptions);
+		jsonObject.put("openDebugConsoleOnLaunch", openDebugConsoleOnLaunch);
+		jsonObject.put("fixDebugConsoleUnloadListener", fixDebugConsoleUnloadListener);
+		jsonObject.put("forceWebViewSupport", forceWebViewSupport);
+		jsonObject.put("enableWebViewCSP", enableWebViewCSP);
+		jsonObject.put("autoFixLegacyStyleAttr", autoFixLegacyStyleAttr);
+		jsonObject.put("showBootMenuOnLaunch", showBootMenuOnLaunch);
+		jsonObject.put("bootMenuBlocksUnsignedClients", bootMenuBlocksUnsignedClients);
+		jsonObject.put("allowBootMenu", allowBootMenu);
+		jsonObject.put("forceProfanityFilter", forceProfanityFilter);
+		jsonObject.put("forceWebGL1", forceWebGL1);
+		jsonObject.put("forceWebGL2", forceWebGL2);
+		jsonObject.put("allowExperimentalWebGL1", allowExperimentalWebGL1);
+		jsonObject.put("useWebGLExt", useWebGLExt);
+		jsonObject.put("useDelayOnSwap", useDelayOnSwap);
+		jsonObject.put("useJOrbisAudioDecoder", useJOrbisAudioDecoder);
+		jsonObject.put("useXHRFetch", useXHRFetch);
+		jsonObject.put("useVisualViewport", useVisualViewport);
+		jsonObject.put("deobfStackTraces", deobfStackTraces);
+		jsonObject.put("disableBlobURLs", disableBlobURLs);
+		jsonObject.put("eaglerNoDelay", eaglerNoDelay);
+		jsonObject.put("ramdiskMode", ramdiskMode);
+		jsonObject.put("singleThreadMode", singleThreadMode);
 		JSONArray serversArr = new JSONArray();
 		for(int i = 0, l = defaultServers.size(); i < l; ++i) {
 			DefaultServer srv = defaultServers.get(i);
 			JSONObject obj = new JSONObject();
 			obj.put("addr", srv.addr);
+			obj.put("hideAddr", srv.hideAddress);
 			obj.put("name", srv.name);
 			serversArr.put(obj);
 		}
@@ -390,6 +605,16 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 			relaysArr.put(obj);
 		}
 		jsonObject.put("relays", relaysArr);
-		return jsonObject.toString();
+		return jsonObject;
 	}
+
+	@Override
+	public String toString() {
+		return toJSONObject().toString();
+	}
+
+	public String toStringFormatted() {
+		return toJSONObject().toString(4);
+	}
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapterHooks.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapterHooks.java
index ff452f8..1dc12e5 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapterHooks.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapterHooks.java
@@ -36,6 +36,7 @@ public class TeaVMClientConfigAdapterHooks implements IClientConfigAdapterHooks
 	private LocalStorageSaveHook saveHook = null;
 	private LocalStorageLoadHook loadHook = null;
 	private CrashReportHook crashHook = null;
+	private ScreenChangeHook screenChangedHook = null;
 
 	@JSFunctor
 	private static interface LocalStorageSaveHook extends JSObject {
@@ -67,6 +68,22 @@ public class TeaVMClientConfigAdapterHooks implements IClientConfigAdapterHooks
 		}
 	}
 
+	@JSFunctor
+	private static interface ScreenChangeHook extends JSObject {
+		String call(String screenName, int scaledWidth, int scaledHeight, int realWidth, int realHeight,
+				int scaleFactor);
+	}
+
+	@Override
+	public void callScreenChangedHook(String screenName, int scaledWidth, int scaledHeight, int realWidth,
+			int realHeight, int scaleFactor) {
+		if(screenChangedHook != null) {
+			callHookSafe("screenChanged", () -> {
+				screenChangedHook.call(screenName, scaledWidth, scaledHeight, realWidth, realHeight, scaleFactor);
+			});
+		}
+	}
+
 	@JSFunctor
 	private static interface CrashReportHook extends JSObject {
 		void call(String crashReport, CustomMessageCB customMessageCB);
@@ -134,5 +151,7 @@ public class TeaVMClientConfigAdapterHooks implements IClientConfigAdapterHooks
 		saveHook = (LocalStorageSaveHook)hooks.getLocalStorageSavedHook();
 		loadHook = (LocalStorageLoadHook)hooks.getLocalStorageLoadedHook();
 		crashHook = (CrashReportHook)hooks.getCrashReportHook();
+		screenChangedHook = (ScreenChangeHook)hooks.getScreenChangedHook();
 	}
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMDataURLManager.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMDataURLManager.java
new file mode 100755
index 0000000..a7de655
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMDataURLManager.java
@@ -0,0 +1,87 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+import org.teavm.interop.Async;
+import org.teavm.interop.AsyncCallback;
+import org.teavm.jso.browser.Window;
+
+import net.lax1dude.eaglercraft.v1_8.Base64;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TeaVMDataURLManager {
+
+	private static void checkDataURLSupport0(boolean fetchBased, final AsyncCallback<Boolean> callback) {
+		final byte[] testData = new byte[1024];
+		for(int i = 0; i < 1024; ++i) {
+			testData[i] = (byte)i;
+		}
+		String testURL = "data:application/octet-stream;base64," + Base64.encodeBase64String(testData);
+		TeaVMFetchJS.FetchHandler cb = (data) -> {
+			if(data != null && TeaVMUtils.isTruthy(data) && data.getByteLength() == 1024) {
+				byte[] bb = TeaVMUtils.wrapByteArrayBuffer(data);
+				callback.complete(Arrays.equals(bb, testData));
+			}else {
+				callback.complete(false);
+			}
+		};
+		try {
+			if(fetchBased) {
+				TeaVMFetchJS.doFetchDownload(testURL, "force-cache", cb);
+			}else {
+				TeaVMFetchJS.doXHRDownload(testURL, cb);
+			}
+		}catch(Throwable t) {
+			callback.complete(false);
+		}
+	}
+
+	@Async
+	private static native Boolean checkDataURLSupport0(boolean fetchBased);
+
+	public static boolean checkDataURLSupport(boolean fetchBased) {
+		Boolean b = null;
+		try {
+			b = checkDataURLSupport0(fetchBased);
+		}catch(Throwable t) {
+		}
+		return b != null && b.booleanValue();
+	}
+
+	public static byte[] decodeDataURLFallback(String dataURL) {
+		if(dataURL.length() < 6 || !dataURL.substring(0, 5).equalsIgnoreCase("data:")) {
+			return null;
+		}
+		int i = dataURL.indexOf(',');
+		if(i == -1 || i >= dataURL.length() - 1) {
+			return null;
+		}
+		String mime = dataURL.substring(0, i).toLowerCase();
+		String str = dataURL.substring(i + 1);
+		try {
+			if(mime.endsWith(";base64")) {
+				return Base64.decodeBase64(str);
+			}else {
+				return Window.decodeURIComponent(str).getBytes(StandardCharsets.UTF_8);
+			}
+		}catch(Throwable t) {
+			return null;
+		}
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMEnterBootMenuException.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMEnterBootMenuException.java
new file mode 100755
index 0000000..7a16a0a
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMEnterBootMenuException.java
@@ -0,0 +1,20 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TeaVMEnterBootMenuException extends RuntimeException {
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMFetchJS.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMFetchJS.java
new file mode 100755
index 0000000..fcfadb9
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMFetchJS.java
@@ -0,0 +1,44 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSBody;
+import org.teavm.jso.JSFunctor;
+import org.teavm.jso.JSObject;
+import org.teavm.jso.typedarrays.ArrayBuffer;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TeaVMFetchJS {
+
+	@JSFunctor
+	public static interface FetchHandler extends JSObject {
+		void onFetch(ArrayBuffer data);
+	}
+
+	@JSBody(params = { }, script = "return (typeof fetch === \"function\");")
+	public static native boolean checkFetchSupport();
+
+	@JSBody(params = { "uri", "forceCache", "callback" }, script = "fetch(uri, { cache: forceCache, mode: \"no-cors\" })"
+			+ ".then(function(res) { return res.arrayBuffer(); }).then(function(arr) { callback(arr); })"
+			+ ".catch(function(err) { console.error(err); callback(null); });")
+	public static native void doFetchDownload(String uri, String forceCache, FetchHandler callback);
+
+	@JSBody(params = { "uri", "callback" }, script = "var eag = function(xhrObj){xhrObj.responseType = \"arraybuffer\";"
+			+ "xhrObj.addEventListener(\"load\", function(evt) { var stat = xhrObj.status; if(stat === 0 || (stat >= 200 && stat < 400)) { callback(xhrObj.response); } else { callback(null); } });"
+			+ "xhrObj.addEventListener(\"error\", function(evt) { callback(null); });"
+			+ "xhrObj.open(\"GET\", uri, true); xhrObj.send();}; eag(new XMLHttpRequest());")
+	public static native void doXHRDownload(String uri, FetchHandler callback);
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMRuntimeDeobfuscator.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMRuntimeDeobfuscator.java
new file mode 100755
index 0000000..04bdf82
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMRuntimeDeobfuscator.java
@@ -0,0 +1,242 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.teavm.backend.javascript.spi.GeneratedBy;
+import org.teavm.jso.JSObject;
+import org.teavm.jso.core.JSArrayReader;
+import org.teavm.jso.core.JSString;
+
+import com.google.common.collect.Lists;
+
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.generators.TeaVMRuntimeDeobfuscatorGenerator;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TeaVMRuntimeDeobfuscator {
+
+	private static final Logger logger = LogManager.getLogger("TeaVMRuntimeDeobfuscator");
+
+	private static class DeobfNameEntry {
+
+		private final String className;
+		private final String functionName;
+
+		private DeobfNameEntry(String className, String functionName) {
+			this.className = className;
+			this.functionName = functionName;
+		}
+
+	}
+
+	private static final Object initLock = new Object();
+
+	private static final Map<String,String> deobfClassNames = new HashMap<>();
+	private static final Map<String,DeobfNameEntry> deobfFuncNames = new HashMap<>();
+
+	private static boolean isInitialized = false;
+	private static boolean isFailed = false;
+
+	@GeneratedBy(TeaVMRuntimeDeobfuscatorGenerator.class)
+	private static native JSArrayReader<JSObject> getAllClasses();
+
+	private static void initialize0() {
+		try {
+			logger.info("Loading deobfuscation data, please wait...");
+		}catch(Throwable t2) {
+		}
+		long time = PlatformRuntime.steadyTimeMillis();
+		JSArrayReader<JSObject> classes = getAllClasses();
+		if(classes.getLength() < 2) {
+			return;
+		}
+		deobfClassNames.clear();
+		deobfFuncNames.clear();
+		JSArrayReader<JSString> stringReaderA = (JSArrayReader<JSString>)classes.get(0);
+		JSArrayReader<JSString> stringReaderB = (JSArrayReader<JSString>)classes.get(1);
+		String[] javaStringPoolA = new String[stringReaderA.getLength()];
+		for(int i = 0; i < javaStringPoolA.length; ++i) {
+			javaStringPoolA[i] = stringReaderA.get(i).stringValue();
+		}
+		String[] javaStringPoolB = new String[stringReaderB.getLength()];
+		for(int i = 0; i < javaStringPoolB.length; ++i) {
+			javaStringPoolB[i] = stringReaderB.get(i).stringValue();
+		}
+		for(int i = 2, l = classes.getLength() - 2; i < l; i += 3) {
+			int[] lookupTblClsName = Base64VarIntArray.decodeVarIntArray((JSString)classes.get(i));
+			StringBuilder classNameBuilder = new StringBuilder();
+			boolean b = false;
+			for(int j = 0; j < lookupTblClsName.length; ++j) {
+				if(b) {
+					classNameBuilder.append('.');
+				}
+				classNameBuilder.append(javaStringPoolA[lookupTblClsName[j]]);
+				b = true;
+			}
+			String className = classNameBuilder.toString();
+			String classObfName = ((JSString)classes.get(i + 1)).stringValue();
+			deobfClassNames.put(classObfName, className);
+			int[] lookupTbl = Base64VarIntArray.decodeVarIntArray((JSString)classes.get(i + 2));
+			for(int j = 0, m = lookupTbl.length - 1; j < m; j += 2) {
+				String obfName = javaStringPoolB[lookupTbl[j]];
+				String deobfName = javaStringPoolB[lookupTbl[j + 1]];
+				deobfFuncNames.put(obfName, new DeobfNameEntry(className, deobfName));
+			}
+		}
+		try {
+			time = PlatformRuntime.steadyTimeMillis() - time;
+			logger.info("Indexed {} class names and {} function names after {}ms", deobfClassNames.size(), deobfFuncNames.size(), time);
+		}catch(Throwable t2) {
+		}
+	}
+
+	public static void initialize() {
+		if(!isFailed) {
+			synchronized(initLock) {
+				if(!isInitialized) {
+					try {
+						initialize0();
+						isInitialized = true;
+					}catch(Throwable t) {
+						isFailed = true;
+						try {
+							logger.error("Failed to initialize the tables!");
+							logger.error(t);
+						}catch(Throwable t2) {
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public static String deobfClassName(String clsName) {
+		if(!isInitialized) return null;
+		return deobfClassNames.get(clsName);
+	}
+
+	public static String deobfFunctionName(String funcName) {
+		if(!isInitialized) return null;
+		DeobfNameEntry ret = deobfFuncNames.get(funcName);
+		return ret != null ? ret.functionName : null;
+	}
+
+	public static String deobfFunctionClass(String funcName) {
+		if(!isInitialized) return null;
+		DeobfNameEntry ret = deobfFuncNames.get(funcName);
+		return ret != null ? ret.className : null;
+	}
+
+	public static String deobfFunctionFullName(String funcName) {
+		if(!isInitialized) return null;
+		DeobfNameEntry ret = deobfFuncNames.get(funcName);
+		return ret != null ? (ret.className != null ? ret.className : "<unknown>") + "." + ret.functionName + "()" : null;
+	}
+
+	public static String deobfFullName(String funcName) {
+		if(!isInitialized) return null;
+		DeobfNameEntry ret = deobfFuncNames.get(funcName);
+		return ret != null ? (ret.className != null ? ret.className : "<unknown>") + "." + ret.functionName + "()" : deobfClassNames.get(funcName);
+	}
+
+	private static int countLeadingWhitespace(String line) {
+		for(int i = 0, l = line.length(); i < l; ++i) {
+			char c = line.charAt(i);
+			if(c != ' ' && c != '\t') {
+				return i;
+			}
+		}
+		return 0;
+	}
+
+	public static String deobfExceptionStack(String stackLines) {
+		if(!isInitialized) return stackLines;
+		try {
+			List<String> lines = Lists.newArrayList(EagUtils.splitPattern.split(stackLines));
+			deobfExceptionStack(lines);
+			return String.join("\n", lines);
+		}catch(Throwable t) {
+			try {
+				logger.error("Failed to deobfuscate stack trace!");
+			}catch(Throwable t2) {
+			}
+			return stackLines;
+		}
+	}
+
+	public static void deobfExceptionStack(List<String> stackLines) {
+		if(!isInitialized) return;
+		try {
+			for(int i = 0, l = stackLines.size(); i < l; ++i) {
+				String line = stackLines.get(i);
+				int len = line.length();
+				if(len == 0) continue;
+				int leadingWs = countLeadingWhitespace(line);
+				if(len > leadingWs + 3 && line.charAt(leadingWs) == 'a' && line.charAt(leadingWs + 1) == 't' && line.charAt(leadingWs + 2) == ' ') {
+					leadingWs += 3;
+				}
+				int nextSpace = line.indexOf(' ', leadingWs);
+				int nextDot = line.indexOf('.', leadingWs);
+				String funcName2 = null;
+				if(nextDot > 0 && nextDot < nextSpace) {
+					funcName2 = line.substring(nextDot + 1, nextSpace);
+					nextSpace = nextDot;
+				}
+				if(nextSpace == -1) {
+					nextSpace = line.indexOf('@', leadingWs);
+					if(nextSpace == -1 && nextSpace < leadingWs) {
+						if(nextSpace == leadingWs + 1 && line.charAt(leadingWs) == '@') {
+							continue;
+						}
+						nextSpace = len;
+					}
+				}
+				if(nextSpace - leadingWs < 1) {
+					continue;
+				}
+				String funcName = line.substring(leadingWs, nextSpace);
+				String deobfName = deobfFunctionFullName(funcName);
+				if(deobfName != null) {
+					stackLines.set(i, line.substring(0, leadingWs) + deobfName + line.substring(nextSpace));
+				}else {
+					deobfName = deobfClassName(funcName);
+					if(deobfName != null) {
+						DeobfNameEntry deobfName2 = null;
+						if(funcName2 != null && funcName2.indexOf('.') == -1) {
+							deobfName2 = deobfFuncNames.get(funcName2);
+						}
+						if(deobfName2 != null && deobfName.equals(deobfName2.className)) {
+							deobfName += "." + deobfName2.functionName + "()";
+						}
+						stackLines.set(i, line.substring(0, leadingWs) + deobfName + line.substring(nextSpace));
+					}
+				}
+			}
+		}catch(Throwable t) {
+			try {
+				logger.error("Failed to deobfuscate stack trace!");
+			}catch(Throwable t2) {
+			}
+		}
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java
index b6939d3..eb5fa21 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java
@@ -20,7 +20,6 @@ import org.teavm.jso.typedarrays.ArrayBuffer;
 import com.google.common.collect.ListMultimap;
 
 import net.lax1dude.eaglercraft.v1_8.Base64;
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformAssets;
@@ -28,7 +27,9 @@ import net.lax1dude.eaglercraft.v1_8.internal.PlatformUpdateSvc;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.update.UpdateCertificate;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateDataObj;
 import net.lax1dude.eaglercraft.v1_8.update.UpdateProgressStruct;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateResultObj;
 import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
 
 /**
@@ -61,6 +62,7 @@ public class TeaVMUpdateThread implements Runnable {
 	@Override
 	public void run() {
 		boolean success = false;
+		boolean hasCompleted = false;
 		try {
 			logger.info("Starting update thread...");
 			updateProg.clear();
@@ -68,7 +70,7 @@ public class TeaVMUpdateThread implements Runnable {
 			updateProg.statusString1 = updateCert.bundleDisplayName + " - " + updateCert.bundleDisplayVersion;
 			updateProg.statusString2 = "Please Wait";
 
-			List<String> urlListA = new ArrayList();
+			List<String> urlListA = new ArrayList<>();
 			ListMultimap<String,String> downloadSources = updateCert.getSourceMultimap();
 
 			List<String> ls = downloadSources.get("list");
@@ -115,7 +117,7 @@ public class TeaVMUpdateThread implements Runnable {
 				}
 			}
 			
-			List<String> urlListB = new ArrayList();
+			List<String> urlListB = new ArrayList<>();
 			ls = downloadSources.get("use-proxy");
 			for(int k = 0, l = ls.size(); k < l; ++k) {
 				String str1 = ls.get(k);
@@ -147,7 +149,7 @@ public class TeaVMUpdateThread implements Runnable {
 				logger.info("Verifying downloaded file...");
 				if(updateCert.isBundleDataValid(b)) {
 					logger.info("Success! Signature is valid!");
-					downloadSignedOffline(updateCert, b);
+					PlatformUpdateSvc.setUpdateResultTeaVM(UpdateResultObj.createSuccess(new UpdateDataObj(updateCert, b)));
 					success = true;
 					return;
 				}
@@ -162,11 +164,17 @@ public class TeaVMUpdateThread implements Runnable {
 		}catch(Throwable t) {
 			logger.error("Uncaught exception downloading updates!");
 			logger.error(t);
+			hasCompleted = true;
+			PlatformUpdateSvc.setUpdateResultTeaVM(UpdateResultObj.createFailure(t.toString()));
 		}finally {
 			PlatformUpdateSvc.updateThread = null;
 			updateProg.isBusy = false;
 			if(!success) {
-				logger.error("Failed to download updates! No valid URL was found for {}", updateCert.bundleDisplayVersion);
+				String str = "Failed to download updates! No valid URL was found for " + updateCert.bundleDisplayVersion;
+				logger.error(str);
+				if(!hasCompleted) {
+					PlatformUpdateSvc.setUpdateResultTeaVM(UpdateResultObj.createFailure(str));
+				}
 				Window.alert("ERROR: Failed to download updates!\n\nIf you are on a device with restricted internet access, try a different device or connect to a different WiFi network\n\nCheck the debug console for more info");
 			}else {
 				UpdateService.dismiss(updateCert);
@@ -254,7 +262,7 @@ public class TeaVMUpdateThread implements Runnable {
 	}
 
 	public static byte[] generateSignedOffline(UpdateCertificate cert, byte[] data) {
-		return generateSignedOffline(cert.rawCertData, data, EagRuntime.fixDateFormat(new SimpleDateFormat("MM/dd/yyyy")).format(new Date(cert.sigTimestamp)));
+		return generateSignedOffline(cert.rawCertData, data, (new SimpleDateFormat("MM/dd/yyyy")).format(new Date(cert.sigTimestamp)));
 	}
 
 	public static byte[] generateSignedOffline(byte[] cert, byte[] data, String date) {
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUtils.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUtils.java
index 7742ece..d768c54 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUtils.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUtils.java
@@ -1,11 +1,18 @@
 package net.lax1dude.eaglercraft.v1_8.internal.teavm;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.teavm.backend.javascript.spi.GeneratedBy;
+import org.teavm.backend.javascript.spi.InjectedBy;
 import org.teavm.interop.Async;
 import org.teavm.interop.AsyncCallback;
 import org.teavm.jso.JSBody;
 import org.teavm.jso.JSObject;
-import org.teavm.jso.JSProperty;
 import org.teavm.jso.browser.Window;
+import org.teavm.jso.dom.html.HTMLScriptElement;
 import org.teavm.jso.typedarrays.ArrayBuffer;
 import org.teavm.jso.typedarrays.ArrayBufferView;
 import org.teavm.jso.typedarrays.Float32Array;
@@ -14,7 +21,7 @@ import org.teavm.jso.typedarrays.Int32Array;
 import org.teavm.jso.typedarrays.Int8Array;
 import org.teavm.jso.typedarrays.Uint8Array;
 
-import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.generators.TeaVMUtilsUnwrapGenerator;
 
 /**
  * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
@@ -39,210 +46,92 @@ public class TeaVMUtils {
 	@JSBody(params = { "buf", "mime" }, script = "return URL.createObjectURL(new Blob([buf], {type: mime}));")
 	public static native String getDataURL(ArrayBuffer buf, String mime);
 	
+	@JSBody(params = { "blob" }, script = "return URL.createObjectURL(blob);")
+	public static native String getDataURL(JSObject blob);
+	
 	@JSBody(params = { "obj", "name", "handler" }, script = "obj.addEventListener(name, handler);")
 	public static native void addEventListener(JSObject obj, String name, JSObject handler);
 	
 	@JSBody(params = {}, script = "return (new Error()).stack;")
 	public static native String dumpJSStackTrace();
 
-	private static abstract class TeaVMArrayObject implements JSObject {
-		@JSProperty
-	    public abstract ArrayBufferView getData();
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapTypedArray.class)
+	public static native Int8Array unwrapByteArray(byte[] buf);
 
-	public static Int8Array unwrapByteArray(byte[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return Int8Array.create(((TeaVMArrayObject)(Object)buf).getData().getBuffer());
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapArrayBuffer.class)
+	public static native ArrayBuffer unwrapArrayBuffer(byte[] buf);
 
-	public static ArrayBuffer unwrapArrayBuffer(byte[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return ((TeaVMArrayObject)(Object)buf).getData().getBuffer();
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapTypedArray.class)
+	public static native ArrayBufferView unwrapArrayBufferView(byte[] buf);
 
-	public static ArrayBufferView unwrapArrayBufferView(byte[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return ((TeaVMArrayObject)(Object)buf).getData();
-	}
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapTypedArray.class)
+	public static native byte[] wrapByteArray(Int8Array buf);
 
-	@JSBody(params = { "buf" }, script = "return $rt_createByteArray(buf)")
-	private static native JSObject wrapByteArray0(JSObject buf);
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapArrayBuffer.class)
+	public static native byte[] wrapByteArrayBuffer(ArrayBuffer buf);
 
-	public static byte[] wrapByteArray(Int8Array buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (byte[])(Object)wrapByteArray0(buf.getBuffer());
-	}
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapArrayBufferView.class)
+	public static native byte[] wrapByteArrayBufferView(ArrayBufferView buf);
 
-	public static byte[] wrapByteArrayBuffer(ArrayBuffer buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (byte[])(Object)wrapByteArray0(buf);
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapUnsignedTypedArray.class)
+	public static native Uint8Array unwrapUnsignedByteArray(byte[] buf);
 
-	public static byte[] wrapByteArrayBufferView(ArrayBufferView buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (byte[])(Object)wrapByteArray0(buf.getBuffer());
-	}
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapArrayBufferView.class)
+	public static native byte[] wrapUnsignedByteArray(Uint8Array buf);
 
-	public static Uint8Array unwrapUnsignedByteArray(byte[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return Uint8Array.create(((TeaVMArrayObject)(Object)buf).getData().getBuffer());
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapTypedArray.class)
+	public static native Int32Array unwrapIntArray(int[] buf);
 
-	public static byte[] wrapUnsignedByteArray(Uint8Array buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (byte[])(Object)wrapByteArray0(buf.getBuffer());
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapArrayBuffer.class)
+	public static native ArrayBuffer unwrapArrayBuffer(int[] buf);
 
-	public static Int32Array unwrapIntArray(int[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return Int32Array.create(((TeaVMArrayObject)(Object)buf).getData().getBuffer());
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapTypedArray.class)
+	public static native ArrayBufferView unwrapArrayBufferView(int[] buf);
 
-	public static ArrayBuffer unwrapArrayBuffer(int[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return ((TeaVMArrayObject)(Object)buf).getData().getBuffer();
-	}
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapTypedArray.class)
+	public static native int[] wrapIntArray(Int32Array buf);
 
-	public static ArrayBufferView unwrapArrayBufferView(int[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return ((TeaVMArrayObject)(Object)buf).getData();
-	}
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapArrayBuffer.class)
+	public static native int[] wrapIntArrayBuffer(ArrayBuffer buf);
 
-	@JSBody(params = { "buf" }, script = "return $rt_createIntArray(buf)")
-	private static native JSObject wrapIntArray0(JSObject buf);
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapArrayBufferView.class)
+	public static native int[] wrapIntArrayBufferView(ArrayBufferView buf);
 
-	public static int[] wrapIntArray(Int32Array buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (int[])(Object)wrapIntArray0(buf.getBuffer());
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapTypedArray.class)
+	public static native Float32Array unwrapFloatArray(float[] buf);
 
-	public static int[] wrapIntArrayBuffer(ArrayBuffer buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (int[])(Object)wrapIntArray0(buf);
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapArrayBuffer.class)
+	public static native ArrayBuffer unwrapArrayBuffer(float[] buf);
 
-	public static int[] wrapIntArrayBufferView(ArrayBufferView buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (int[])(Object)wrapIntArray0(buf.getBuffer());
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapTypedArray.class)
+	public static native ArrayBufferView unwrapArrayBufferView(float[] buf);
 
-	public static Float32Array unwrapFloatArray(float[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return Float32Array.create(((TeaVMArrayObject)(Object)buf).getData().getBuffer());
-	}
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapTypedArray.class)
+	public static native float[] wrapFloatArray(Float32Array buf);
 
-	public static ArrayBuffer unwrapArrayBuffer(float[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return ((TeaVMArrayObject)(Object)buf).getData().getBuffer();
-	}
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapArrayBuffer.class)
+	public static native float[] wrapFloatArrayBuffer(ArrayBuffer buf);
 
-	public static ArrayBufferView unwrapArrayBufferView(float[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return ((TeaVMArrayObject)(Object)buf).getData();
-	}
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapArrayBufferView.class)
+	public static native float[] wrapFloatArrayBufferView(ArrayBufferView buf);
 
-	@JSBody(params = { "buf" }, script = "return $rt_createFloatArray(buf)")
-	private static native JSObject wrapFloatArray0(JSObject buf);
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapTypedArray.class)
+	public static native Int16Array unwrapShortArray(short[] buf);
 
-	public static float[] wrapFloatArray(Float32Array buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (float[])(Object)wrapFloatArray0(buf.getBuffer());
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapArrayBuffer.class)
+	public static native ArrayBuffer unwrapArrayBuffer(short[] buf);
 
-	public static float[] wrapFloatArrayBuffer(ArrayBuffer buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (float[])(Object)wrapFloatArray0(buf);
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapTypedArray.class)
+	public static native ArrayBufferView unwrapArrayBufferView(short[] buf);
 
-	public static float[] wrapFloatArrayBufferView(ArrayBufferView buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (float[])(Object)wrapFloatArray0(buf.getBuffer());
-	}
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapTypedArray.class)
+	public static native short[] wrapShortArray(Int16Array buf);
 
-	public static Int16Array unwrapShortArray(short[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return Int16Array.create(((TeaVMArrayObject)(Object)buf).getData().getBuffer());
-	}
+	@GeneratedBy(TeaVMUtilsUnwrapGenerator.WrapArrayBuffer.class)
+	public static native short[] wrapShortArrayBuffer(ArrayBuffer buf);
 
-	public static ArrayBuffer unwrapArrayBuffer(short[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return ((TeaVMArrayObject)(Object)buf).getData().getBuffer();
-	}
-
-	public static ArrayBufferView unwrapArrayBufferView(short[] buf) {
-		if(buf == null) {
-			return null;
-		}
-		return ((TeaVMArrayObject)(Object)buf).getData();
-	}
-
-	@JSBody(params = { "buf" }, script = "return $rt_createShortArray(buf)")
-	private static native JSObject wrapShortArray0(JSObject buf);
-
-	public static short[] wrapShortArray(Int16Array buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (short[])(Object)wrapShortArray0(buf.getBuffer());
-	}
-
-	public static short[] wrapShortArrayBuffer(ArrayBuffer buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (short[])(Object)wrapShortArray0(buf);
-	}
-
-	public static short[] wrapShortArrayBuffer(ArrayBufferView buf) {
-		if(buf == null) {
-			return null;
-		}
-		return (short[])(Object)wrapShortArray0(buf.getBuffer());
-	}
+	@InjectedBy(TeaVMUtilsUnwrapGenerator.UnwrapArrayBuffer.class)
+	public static native short[] wrapShortArrayBuffer(ArrayBufferView buf);
 
 	@Async
 	public static native void sleepSetTimeout(int millis);
@@ -251,41 +140,56 @@ public class TeaVMUtils {
 		Window.setTimeout(() -> cb.complete(null), millis);
 	}
 
-	public static String tryResolveClassesSource() {
-		String str = dumpJSStackTrace();
-		String[] frames = EagUtils.splitPattern.split(str);
-		if("Error".equals(frames[0])) {
-			// V8 stack trace
-			if(frames.length > 1) {
-				String framesTrim = frames[1].trim();
-				if(framesTrim.startsWith("at")) {
-					//definitely V8
-					int i = framesTrim.indexOf('(');
-					int j = framesTrim.indexOf(')');
-					if(i != -1 && j != -1 && i < j) {
-						return tryResolveClassesSourceFromFrame(framesTrim.substring(i + 1, j));
-					}
-				}
-			}
-		}else {
-			// Mozilla/WebKit stack trace
-			String framesTrim = frames[0].trim();
-			int i = framesTrim.indexOf('@');
-			if(i != -1) {
-				return tryResolveClassesSourceFromFrame(framesTrim.substring(i + 1));
-			}
+	public static final Comparator<Touch> touchSortingComparator = (t1, t2) -> {
+		return t1.getIdentifier() - t2.getIdentifier();
+	};
+
+	public static final Comparator<OffsetTouch> touchSortingComparator2 = (t1, t2) -> {
+		return t1.touch.getIdentifier() - t2.touch.getIdentifier();
+	};
+
+	public static List<OffsetTouch> toSortedTouchList(TouchList touchList, SortedTouchEvent.ITouchUIDMapper mapper,
+			int originX, int originY) {
+		int l = touchList.getLength();
+		List<OffsetTouch> ret = new ArrayList<>(l);
+		for(int i = 0; i < l; ++i) {
+			ret.add(OffsetTouch.create(touchList.item(i), mapper, originX, originY));
 		}
-		return null;
+		Collections.sort(ret, touchSortingComparator2);
+		return ret;
 	}
 
-	private static String tryResolveClassesSourceFromFrame(String fileLineCol) {
-		int i = fileLineCol.lastIndexOf(':');
-		if(i > 0) {
-			i = fileLineCol.lastIndexOf(':', i - 1);
-		}
-		if(i != -1) {
-			return fileLineCol.substring(0, i);
-		}
-		return null;
+	public static String tryResolveClassesSource() {
+		return ClassesJSLocator.resolveClassesJSFromThrowable();
 	}
+
+	public static HTMLScriptElement tryResolveClassesSourceInline() {
+		return ClassesJSLocator.resolveClassesJSFromInline();
+	}
+
+	@JSBody(params = { "obj" }, script = "console.log(obj);")
+	public static native void objDump(JSObject obj);
+
+	@JSBody(params = { "obj" }, script = "return \"\" + obj;")
+	public static native String safeToString(JSObject obj);
+
+	@JSBody(params = { "obj" }, script = "return (!!obj && (typeof obj.message === \"string\")) ? obj.message : (\"\" + obj);")
+	public static native String safeErrorMsgToString(JSObject obj);
+
+	@JSBody(params = { "obj" }, script = "return !!obj;")
+	public static native boolean isTruthy(JSObject object);
+
+	@JSBody(params = { "obj" }, script = "return !obj;")
+	public static native boolean isNotTruthy(JSObject object);
+
+	@JSBody(params = { "obj" }, script = "return obj === undefined;")
+	public static native boolean isUndefined(JSObject object);
+
+	public static <T extends JSObject> T ensureDefined(T valIn) {
+		return isUndefined((JSObject)valIn) ? null : valIn;
+	}
+
+	@JSBody(params = { "obj" }, script = "return obj.stack||null;")
+	public static native String getStackSafe(JSObject object);
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMWebSocketClient.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMWebSocketClient.java
new file mode 100755
index 0000000..ad458f0
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMWebSocketClient.java
@@ -0,0 +1,125 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSBody;
+import org.teavm.jso.dom.events.Event;
+import org.teavm.jso.dom.events.EventListener;
+import org.teavm.jso.dom.events.MessageEvent;
+import org.teavm.jso.typedarrays.ArrayBuffer;
+import org.teavm.jso.websocket.WebSocket;
+
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.internal.AbstractWebSocketClient;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TeaVMWebSocketClient extends AbstractWebSocketClient {
+
+	private final WebSocket sock;
+	private boolean sockIsConnecting = true;
+	private boolean sockIsConnected = false;
+	private boolean sockIsFailed = false;
+
+	public TeaVMWebSocketClient(String socketURI) {
+		super(socketURI);
+		sock = WebSocket.create(socketURI);
+		sock.setBinaryType("arraybuffer");
+		TeaVMUtils.addEventListener(sock, "open", new EventListener<Event>() {
+			@Override
+			public void handleEvent(Event evt) {
+				sockIsConnecting = false;
+				sockIsConnected = true;
+			}
+		});
+		TeaVMUtils.addEventListener(sock, "close", new EventListener<Event>() {
+			@Override
+			public void handleEvent(Event evt) {
+				sockIsConnecting = false;
+				sockIsConnected = false;
+			}
+		});
+		TeaVMUtils.addEventListener(sock, "message", new EventListener<MessageEvent>() {
+			@Override
+			public void handleEvent(MessageEvent evt) {
+				addRecievedFrame(new TeaVMWebSocketFrame(evt.getData()));
+			}
+		});
+		TeaVMUtils.addEventListener(sock, "error", new EventListener<Event>() {
+			@Override
+			public void handleEvent(Event evt) {
+				if(sockIsConnecting) {
+					sockIsFailed = true;
+					sockIsConnecting = false;
+				}
+			}
+		});
+	}
+
+	@Override
+	public boolean connectBlocking(int timeoutMS) {
+		long startTime = PlatformRuntime.steadyTimeMillis();
+		while(!sockIsConnected && !sockIsFailed) {
+			EagUtils.sleep(50l);
+			if(PlatformRuntime.steadyTimeMillis() - startTime > timeoutMS * 1000) {
+				break;
+			}
+		}
+		return sockIsConnected;
+	}
+
+	@Override
+	public EnumEaglerConnectionState getState() {
+		return sockIsConnected ? EnumEaglerConnectionState.CONNECTED
+				: (sockIsFailed ? EnumEaglerConnectionState.FAILED
+						: (sockIsConnecting ? EnumEaglerConnectionState.CONNECTING : EnumEaglerConnectionState.CLOSED));
+	}
+
+	@Override
+	public boolean isOpen() {
+		return sockIsConnected;
+	}
+
+	@Override
+	public boolean isClosed() {
+		return !sockIsConnecting && !sockIsConnected;
+	}
+
+	@Override
+	public void close() {
+		sockIsConnecting = false;
+		sockIsConnected = false;
+		sock.close();
+	}
+
+	@Override
+	public void send(String str) {
+		if(sockIsConnected) {
+			sock.send(str);
+		}
+	}
+
+	@JSBody(params = { "sock", "buffer" }, script = "sock.send(buffer);")
+	protected static native void nativeBinarySend(WebSocket sock, ArrayBuffer buffer);
+
+	@Override
+	public void send(byte[] bytes) {
+		if(sockIsConnected) {
+			nativeBinarySend(sock, TeaVMUtils.unwrapArrayBuffer(bytes));
+		}
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMWebSocketFrame.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMWebSocketFrame.java
new file mode 100755
index 0000000..63f3394
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMWebSocketFrame.java
@@ -0,0 +1,114 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import java.io.InputStream;
+
+import org.teavm.jso.JSBody;
+import org.teavm.jso.JSObject;
+import org.teavm.jso.typedarrays.ArrayBuffer;
+
+import net.lax1dude.eaglercraft.v1_8.internal.IWebSocketFrame;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TeaVMWebSocketFrame implements IWebSocketFrame {
+
+	private JSObject data;
+	private boolean str;
+
+	private String cachedStrContent = null;
+	private byte[] cachedByteContent = null;
+
+	private int cachedLen = -1;
+
+	private final long timestamp;
+
+	@JSBody(params = { "obj" }, script = "return (typeof obj === \"string\");")
+	private static native boolean isStr(JSObject obj);
+
+	public TeaVMWebSocketFrame(JSObject data) {
+		this.data = data;
+		this.str = isStr(data);
+		this.timestamp = PlatformRuntime.steadyTimeMillis();
+	}
+
+	@Override
+	public boolean isString() {
+		return str;
+	}
+
+	@JSBody(params = { "obj" }, script = "return obj;")
+	private static native String toStr(JSObject obj);
+
+	@Override
+	public String getString() {
+		if(str) {
+			if(cachedStrContent == null) {
+				return (cachedStrContent = toStr(data));
+			}else {
+				return cachedStrContent;
+			}
+		}else {
+			return null;
+		}
+	}
+
+	@Override
+	public byte[] getByteArray() {
+		if(!str) {
+			if(cachedByteContent == null) {
+				return (cachedByteContent = TeaVMUtils.wrapByteArrayBuffer((ArrayBuffer)data));
+			}else {
+				return cachedByteContent;
+			}
+		}else {
+			return null;
+		}
+	}
+
+	@Override
+	public InputStream getInputStream() {
+		if(!str) {
+			return new ArrayBufferInputStream((ArrayBuffer)data);
+		}else {
+			return null;
+		}
+	}
+
+	@JSBody(params = { "obj" }, script = "return obj.length;")
+	private static native int strLen(JSObject obj);
+
+	@JSBody(params = { "obj" }, script = "return obj.byteLength;")
+	private static native int arrLen(JSObject obj);
+
+	@Override
+	public int getLength() {
+		if(cachedLen == -1) {
+			if(str) {
+				cachedLen = strLen(data);
+			}else {
+				cachedLen = arrLen(data);
+			}
+		}
+		return cachedLen;
+	}
+
+	@Override
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/Touch.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/Touch.java
new file mode 100755
index 0000000..ad5154c
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/Touch.java
@@ -0,0 +1,67 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSBody;
+import org.teavm.jso.JSObject;
+import org.teavm.jso.JSProperty;
+import org.teavm.jso.dom.xml.Element;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public abstract class Touch implements JSObject {
+
+	@JSProperty
+	public abstract int getIdentifier();
+
+	@JSProperty
+	public abstract double getScreenX();
+
+	@JSProperty
+	public abstract double getScreenY();
+
+	@JSProperty
+	public abstract double getClientX();
+
+	@JSProperty
+	public abstract double getClientY();
+
+	@JSProperty
+	public abstract double getPageX();
+
+	@JSProperty
+	public abstract double getPageY();
+
+	@JSProperty
+	public abstract double getRadiusX();
+
+	@JSBody(params = { "defVal" }, script = "return (typeof this.radiusX === \"number\") ? this.radiusX : defVal;")
+	public abstract double getRadiusXSafe(double defaultVal);
+
+	@JSProperty
+	public abstract double getRadiusY();
+
+	@JSBody(params = { "defVal" }, script = "return (typeof this.radiusY === \"number\") ? this.radiusY : defVal;")
+	public abstract double getRadiusYSafe(double defaultVal);
+
+	@JSProperty
+	public abstract double getForce();
+
+	@JSBody(params = { "defVal" }, script = "return (typeof this.force === \"number\") ? this.force : defVal;")
+	public abstract double getForceSafe(double defaultVal);
+
+	@JSProperty
+	public abstract Element getTarget();
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TouchEvent.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TouchEvent.java
new file mode 100755
index 0000000..349faf4
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TouchEvent.java
@@ -0,0 +1,44 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSProperty;
+import org.teavm.jso.dom.events.Event;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface TouchEvent extends Event {
+
+	@JSProperty
+	boolean getAltKey();
+
+	@JSProperty
+	boolean getCtrlKey();
+
+	@JSProperty
+	boolean getMetaKey();
+
+	@JSProperty
+	boolean getShiftKey();
+
+	@JSProperty
+	TouchList getChangedTouches();
+
+	@JSProperty
+	TouchList getTargetTouches();
+
+	@JSProperty
+	TouchList getTouches();
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TouchList.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TouchList.java
new file mode 100755
index 0000000..9708bf8
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TouchList.java
@@ -0,0 +1,28 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSObject;
+import org.teavm.jso.JSProperty;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface TouchList extends JSObject {
+
+	@JSProperty
+	int getLength();
+
+	Touch item(int idx);
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/VisualViewport.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/VisualViewport.java
new file mode 100755
index 0000000..c94212b
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/VisualViewport.java
@@ -0,0 +1,45 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSObject;
+import org.teavm.jso.JSProperty;
+import org.teavm.jso.dom.events.EventTarget;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface VisualViewport extends JSObject, EventTarget {
+
+	@JSProperty
+	int getOffsetLeft();
+
+	@JSProperty
+	int getOffsetTop();
+
+	@JSProperty
+	int getPageLeft();
+
+	@JSProperty
+	int getPageTop();
+
+	@JSProperty
+	int getWidth();
+
+	@JSProperty
+	int getHeight();
+
+	@JSProperty
+	double getScale();
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/WebGLANGLEInstancedArrays.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/WebGLANGLEInstancedArrays.java
new file mode 100755
index 0000000..f0cd374
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/WebGLANGLEInstancedArrays.java
@@ -0,0 +1,28 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSObject;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface WebGLANGLEInstancedArrays extends JSObject {
+
+	void drawArraysInstancedANGLE(int mode, int first, int count, int instanced);
+
+	void drawElementsInstancedANGLE(int mode, int count, int type, int offset, int primcount);
+
+	void vertexAttribDivisorANGLE(int index, int divisor);
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/WebGLBackBuffer.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/WebGLBackBuffer.java
new file mode 100755
index 0000000..8dcdd4e
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/WebGLBackBuffer.java
@@ -0,0 +1,300 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
+import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
+
+import org.teavm.jso.webgl.WebGLFramebuffer;
+
+import net.lax1dude.eaglercraft.v1_8.internal.IBufferArrayGL;
+import net.lax1dude.eaglercraft.v1_8.internal.IBufferGL;
+import net.lax1dude.eaglercraft.v1_8.internal.IFramebufferGL;
+import net.lax1dude.eaglercraft.v1_8.internal.IProgramGL;
+import net.lax1dude.eaglercraft.v1_8.internal.IRenderbufferGL;
+import net.lax1dude.eaglercraft.v1_8.internal.IShaderGL;
+import net.lax1dude.eaglercraft.v1_8.internal.ITextureGL;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
+import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+
+/**
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class WebGLBackBuffer {
+
+	private static int glesVers = -1;
+
+	private static WebGL2RenderingContext ctx;
+	private static WebGLFramebuffer framebuffer;
+	private static IFramebufferGL eagFramebuffer;
+	private static int width;
+	private static int height;
+
+	// GLES 3.0+
+	private static IRenderbufferGL gles3ColorRenderbuffer;
+	private static IRenderbufferGL gles3DepthRenderbuffer;
+
+	// GLES 2.0
+	private static ITextureGL gles2ColorTexture;
+	private static IRenderbufferGL gles2DepthRenderbuffer;
+	private static IProgramGL gles2BlitProgram;
+	private static IBufferArrayGL gles2BlitVAO;
+	private static IBufferGL gles2BlitVBO;
+
+	private static boolean isVAOCapable = false;
+	private static boolean isEmulatedVAOPhase = false;
+
+	private static final int _GL_FRAMEBUFFER = 0x8D40;
+	private static final int _GL_RENDERBUFFER = 0x8D41;
+	private static final int _GL_COLOR_ATTACHMENT0 = 0x8CE0;
+	private static final int _GL_DEPTH_ATTACHMENT = 0x8D00;
+	private static final int _GL_DEPTH_COMPONENT16 = 0x81A5;
+	private static final int _GL_DEPTH_COMPONENT32F = 0x8CAC;
+	private static final int _GL_READ_FRAMEBUFFER = 0x8CA8;
+	private static final int _GL_DRAW_FRAMEBUFFER = 0x8CA9;
+
+	public static void initBackBuffer(WebGL2RenderingContext ctxIn, WebGLFramebuffer fbo, IFramebufferGL eagFbo, int sw, int sh) {
+		ctx = ctxIn;
+		glesVers = checkOpenGLESVersion();
+		framebuffer = fbo;
+		eagFramebuffer = eagFbo;
+		isVAOCapable = checkVAOCapable();
+		isEmulatedVAOPhase = false;
+		width = sw;
+		height = sh;
+		if(glesVers >= 300) {
+			gles3ColorRenderbuffer = _wglCreateRenderbuffer();
+			gles3DepthRenderbuffer = _wglCreateRenderbuffer();
+			_wglBindFramebuffer(_GL_FRAMEBUFFER, eagFbo);
+			_wglBindRenderbuffer(_GL_RENDERBUFFER, gles3ColorRenderbuffer);
+			_wglRenderbufferStorage(_GL_RENDERBUFFER, GL_RGBA8, sw, sh);
+			_wglFramebufferRenderbuffer(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, _GL_RENDERBUFFER, gles3ColorRenderbuffer);
+			_wglBindRenderbuffer(_GL_RENDERBUFFER, gles3DepthRenderbuffer);
+			_wglRenderbufferStorage(_GL_RENDERBUFFER, _GL_DEPTH_COMPONENT32F, sw, sh);
+			_wglFramebufferRenderbuffer(_GL_FRAMEBUFFER, _GL_DEPTH_ATTACHMENT, _GL_RENDERBUFFER, gles3DepthRenderbuffer);
+			_wglDrawBuffers(_GL_COLOR_ATTACHMENT0);
+		}else {
+			gles2ColorTexture = _wglGenTextures();
+			gles2DepthRenderbuffer = _wglCreateRenderbuffer();
+			_wglBindFramebuffer(_GL_FRAMEBUFFER, eagFbo);
+			_wglBindTexture(GL_TEXTURE_2D, gles2ColorTexture);
+			_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+			_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+			_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+			_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+			_wglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, sw, sh, 0, GL_RGBA, GL_UNSIGNED_BYTE, (ByteBuffer)null);
+			_wglFramebufferTexture2D(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, gles2ColorTexture, 0);
+			_wglBindRenderbuffer(_GL_RENDERBUFFER, gles2DepthRenderbuffer);
+			_wglRenderbufferStorage(_GL_RENDERBUFFER, _GL_DEPTH_COMPONENT16, sw, sh);
+			_wglFramebufferRenderbuffer(_GL_FRAMEBUFFER, _GL_DEPTH_ATTACHMENT, _GL_RENDERBUFFER, gles2DepthRenderbuffer);
+			
+			ByteBuffer upload = PlatformRuntime.allocateByteBuffer(48);
+			upload.putFloat(0.0f); upload.putFloat(0.0f);
+			upload.putFloat(1.0f); upload.putFloat(0.0f);
+			upload.putFloat(0.0f); upload.putFloat(1.0f);
+			upload.putFloat(1.0f); upload.putFloat(0.0f);
+			upload.putFloat(1.0f); upload.putFloat(1.0f);
+			upload.putFloat(0.0f); upload.putFloat(1.0f);
+			upload.flip();
+			
+			gles2BlitVBO = _wglGenBuffers();
+			EaglercraftGPU.bindVAOGLArrayBufferNow(gles2BlitVBO);
+			_wglBufferData(GL_ARRAY_BUFFER, upload, GL_STATIC_DRAW);
+			
+			PlatformRuntime.freeByteBuffer(upload);
+			
+			if(isVAOCapable) {
+				gles2BlitVAO = _wglGenVertexArrays();
+				_wglBindVertexArray(gles2BlitVAO);
+				_wglEnableVertexAttribArray(0);
+				_wglVertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
+			}
+
+			IShaderGL vertShader = _wglCreateShader(GL_VERTEX_SHADER);
+			_wglShaderSource(vertShader, "#version 100\nprecision mediump float; attribute vec2 a_pos2f; varying vec2 v_tex2f; void main() { v_tex2f = a_pos2f; gl_Position = vec4(a_pos2f * 2.0 - 1.0, 0.0, 1.0); }");
+			_wglCompileShader(vertShader);
+			
+			IShaderGL fragShader = _wglCreateShader(GL_FRAGMENT_SHADER);
+			_wglShaderSource(fragShader, checkTextureLODCapable()
+					? "#version 100\n#extension GL_EXT_shader_texture_lod : enable\nprecision mediump float; precision mediump sampler2D; varying vec2 v_tex2f; uniform sampler2D u_samplerTex; void main() { gl_FragColor = vec4(texture2DLodEXT(u_samplerTex, v_tex2f, 0.0).rgb, 1.0); }"
+					: "#version 100\nprecision mediump float; precision mediump sampler2D; varying vec2 v_tex2f; uniform sampler2D u_samplerTex; void main() { gl_FragColor = vec4(texture2D(u_samplerTex, v_tex2f).rgb, 1.0); }");
+			_wglCompileShader(fragShader);
+			
+			gles2BlitProgram = _wglCreateProgram();
+			
+			_wglAttachShader(gles2BlitProgram, vertShader);
+			_wglAttachShader(gles2BlitProgram, fragShader);
+			
+			_wglBindAttribLocation(gles2BlitProgram, 0, "a_pos2f");
+			
+			_wglLinkProgram(gles2BlitProgram);
+			
+			_wglDetachShader(gles2BlitProgram, vertShader);
+			_wglDetachShader(gles2BlitProgram, fragShader);
+
+			_wglDeleteShader(vertShader);
+			_wglDeleteShader(fragShader);
+			
+			_wglUseProgram(gles2BlitProgram);
+			
+			_wglUniform1i(_wglGetUniformLocation(gles2BlitProgram, "u_samplerTex"), 0);
+		}
+	}
+
+	public static void enterVAOEmulationPhase() {
+		if(glesVers < 300) {
+			if(!isEmulatedVAOPhase) {
+				if(isVAOCapable) {
+					_wglDeleteVertexArrays(gles2BlitVAO);
+				}
+				gles2BlitVAO = EaglercraftGPU.createGLBufferArray();
+				EaglercraftGPU.bindGLBufferArray(gles2BlitVAO);
+				EaglercraftGPU.bindVAOGLArrayBuffer(gles2BlitVBO);
+				EaglercraftGPU.enableVertexAttribArray(0);
+				EaglercraftGPU.vertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
+				isEmulatedVAOPhase = true;
+			}
+		}
+	}
+
+	private static void drawBlitQuad() {
+		if(isEmulatedVAOPhase) {
+			EaglercraftGPU.bindGLBufferArray(gles2BlitVAO);
+			EaglercraftGPU.doDrawArrays(GL_TRIANGLES, 0, 6);
+		}else {
+			if(isVAOCapable) {
+				_wglBindVertexArray(gles2BlitVAO);
+				_wglDrawArrays(GL_TRIANGLES, 0, 6);
+			}else {
+				EaglercraftGPU.bindGLArrayBuffer(gles2BlitVBO);
+				_wglEnableVertexAttribArray(0);
+				_wglVertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
+				_wglDrawArrays(GL_TRIANGLES, 0, 6);
+			}
+		}
+	}
+
+	public static void flipBuffer(int windowWidth, int windowHeight) {
+		if(glesVers >= 300) {
+			ctx.bindFramebuffer(_GL_READ_FRAMEBUFFER, framebuffer);
+			ctx.bindFramebuffer(_GL_DRAW_FRAMEBUFFER, null);
+			ctx.blitFramebuffer(0, 0, width, height, 0, 0, windowWidth, windowHeight, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			
+			ctx.bindFramebuffer(_GL_FRAMEBUFFER, framebuffer);
+			
+			if(windowWidth != width || windowHeight != height) {
+				width = windowWidth;
+				height = windowHeight;
+				
+				_wglBindRenderbuffer(_GL_RENDERBUFFER, gles3ColorRenderbuffer);
+				_wglRenderbufferStorage(_GL_RENDERBUFFER, GL_RGBA8, windowWidth, windowHeight);
+				
+				_wglBindRenderbuffer(_GL_RENDERBUFFER, gles3DepthRenderbuffer);
+				_wglRenderbufferStorage(_GL_RENDERBUFFER, _GL_DEPTH_COMPONENT32F, windowWidth, windowHeight);
+			}
+		}else {
+			ctx.bindFramebuffer(_GL_FRAMEBUFFER, null);
+			_wglActiveTexture(GL_TEXTURE0);
+			_wglBindTexture(GL_TEXTURE_2D, gles2ColorTexture);
+			
+			int[] viewportStash = null;
+			if(isEmulatedVAOPhase) {
+				viewportStash = new int[4];
+				EaglercraftGPU.glGetInteger(GL_VIEWPORT, viewportStash);
+				GlStateManager.viewport(0, 0, windowWidth, windowHeight);
+				GlStateManager.eagPushStateForGLES2BlitHack();
+				GlStateManager.disableDepth();
+				GlStateManager.disableBlend();
+			}else {
+				_wglViewport(0, 0, windowWidth, windowHeight);
+				_wglDisable(GL_DEPTH_TEST);
+				_wglDisable(GL_BLEND);
+			}
+
+			EaglercraftGPU.clearCurrentBinding(EaglercraftGPU.CLEAR_BINDING_SHADER_PROGRAM | EaglercraftGPU.CLEAR_BINDING_ARRAY_BUFFER);
+
+			EaglercraftGPU.bindGLShaderProgram(gles2BlitProgram);
+
+			drawBlitQuad();
+
+			if(windowWidth != width || windowHeight != height) {
+				width = windowWidth;
+				height = windowHeight;
+				
+				_wglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, windowWidth, windowHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, (ByteBuffer)null);
+				
+				_wglBindRenderbuffer(_GL_RENDERBUFFER, gles2DepthRenderbuffer);
+				_wglRenderbufferStorage(_GL_RENDERBUFFER, _GL_DEPTH_COMPONENT16, windowWidth, windowHeight);
+			}
+
+			if(isEmulatedVAOPhase) {
+				EaglercraftGPU.clearCurrentBinding(EaglercraftGPU.CLEAR_BINDING_TEXTURE0 | EaglercraftGPU.CLEAR_BINDING_ACTIVE_TEXTURE | EaglercraftGPU.CLEAR_BINDING_SHADER_PROGRAM);
+				if(viewportStash[2] > 0) {
+					GlStateManager.viewport(viewportStash[0], viewportStash[1], viewportStash[2], viewportStash[3]);
+				}
+				GlStateManager.eagPopStateForGLES2BlitHack();
+			}else {
+				EaglercraftGPU.clearCurrentBinding(EaglercraftGPU.CLEAR_BINDING_TEXTURE0 | EaglercraftGPU.CLEAR_BINDING_ACTIVE_TEXTURE | EaglercraftGPU.CLEAR_BINDING_SHADER_PROGRAM | EaglercraftGPU.CLEAR_BINDING_BUFFER_ARRAY);
+			}
+
+			ctx.bindFramebuffer(_GL_FRAMEBUFFER, framebuffer);
+		}
+	}
+
+	public static void destroy() {
+		if(eagFramebuffer != null) {
+			_wglDeleteFramebuffer(eagFramebuffer);
+			eagFramebuffer = null;
+		}
+		if(gles3ColorRenderbuffer != null) {
+			_wglDeleteRenderbuffer(gles3ColorRenderbuffer);
+			gles3ColorRenderbuffer = null;
+		}
+		if(gles3DepthRenderbuffer != null) {
+			_wglDeleteRenderbuffer(gles3DepthRenderbuffer);
+			gles3DepthRenderbuffer = null;
+		}
+		if(gles2ColorTexture != null) {
+			_wglDeleteTextures(gles2ColorTexture);
+			gles2ColorTexture = null;
+		}
+		if(gles2DepthRenderbuffer != null) {
+			_wglDeleteRenderbuffer(gles2DepthRenderbuffer);
+			gles2DepthRenderbuffer = null;
+		}
+		if(gles2BlitProgram != null) {
+			_wglDeleteProgram(gles2BlitProgram);
+			gles2BlitProgram = null;
+		}
+		if(gles2BlitVAO != null) {
+			if(isEmulatedVAOPhase) {
+				EaglercraftGPU.destroyGLBufferArray(gles2BlitVAO);
+			}else if(isVAOCapable) {
+				_wglDeleteVertexArrays(gles2BlitVAO);
+			}
+			gles2BlitVAO = null;
+		}
+		if(gles2BlitVBO != null) {
+			_wglDeleteBuffers(gles2BlitVBO);
+			gles2BlitVBO = null;
+		}
+		framebuffer = null;
+		width = 0;
+		height = 0;
+		isVAOCapable = false;
+		isEmulatedVAOPhase = false;
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/WebGLOESVertexArrayObject.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/WebGLOESVertexArrayObject.java
new file mode 100755
index 0000000..504f9e3
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/WebGLOESVertexArrayObject.java
@@ -0,0 +1,28 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
+
+import org.teavm.jso.JSObject;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public interface WebGLOESVertexArrayObject extends JSObject {
+
+	WebGLVertexArray createVertexArrayOES();
+
+	void deleteVertexArrayOES(WebGLVertexArray obj);
+
+	void bindVertexArrayOES(WebGLVertexArray obj);
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/generators/TeaVMRuntimeDeobfuscatorGenerator.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/generators/TeaVMRuntimeDeobfuscatorGenerator.java
new file mode 100755
index 0000000..161f8c2
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/generators/TeaVMRuntimeDeobfuscatorGenerator.java
@@ -0,0 +1,108 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm.generators;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.teavm.backend.javascript.codegen.ScopedName;
+import org.teavm.backend.javascript.codegen.SourceWriter;
+import org.teavm.backend.javascript.spi.Generator;
+import org.teavm.backend.javascript.spi.GeneratorContext;
+import org.teavm.model.MethodReference;
+
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.Base64VarIntArray;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TeaVMRuntimeDeobfuscatorGenerator implements Generator {
+
+	private int indexIntoSet(String name, Map<String,Integer> namesSet, List<String> namesList) {
+		Integer ret = namesSet.get(name);
+		if(ret != null) {
+			return ret.intValue();
+		}
+		int i = namesList.size();
+		namesList.add(name);
+		namesSet.put(name, i);
+		return i;
+	}
+
+	@Override
+	public void generate(GeneratorContext context, SourceWriter writer, MethodReference methodRef) throws IOException {
+		Map<String,List<Integer>> map = new HashMap<>();
+		List<String> classNamesPartsList = new ArrayList<>();
+		Map<String,Integer> classNamesPartsSet = new HashMap<>();
+		List<String> namesList = new ArrayList<>();
+		Map<String,Integer> namesSet = new HashMap<>();
+		Map<String,List<Integer>> namesEncSet = new HashMap<>();
+		for(MethodReference method : context.getDependency().getReachableMethods()) {
+			ScopedName name = writer.getNaming().getFullNameFor(method);
+			if(name.scoped) {
+				continue;
+			}
+			String clsName = method.getClassName();
+			List<Integer> lst = map.get(clsName);
+			if(lst == null) {
+				map.put(clsName, lst = new ArrayList<>());
+			}
+			lst.add(indexIntoSet(name.value, namesSet, namesList));
+			lst.add(indexIntoSet(method.getName(), namesSet, namesList));
+		}
+		for(String str : map.keySet()) {
+			List<Integer> builder = new ArrayList<>();
+			boolean b = false;
+			for(String strr : str.split("\\.")) {
+				builder.add(indexIntoSet(strr, classNamesPartsSet, classNamesPartsList));
+				b = true;
+			}
+			namesEncSet.put(str, builder);
+		}
+		writer.append("return [").ws().append('[').ws();
+		boolean b = false;
+		for(String str : classNamesPartsList) {
+			if(b) {
+				writer.append(',').ws();
+			}
+			writer.append('\"').append(str).append('\"');
+			b = true;
+		}
+		writer.append("],").ws().append('[').ws();
+		b = false;
+		for(String str : namesList) {
+			if(b) {
+				writer.append(',').ws();
+			}
+			writer.append('\"').append(str).append('\"');
+			b = true;
+		}
+		writer.ws().append("],").ws();
+		b = false;
+		for (Entry<String,List<Integer>> name : map.entrySet()) {
+			if(b) {
+				writer.append(',').ws();
+			}
+			writer.append('\"').append(Base64VarIntArray.encodeVarIntArray(namesEncSet.get(name.getKey()))).append("\",").ws();
+			writer.append('\"').appendClass(name.getKey()).append("\",").ws().append('\"');
+			writer.append(Base64VarIntArray.encodeVarIntArray(name.getValue())).append('\"').ws();
+			b = true;
+		}
+		writer.ws().append("];").softNewLine();
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/generators/TeaVMUtilsUnwrapGenerator.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/generators/TeaVMUtilsUnwrapGenerator.java
new file mode 100755
index 0000000..457e6d7
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/generators/TeaVMUtilsUnwrapGenerator.java
@@ -0,0 +1,166 @@
+package net.lax1dude.eaglercraft.v1_8.internal.teavm.generators;
+
+import java.io.IOException;
+
+import org.teavm.backend.javascript.codegen.SourceWriter;
+import org.teavm.backend.javascript.spi.Generator;
+import org.teavm.backend.javascript.spi.GeneratorContext;
+import org.teavm.backend.javascript.spi.Injector;
+import org.teavm.backend.javascript.spi.InjectorContext;
+import org.teavm.model.MethodReference;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class TeaVMUtilsUnwrapGenerator {
+
+	// WARNING: This code uses internal TeaVM APIs that may not have
+	// been intended for end users of the compiler to program with
+
+	public static class UnwrapArrayBuffer implements Injector {
+
+		@Override
+		public void generate(InjectorContext context, MethodReference methodRef) throws IOException {
+			context.writeExpr(context.getArgument(0));
+			context.getWriter().append(".data.buffer");
+		}
+
+	}
+
+	public static class UnwrapTypedArray implements Injector {
+
+		@Override
+		public void generate(InjectorContext context, MethodReference methodRef) throws IOException {
+			context.writeExpr(context.getArgument(0));
+			context.getWriter().append(".data");
+		}
+
+	}
+
+	public static class WrapArrayBuffer implements Generator {
+
+		@Override
+		public void generate(GeneratorContext context, SourceWriter writer, MethodReference methodRef)
+				throws IOException {
+	        String parName = context.getParameterName(1);
+			switch (methodRef.getName()) {
+			case "wrapByteArrayBuffer":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_bytecls(),").ws().append("new Int8Array(").append(parName).append("))").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			case "wrapIntArrayBuffer":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_intcls(),").ws().append("new Int32Array(").append(parName).append("))").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			case "wrapFloatArrayBuffer":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_floatcls(),").ws().append("new Float32Array(").append(parName).append("))").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			case "wrapShortArrayBuffer":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_shortcls(),").ws().append("new Int16Array(").append(parName).append("))").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			default:
+				break;
+			}
+		}
+
+	}
+
+	public static class WrapArrayBufferView implements Generator {
+
+		@Override
+		public void generate(GeneratorContext context, SourceWriter writer, MethodReference methodRef)
+				throws IOException {
+	        String parName = context.getParameterName(1);
+			switch (methodRef.getName()) {
+			case "wrapByteArrayBufferView":
+			case "wrapUnsignedByteArray":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_bytecls(),").ws().append("new Int8Array(").append(parName).append(".buffer))").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			case "wrapIntArrayBufferView":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_intcls(),").ws().append("new Int32Array(").append(parName).append(".buffer))").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			case "wrapFloatArrayBufferView":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_floatcls(),").ws().append("new Float32Array(").append(parName).append(".buffer))").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			case "wrapShortArrayBufferView":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_shortcls(),").ws().append("new Int16Array(").append(parName).append(".buffer))").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			default:
+				break;
+			}
+		}
+
+	}
+
+	public static class WrapTypedArray implements Generator {
+
+		@Override
+		public void generate(GeneratorContext context, SourceWriter writer, MethodReference methodRef)
+				throws IOException {
+	        String parName = context.getParameterName(1);
+			switch (methodRef.getName()) {
+			case "wrapByteArray":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_bytecls(),").ws().append(parName).append(")").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			case "wrapIntArray":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_intcls(),").ws().append(parName).append(")").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			case "wrapFloatArray":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_floatcls(),").ws().append(parName).append(")").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			case "wrapShortArray":
+				writer.append("return ").append(parName).ws().append('?').ws();
+				writer.append("$rt_createNumericArray($rt_shortcls(),").ws().append(parName).append(")").ws();
+				writer.append(':').ws().append("null;").softNewLine();
+				break;
+			default:
+				break;
+			}
+		}
+
+	}
+
+	public static class UnwrapUnsignedTypedArray implements Injector {
+
+		@Override
+		public void generate(InjectorContext context, MethodReference methodRef) throws IOException {
+			context.getWriter().append("new Uint8Array(");
+			context.writeExpr(context.getArgument(0));
+			context.getWriter().append(".data.buffer)");
+		}
+
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsHooks.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsHooks.java
index 0e81d61..fe6033e 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsHooks.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsHooks.java
@@ -29,4 +29,7 @@ public abstract class JSEaglercraftXOptsHooks implements JSObject {
 	@JSBody(script = "return (typeof this.crashReportShow === \"function\") ? this.crashReportShow : null;")
 	public native JSObject getCrashReportHook();
 
+	@JSBody(script = "return (typeof this.screenChanged === \"function\") ? this.screenChanged : null;")
+	public native JSObject getScreenChangedHook();
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsRoot.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsRoot.java
index d70c07b..b6291aa 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsRoot.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsRoot.java
@@ -96,7 +96,79 @@ public abstract class JSEaglercraftXOptsRoot implements JSObject {
 	@JSBody(params = { "def" }, script = "return (typeof this.enableMinceraft === \"boolean\") ? this.enableMinceraft : def;")
 	public native boolean getEnableMinceraft(boolean defaultValue);
 
+	@JSBody(params = { "def" }, script = "return (typeof this.enableServerCookies === \"boolean\") ? this.enableServerCookies : def;")
+	public native boolean getEnableServerCookies(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.allowServerRedirects === \"boolean\") ? this.allowServerRedirects : def;")
+	public native boolean getAllowServerRedirects(boolean defaultValue);
+
 	@JSBody(params = { "def" }, script = "return (typeof this.crashOnUncaughtExceptions === \"boolean\") ? this.crashOnUncaughtExceptions : def;")
 	public native boolean getCrashOnUncaughtExceptions(boolean defaultValue);
 
+	@JSBody(params = { "def" }, script = "return (typeof this.openDebugConsoleOnLaunch === \"boolean\") ? this.openDebugConsoleOnLaunch : def;")
+	public native boolean getOpenDebugConsoleOnLaunch(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.fixDebugConsoleUnloadListener === \"boolean\") ? this.fixDebugConsoleUnloadListener : def;")
+	public native boolean getFixDebugConsoleUnloadListener(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.forceWebViewSupport === \"boolean\") ? this.forceWebViewSupport : def;")
+	public native boolean getForceWebViewSupport(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.enableWebViewCSP === \"boolean\") ? this.enableWebViewCSP : def;")
+	public native boolean getEnableWebViewCSP(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.autoFixLegacyStyleAttr === \"boolean\") ? this.autoFixLegacyStyleAttr : def;")
+	public native boolean getAutoFixLegacyStyleAttr(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.showBootMenuOnLaunch === \"boolean\") ? this.showBootMenuOnLaunch : def;")
+	public native boolean getShowBootMenuOnLaunch(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.bootMenuBlocksUnsignedClients === \"boolean\") ? this.bootMenuBlocksUnsignedClients : def;")
+	public native boolean getBootMenuBlocksUnsignedClients(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.allowBootMenu === \"boolean\") ? this.allowBootMenu : def;")
+	public native boolean getAllowBootMenu(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.forceProfanityFilter === \"boolean\") ? this.forceProfanityFilter : def;")
+	public native boolean getForceProfanityFilter(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.forceWebGL1 === \"boolean\") ? this.forceWebGL1 : def;")
+	public native boolean getForceWebGL1(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.forceWebGL2 === \"boolean\") ? this.forceWebGL2 : def;")
+	public native boolean getForceWebGL2(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.allowExperimentalWebGL1 === \"boolean\") ? this.allowExperimentalWebGL1 : def;")
+	public native boolean getAllowExperimentalWebGL1(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.useWebGLExt === \"boolean\") ? this.useWebGLExt : def;")
+	public native boolean getUseWebGLExt(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.useDelayOnSwap === \"boolean\") ? this.useDelayOnSwap : def;")
+	public native boolean getUseDelayOnSwap(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.useJOrbisAudioDecoder === \"boolean\") ? this.useJOrbisAudioDecoder : def;")
+	public native boolean getUseJOrbisAudioDecoder(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.useXHRFetch === \"boolean\") ? this.useXHRFetch : def;")
+	public native boolean getUseXHRFetch(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.useVisualViewport === \"boolean\") ? this.useVisualViewport : def;")
+	public native boolean getUseVisualViewport(boolean defaultValue);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.deobfStackTraces === \"boolean\") ? this.deobfStackTraces : def;")
+	public native boolean getDeobfStackTraces(boolean deobfStackTraces);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.disableBlobURLs === \"boolean\") ? this.disableBlobURLs : def;")
+	public native boolean getDisableBlobURLs(boolean deobfStackTraces);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.eaglerNoDelay === \"boolean\") ? this.eaglerNoDelay : def;")
+	public native boolean getEaglerNoDelay(boolean deobfStackTraces);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.ramdiskMode === \"boolean\") ? this.ramdiskMode : def;")
+	public native boolean getRamdiskMode(boolean deobfStackTraces);
+
+	@JSBody(params = { "def" }, script = "return (typeof this.singleThreadMode === \"boolean\") ? this.singleThreadMode : def;")
+	public native boolean getSingleThreadMode(boolean deobfStackTraces);
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsServer.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsServer.java
index 4eb8ab6..4936a2e 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsServer.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsServer.java
@@ -23,6 +23,9 @@ public abstract class JSEaglercraftXOptsServer implements JSObject {
 	@JSBody(script = "return (typeof this.addr === \"string\") ? this.addr : null;")
 	public native String getAddr();
 
+	@JSBody(params = { "def" }, script = "return (typeof this.hideAddr === \"boolean\") ? this.hideAddr : def;")
+	public native boolean getHideAddr(boolean defaultValue);
+
 	@JSBody(params = { "def" }, script = "return (typeof this.name === \"string\") ? this.name : def;")
 	public native String getName(String defaultValue);
 
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java
index 535bc75..bae2309 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java
@@ -1,5 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.sp.internal;
 
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -9,15 +10,19 @@ import org.teavm.jso.JSFunctor;
 import org.teavm.jso.JSObject;
 import org.teavm.jso.dom.events.ErrorEvent;
 import org.teavm.jso.dom.events.EventListener;
+import org.teavm.jso.dom.html.HTMLScriptElement;
 import org.teavm.jso.typedarrays.ArrayBuffer;
 import org.teavm.jso.workers.Worker;
 
 import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMBlobURLManager;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMClientConfigAdapter;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.sp.server.internal.teavm.SingleThreadWorker;
 
 /**
  * Copyright (c) 2023-2024 lax1dude. All Rights Reserved.
@@ -38,28 +43,34 @@ public class ClientPlatformSingleplayer {
 
 	private static final Logger logger = LogManager.getLogger("ClientPlatformSingleplayer");
 
-	private static final LinkedList<IPCPacketData> messageQueue = new LinkedList();
+	private static final LinkedList<IPCPacketData> messageQueue = new LinkedList<>();
 
-	@JSBody(params = {}, script = "return (typeof window.eaglercraftXClientScriptElement !== \"undefined\") ? window.eaglercraftXClientScriptElement : null;")
+	@JSBody(params = {}, script = "return (typeof eaglercraftXClientScriptElement !== \"undefined\") ? eaglercraftXClientScriptElement : null;")
 	private static native JSObject loadIntegratedServerSourceOverride();
 
-	@JSBody(params = {}, script = "return (typeof window.eaglercraftXClientScriptURL === \"string\") ? window.eaglercraftXClientScriptURL : null;")
+	@JSBody(params = {}, script = "return (typeof eaglercraftXClientScriptURL === \"string\") ? eaglercraftXClientScriptURL : null;")
 	private static native String loadIntegratedServerSourceOverrideURL();
 
-	@JSBody(params = {}, script = "try{throw new Error();}catch(ex){return ex.stack;}return null;")
+	@JSBody(params = {}, script = "try{throw new Error();}catch(ex){return ex.stack||null;}return null;")
 	private static native String loadIntegratedServerSourceStack();
 
 	@JSBody(params = { "csc" }, script = "if(typeof csc.src === \"string\" && csc.src.length > 0) return csc.src; else return null;")
 	private static native String loadIntegratedServerSourceURL(JSObject scriptTag);
 
-	@JSBody(params = { "csc", "tail" }, script = "const cscText = csc.text;"
+	@JSBody(params = { "csc", "tail" }, script = "var cscText = csc.text;"
 			+ "if(typeof cscText === \"string\" && cscText.length > 0) return new Blob([cscText, tail], { type: \"text/javascript;charset=utf8\" });"
 			+ "else return null;")
 	private static native JSObject loadIntegratedServerSourceInline(JSObject scriptTag, String tail);
 
+	@JSBody(params = { "csc" }, script = "var cscText = csc.text;"
+			+ "if(typeof cscText === \"string\" && cscText.length > 0) return cscText;"
+			+ "else return null;")
+	private static native String loadIntegratedServerSourceInlineStr(JSObject scriptTag);
+
 	private static String integratedServerSource = null;
 	private static String integratedServerSourceOriginalURL = null;
 	private static boolean serverSourceLoaded = false;
+	private static boolean isSingleThreadMode = false;
 
 	private static Worker workerObj = null;
 
@@ -68,7 +79,7 @@ public class ClientPlatformSingleplayer {
 		public void onMessage(String channel, ArrayBuffer buf);
 	}
 
-	@JSBody(params = { "w", "wb" }, script = "w.onmessage = function(o) { wb(o.data.ch, o.data.dat); };")
+	@JSBody(params = { "w", "wb" }, script = "w.addEventListener(\"message\", function(o) { wb(o.data.ch, o.data.dat); });")
 	private static native void registerPacketHandler(Worker w, WorkerBinaryPacketHandler wb);
 
 	@JSBody(params = { "w", "ch", "dat" }, script = "w.postMessage({ ch: ch, dat : dat });")
@@ -108,13 +119,13 @@ public class ClientPlatformSingleplayer {
 	private static JSObject loadIntegratedServerSource() {
 		String str = loadIntegratedServerSourceOverrideURL();
 		if(str != null) {
-			ArrayBuffer buf = PlatformRuntime.downloadRemoteURI(str);
+			ArrayBuffer buf = PlatformRuntime.downloadRemoteURI(str, true);
 			if(buf != null) {
 				integratedServerSourceOriginalURL = str;
-				logger.info("Using integrated server at: {}", str);
+				logger.info("Using integrated server at: {}", truncateURL(str));
 				return createBlobObj(buf, workerBootstrapCode);
 			}else {
-				logger.error("Failed to load integrated server: {}", str);
+				logger.error("Failed to load integrated server: {}", truncateURL(str));
 			}
 		}
 		JSObject el = loadIntegratedServerSourceOverride();
@@ -128,25 +139,34 @@ public class ClientPlatformSingleplayer {
 					return el;
 				}
 			}else {
-				ArrayBuffer buf = PlatformRuntime.downloadRemoteURI(url);
+				ArrayBuffer buf = PlatformRuntime.downloadRemoteURI(url, true);
 				if(buf != null) {
 					integratedServerSourceOriginalURL = url;
-					logger.info("Using integrated server from script tag src: {}", url);
+					logger.info("Using integrated server from script tag src: {}", truncateURL(url));
 					return createBlobObj(buf, workerBootstrapCode);
 				}else {
-					logger.error("Failed to load integrated server from script tag src: {}", url);
+					logger.error("Failed to load integrated server from script tag src: {}", truncateURL(url));
 				}
 			}
 		}
 		str = TeaVMUtils.tryResolveClassesSource();
 		if(str != null) {
-			ArrayBuffer buf = PlatformRuntime.downloadRemoteURI(str);
+			ArrayBuffer buf = PlatformRuntime.downloadRemoteURI(str, true);
 			if(buf != null) {
 				integratedServerSourceOriginalURL = str;
-				logger.info("Using integrated server from script src: {}", str);
+				logger.info("Using integrated server from script src: {}", truncateURL(str));
 				return createBlobObj(buf, workerBootstrapCode);
 			}else {
-				logger.error("Failed to load integrated server from script src: {}", str);
+				logger.error("Failed to load integrated server from script src: {}", truncateURL(str));
+			}
+		}
+		HTMLScriptElement sc = TeaVMUtils.tryResolveClassesSourceInline();
+		if(sc != null) {
+			el = loadIntegratedServerSourceInline(sc, workerBootstrapCode);
+			if(el != null) {
+				integratedServerSourceOriginalURL = "inline script tag (client guess)";
+				logger.info("Loading integrated server from (likely) inline script tag");
+				return el;
 			}
 		}
 		logger.info("Could not resolve the location of client's classes.js!");
@@ -155,12 +175,57 @@ public class ClientPlatformSingleplayer {
 		return null;
 	}
 
+	private static String truncateURL(String url) {
+		if(url == null) return null;
+		if(url.length() > 256) {
+			url = url.substring(0, 254) + "...";
+		}
+		return url;
+	}
+
 	private static String createIntegratedServerWorkerURL() {
 		JSObject blobObj = loadIntegratedServerSource();
 		if(blobObj == null) {
 			return null;
 		}
-		return createWorkerScriptURL(blobObj);
+		return TeaVMBlobURLManager.registerNewURLBlob(blobObj).toExternalForm();
+	}
+
+	public static byte[] getIntegratedServerSourceTeaVM() {
+		String str = loadIntegratedServerSourceOverrideURL();
+		if(str != null) {
+			ArrayBuffer buf = PlatformRuntime.downloadRemoteURI(str, true);
+			if(buf != null) {
+				return TeaVMUtils.wrapByteArrayBuffer(buf);
+			}
+		}
+		JSObject el = loadIntegratedServerSourceOverride();
+		if(el != null) {
+			String url = loadIntegratedServerSourceURL(el);
+			if(url == null) {
+				str = loadIntegratedServerSourceInlineStr(el);
+				if(str != null) {
+					return str.getBytes(StandardCharsets.UTF_8);
+				}
+			}else {
+				ArrayBuffer buf = PlatformRuntime.downloadRemoteURI(url, true);
+				if(buf != null) {
+					return TeaVMUtils.wrapByteArrayBuffer(buf);
+				}
+			}
+		}
+		str = TeaVMUtils.tryResolveClassesSource();
+		if(str != null) {
+			ArrayBuffer buf = PlatformRuntime.downloadRemoteURI(str, true);
+			if(buf != null) {
+				return TeaVMUtils.wrapByteArrayBuffer(buf);
+			}
+		}
+		HTMLScriptElement sc = TeaVMUtils.tryResolveClassesSourceInline();
+		if(sc != null) {
+			return sc.getText().getBytes(StandardCharsets.UTF_8);
+		}
+		return null;
 	}
 
 	public static String getLoadedWorkerURLTeaVM() {
@@ -171,36 +236,58 @@ public class ClientPlatformSingleplayer {
 		return (serverSourceLoaded && workerObj != null) ? integratedServerSourceOriginalURL : null;
 	}
 
-	public static void startIntegratedServer() {
-		if(!serverSourceLoaded) {
-			integratedServerSource = createIntegratedServerWorkerURL();
-			serverSourceLoaded = true;
-		}
-		
-		if(integratedServerSource == null) {
-			throw new RuntimeException("Could not resolve the location of client's classes.js! Make sure client's classes.js is linked/embedded in a dedicated <script> tag. Define \"window.eaglercraftXClientScriptElement\" or \"window.eaglercraftXClientScriptURL\" to force");
-		}
-		
-		workerObj = Worker.create(integratedServerSource);
-		workerObj.onError(new EventListener<ErrorEvent>() {
-			@Override
-			public void handleEvent(ErrorEvent evt) {
-				logger.error("Worker Error: {}", evt.getError());
-				PlatformRuntime.printNativeExceptionToConsoleTeaVM(evt);
+	public static void startIntegratedServer(boolean singleThreadMode) {
+		singleThreadMode |= ((TeaVMClientConfigAdapter)PlatformRuntime.getClientConfigAdapter()).isSingleThreadModeTeaVM();
+		if(singleThreadMode) {
+			if(!isSingleThreadMode) {
+				SingleThreadWorker.singleThreadStartup((pkt) -> {
+					synchronized(messageQueue) {
+						messageQueue.add(pkt);
+					}
+				});
+				isSingleThreadMode = true;
 			}
-		});
-		registerPacketHandler(workerObj, new WorkerBinaryPacketHandlerImpl());
-		sendWorkerStartPacket(workerObj, PlatformRuntime.getClientConfigAdapter().getIntegratedServerOpts().toString());
-		
+		}else {
+			if(!serverSourceLoaded) {
+				integratedServerSource = createIntegratedServerWorkerURL();
+				serverSourceLoaded = true;
+			}
+			
+			if(integratedServerSource == null) {
+				logger.error("Could not resolve the location of client's classes.js! Make sure client's classes.js is linked/embedded in a dedicated <script> tag. Define \"window.eaglercraftXClientScriptElement\" or \"window.eaglercraftXClientScriptURL\" to force");
+				logger.error("Falling back to single thread mode...");
+				startIntegratedServer(true);
+				return;
+			}
+			
+			workerObj = Worker.create(integratedServerSource);
+			workerObj.addEventListener("error", new EventListener<ErrorEvent>() {
+				@Override
+				public void handleEvent(ErrorEvent evt) {
+					logger.error("Worker Error: {}", evt.getError());
+					PlatformRuntime.printNativeExceptionToConsoleTeaVM(evt);
+				}
+			});
+			registerPacketHandler(workerObj, new WorkerBinaryPacketHandlerImpl());
+			sendWorkerStartPacket(workerObj, PlatformRuntime.getClientConfigAdapter().getIntegratedServerOpts().toString());
+		}
 	}
 
 	public static void sendPacket(IPCPacketData packet) {
-		sendPacketTeaVM(packet.channel, TeaVMUtils.unwrapArrayBuffer(packet.contents));
+		if(isSingleThreadMode) {
+			SingleThreadWorker.sendPacketToWorker(packet);
+		}else {
+			sendPacketTeaVM(packet.channel, TeaVMUtils.unwrapArrayBuffer(packet.contents));
+		}
 	}
 
 	public static void sendPacketTeaVM(String channel, ArrayBuffer packet) {
-		if(workerObj != null) {
-			sendWorkerPacket(workerObj, channel, packet);
+		if(isSingleThreadMode) {
+			SingleThreadWorker.sendPacketToWorker(new IPCPacketData(channel, TeaVMUtils.wrapByteArrayBuffer(packet)));
+		}else {
+			if(workerObj != null) {
+				sendWorkerPacket(workerObj, channel, packet);
+			}
 		}
 	}
 
@@ -217,7 +304,7 @@ public class ClientPlatformSingleplayer {
 	}
 
 	public static boolean canKillWorker() {
-		return true;
+		return !isSingleThreadMode;
 	}
 
 	public static void killWorker() {
@@ -228,7 +315,17 @@ public class ClientPlatformSingleplayer {
 	}
 
 	public static boolean isRunningSingleThreadMode() {
-		return false;
+		return isSingleThreadMode;
+	}
+
+	public static boolean isSingleThreadModeSupported() {
+		return true;
+	}
+
+	public static void updateSingleThreadMode() {
+		if(isSingleThreadMode) {
+			SingleThreadWorker.singleThreadUpdate();
+		}
 	}
 
 	public static void showCrashReportOverlay(String report, int x, int y, int w, int h) {
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java
index adf96a5..ef40e38 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java
@@ -3,17 +3,36 @@ package net.lax1dude.eaglercraft.v1_8.sp.server.internal;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
 
+import org.teavm.interop.Async;
+import org.teavm.interop.AsyncCallback;
 import org.teavm.jso.JSBody;
 import org.teavm.jso.JSFunctor;
 import org.teavm.jso.JSObject;
+import org.teavm.jso.browser.Window;
+import org.teavm.jso.core.JSString;
+import org.teavm.jso.dom.events.EventListener;
+import org.teavm.jso.dom.events.MessageEvent;
 import org.teavm.jso.typedarrays.ArrayBuffer;
 
+import com.google.common.collect.Collections2;
+
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.Filesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.IClientConfigAdapter;
+import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.ES6ShimStatus;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.EnumES6ShimStatus;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.EnumES6Shims;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.MessageChannel;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMBlobURLManager;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMClientConfigAdapter;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
+import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -36,7 +55,17 @@ public class ServerPlatformSingleplayer {
 
 	private static final Logger logger = LogManager.getLogger("ServerPlatformSingleplayer");
 
-	private static final LinkedList<IPCPacketData> messageQueue = new LinkedList();
+	private static final LinkedList<IPCPacketData> messageQueue = new LinkedList<>();
+
+	private static boolean immediateContinueSupport = false;
+	private static MessageChannel immediateContinueChannel = null;
+	private static Runnable currentContinueHack = null;
+	private static final Object immediateContLock = new Object();
+	private static final JSString emptyJSString = JSString.valueOf("");
+	private static boolean singleThreadMode = false;
+	private static Consumer<IPCPacketData> singleThreadCB = null;
+
+	private static IEaglerFilesystem filesystem = null;
 
 	@JSFunctor
 	private static interface WorkerBinaryPacketHandler extends JSObject {
@@ -63,7 +92,7 @@ public class ServerPlatformSingleplayer {
 		
 	}
 
-	@JSBody(params = { "wb" }, script = "onmessage = function(o) { wb(o.data.ch, o.data.dat); };")
+	@JSBody(params = { "wb" }, script = "__eaglerXOnMessage = function(o) { wb(o.data.ch, o.data.dat); };")
 	private static native void registerPacketHandler(WorkerBinaryPacketHandler wb);
 
 	public static void register() {
@@ -71,14 +100,66 @@ public class ServerPlatformSingleplayer {
 	}
 
 	public static void initializeContext() {
-		PlatformFilesystem.initialize(getClientConfigAdapter().getWorldsDB());
+		singleThreadMode = false;
+		singleThreadCB = null;
+		ES6ShimStatus shimStatus = ES6ShimStatus.getRuntimeStatus();
+		if(shimStatus != null) {
+			EnumES6ShimStatus stat = shimStatus.getStatus();
+			switch(stat) {
+			case STATUS_ERROR:
+			case STATUS_DISABLED_ERRORS:
+				logger.error("ES6 Shim Status: {}", stat.statusDesc);
+				break;
+			case STATUS_ENABLED_ERRORS:
+				logger.error("ES6 Shim Status: {}", stat.statusDesc);
+				dumpShims(shimStatus.getShims());
+				break;
+			case STATUS_DISABLED:
+			case STATUS_NOT_PRESENT:
+				logger.info("ES6 Shim Status: {}", stat.statusDesc);
+				break;
+			case STATUS_ENABLED:
+				logger.info("ES6 Shim Status: {}", stat.statusDesc);
+				dumpShims(shimStatus.getShims());
+				break;
+			default:
+				break;
+			}
+		}
+		
+		TeaVMBlobURLManager.initialize();
+		
+		checkImmediateContinueSupport();
+		
+		filesystem = Filesystem.getHandleFor(getClientConfigAdapter().getWorldsDB());
+		VFile2.setPrimaryFilesystem(filesystem);
+	}
+
+	public static IEaglerFilesystem getWorldsDatabase() {
+		return filesystem;
+	}
+
+	public static void initializeContextSingleThread(Consumer<IPCPacketData> packetSendCallback) {
+		singleThreadMode = true;
+		singleThreadCB = packetSendCallback;
+		filesystem = Filesystem.getHandleFor(getClientConfigAdapter().getWorldsDB());
+	}
+
+	private static void dumpShims(Set<EnumES6Shims> shims) {
+		if(!shims.isEmpty()) {
+			logger.info("(Enabled {} shims: {})", shims.size(), String.join(", ", Collections2.transform(shims, (shim) -> shim.shimDesc)));
+		}
 	}
 
 	@JSBody(params = { "ch", "dat" }, script = "postMessage({ ch: ch, dat : dat });")
 	public static native void sendPacketTeaVM(String channel, ArrayBuffer arr);
 
 	public static void sendPacket(IPCPacketData packet) {
-		sendPacketTeaVM(packet.channel, TeaVMUtils.unwrapArrayBuffer(packet.contents));
+		if(singleThreadMode) {
+			singleThreadCB.accept(packet);
+		}else {
+			sendPacketTeaVM(packet.channel, TeaVMUtils.unwrapArrayBuffer(packet.contents));
+		}
 	}
 
 	public static List<IPCPacketData> recieveAllPacket() {
@@ -86,7 +167,7 @@ public class ServerPlatformSingleplayer {
 			if(messageQueue.size() == 0) {
 				return null;
 			}else {
-				List<IPCPacketData> ret = new ArrayList(messageQueue);
+				List<IPCPacketData> ret = new ArrayList<>(messageQueue);
 				messageQueue.clear();
 				return ret;
 			}
@@ -96,4 +177,118 @@ public class ServerPlatformSingleplayer {
 	public static IClientConfigAdapter getClientConfigAdapter() {
 		return TeaVMClientConfigAdapter.instance;
 	}
+
+	private static void checkImmediateContinueSupport() {
+		try {
+			immediateContinueSupport = false;
+			if(!MessageChannel.supported()) {
+				logger.error("Fast immediate continue will be disabled for server context due to MessageChannel being unsupported");
+				return;
+			}
+			immediateContinueChannel = MessageChannel.create();
+			immediateContinueChannel.getPort1().addEventListener("message", new EventListener<MessageEvent>() {
+				@Override
+				public void handleEvent(MessageEvent evt) {
+					Runnable toRun;
+					synchronized(immediateContLock) {
+						toRun = currentContinueHack;
+						currentContinueHack = null;
+					}
+					if(toRun != null) {
+						toRun.run();
+					}
+				}
+			});
+			immediateContinueChannel.getPort1().start();
+			immediateContinueChannel.getPort2().start();
+			final boolean[] checkMe = new boolean[1];
+			checkMe[0] = false;
+			currentContinueHack = () -> {
+				checkMe[0] = true;
+			};
+			immediateContinueChannel.getPort2().postMessage(emptyJSString);
+			if(checkMe[0]) {
+				currentContinueHack = null;
+				if(immediateContinueChannel != null) {
+					safeShutdownChannel(immediateContinueChannel);
+				}
+				immediateContinueChannel = null;
+				logger.error("Fast immediate continue will be disabled for server context due to actually continuing immediately");
+				return;
+			}
+			EagUtils.sleep(10l);
+			currentContinueHack = null;
+			if(!checkMe[0]) {
+				if(immediateContinueChannel != null) {
+					safeShutdownChannel(immediateContinueChannel);
+				}
+				immediateContinueChannel = null;
+				logger.error("Fast immediate continue will be disabled for server context due to startup check failing");
+			}else {
+				immediateContinueSupport = true;
+			}
+		}catch(Throwable t) {
+			logger.error("Fast immediate continue will be disabled for server context due to exceptions");
+			immediateContinueSupport = false;
+			if(immediateContinueChannel != null) {
+				safeShutdownChannel(immediateContinueChannel);
+			}
+			immediateContinueChannel = null;
+		}
+	}
+
+	private static void safeShutdownChannel(MessageChannel chan) {
+		try {
+			chan.getPort1().close();
+		}catch(Throwable tt) {
+		}
+		try {
+			chan.getPort2().close();
+		}catch(Throwable tt) {
+		}
+	}
+
+	public static void immediateContinue() {
+		if(singleThreadMode) {
+			PlatformRuntime.immediateContinue();
+		}else {
+			if(immediateContinueSupport) {
+				immediateContinueTeaVM();
+			}else {
+				EagUtils.sleep(0l);
+			}
+		}
+	}
+
+	@Async
+	private static native void immediateContinueTeaVM();
+	
+	private static void immediateContinueTeaVM(final AsyncCallback<Void> cb) {
+		synchronized(immediateContLock) {
+			if(currentContinueHack != null) {
+				cb.error(new IllegalStateException("Worker thread is already waiting for an immediate continue callback!"));
+				return;
+			}
+			currentContinueHack = () -> {
+				cb.complete(null);
+			};
+			try {
+				immediateContinueChannel.getPort2().postMessage(emptyJSString);
+			}catch(Throwable t) {
+				logger.error("Caught error posting immediate continue, using setTimeout instead");
+				Window.setTimeout(() -> cb.complete(null), 0);
+			}
+		}
+	}
+
+	public static boolean isSingleThreadMode() {
+		return singleThreadMode;
+	}
+
+	public static void recievePacketSingleThreadTeaVM(IPCPacketData pkt) {
+		synchronized(messageQueue) {
+			messageQueue.add(pkt);
+		}
+	}
+
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/teavm/SingleThreadWorker.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/teavm/SingleThreadWorker.java
new file mode 100755
index 0000000..7c60129
--- /dev/null
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/teavm/SingleThreadWorker.java
@@ -0,0 +1,44 @@
+package net.lax1dude.eaglercraft.v1_8.sp.server.internal.teavm;
+
+import java.util.function.Consumer;
+
+import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerIntegratedServerWorker;
+import net.lax1dude.eaglercraft.v1_8.sp.server.internal.ServerPlatformSingleplayer;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class SingleThreadWorker {
+
+	private static final Logger logger = LogManager.getLogger("SingleThreadWorker");
+
+	public static void singleThreadStartup(Consumer<IPCPacketData> packetSendCallback) {
+		logger.info("Starting single-thread mode worker...");
+		ServerPlatformSingleplayer.initializeContextSingleThread(packetSendCallback);
+		EaglerIntegratedServerWorker.singleThreadMain();
+	}
+
+	public static void sendPacketToWorker(IPCPacketData pkt) {
+		ServerPlatformSingleplayer.recievePacketSingleThreadTeaVM(pkt);
+	}
+
+	public static void singleThreadUpdate() {
+		EaglerIntegratedServerWorker.singleThreadUpdate();
+	}
+
+}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/teavm/WorkerMain.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/teavm/WorkerMain.java
index c58c6b2..a6086f3 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/teavm/WorkerMain.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/teavm/WorkerMain.java
@@ -77,7 +77,7 @@ public class WorkerMain {
 		public void onMessage(String msg);
 	}
 
-	@JSBody(params = { "wb" }, script = "onmessage = function(o) { wb(o.data.msg); };")
+	@JSBody(params = { "wb" }, script = "__eaglerXOnMessage = function(o) { wb(o.data.msg); }; addEventListener(\"message\", function(evt) { __eaglerXOnMessage(evt); });")
 	private static native void setOnMessage(WorkerArgumentsPacketHandler cb);
 
 	@Async
diff --git a/src/teavmc-classpath/resources/org/teavm/backend/javascript/long.js b/src/teavmc-classpath/resources/org/teavm/backend/javascript/long.js
new file mode 100755
index 0000000..87b45ea
--- /dev/null
+++ b/src/teavmc-classpath/resources/org/teavm/backend/javascript/long.js
@@ -0,0 +1,693 @@
+/*
+ *  Copyright 2018 Alexey Andreev.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+"use strict";
+
+var Long_divRem;
+var Long_udivRem;
+var Long_shiftLeft16;
+var Long_shiftRight16;
+var LongInt;
+var LongInt_mul;
+var LongInt_sub;
+var LongInt_add;
+var LongInt_inc;
+var LongInt_dec;
+var LongInt_ucompare;
+var LongInt_numOfLeadingZeroBits;
+var LongInt_shl;
+var LongInt_shr;
+var LongInt_copy;
+var LongInt_div;
+var Long_eq;
+var Long_ne;
+var Long_gt;
+var Long_ge;
+var Long_lt;
+var Long_le;
+var Long_compare;
+var Long_ucompare;
+var Long_add;
+var Long_sub;
+var Long_inc;
+var Long_dec;
+var Long_mul;
+var Long_div;
+var Long_rem;
+var Long_udiv;
+var Long_urem;
+var Long_neg;
+var Long_and;
+var Long_or;
+var Long_xor;
+var Long_shl;
+var Long_shr;
+var Long_shru;
+var Long_not;
+
+if (typeof BigInt !== 'function') {
+    Long_eq = function(a, b) {
+        return a.hi === b.hi && a.lo === b.lo;
+    }
+
+    Long_ne = function(a, b) {
+        return a.hi !== b.hi || a.lo !== b.lo;
+    }
+
+    Long_gt = function(a, b) {
+        if (a.hi < b.hi) {
+            return false;
+        }
+        if (a.hi > b.hi) {
+            return true;
+        }
+        var x = a.lo >>> 1;
+        var y = b.lo >>> 1;
+        if (x !== y) {
+            return x > y;
+        }
+        return (a.lo & 1) > (b.lo & 1);
+    }
+
+    Long_ge = function(a, b) {
+        if (a.hi < b.hi) {
+            return false;
+        }
+        if (a.hi > b.hi) {
+            return true;
+        }
+        var x = a.lo >>> 1;
+        var y = b.lo >>> 1;
+        if (x !== y) {
+            return x >= y;
+        }
+        return (a.lo & 1) >= (b.lo & 1);
+    }
+
+    Long_lt = function(a, b) {
+        if (a.hi > b.hi) {
+            return false;
+        }
+        if (a.hi < b.hi) {
+            return true;
+        }
+        var x = a.lo >>> 1;
+        var y = b.lo >>> 1;
+        if (x !== y) {
+            return x < y;
+        }
+        return (a.lo & 1) < (b.lo & 1);
+    }
+
+    Long_le = function(a, b) {
+        if (a.hi > b.hi) {
+            return false;
+        }
+        if (a.hi < b.hi) {
+            return true;
+        }
+        var x = a.lo >>> 1;
+        var y = b.lo >>> 1;
+        if (x !== y) {
+            return x <= y;
+        }
+        return (a.lo & 1) <= (b.lo & 1);
+    }
+
+    Long_add = function(a, b) {
+        if (a.hi === (a.lo >> 31) && b.hi === (b.lo >> 31)) {
+            return Long_fromNumber(a.lo + b.lo);
+        } else if (Math.abs(a.hi) < Long_MAX_NORMAL && Math.abs(b.hi) < Long_MAX_NORMAL) {
+            return Long_fromNumber(Long_toNumber(a) + Long_toNumber(b));
+        }
+        var a_lolo = a.lo & 0xFFFF;
+        var a_lohi = a.lo >>> 16;
+        var a_hilo = a.hi & 0xFFFF;
+        var a_hihi = a.hi >>> 16;
+        var b_lolo = b.lo & 0xFFFF;
+        var b_lohi = b.lo >>> 16;
+        var b_hilo = b.hi & 0xFFFF;
+        var b_hihi = b.hi >>> 16;
+
+        var lolo = (a_lolo + b_lolo) | 0;
+        var lohi = (a_lohi + b_lohi + (lolo >> 16)) | 0;
+        var hilo = (a_hilo + b_hilo + (lohi >> 16)) | 0;
+        var hihi = (a_hihi + b_hihi + (hilo >> 16)) | 0;
+        return new Long((lolo & 0xFFFF) | ((lohi & 0xFFFF) << 16), (hilo & 0xFFFF) | ((hihi & 0xFFFF) << 16));
+    }
+
+    Long_inc = function(a) {
+        var lo = (a.lo + 1) | 0;
+        var hi = a.hi;
+        if (lo === 0) {
+            hi = (hi + 1) | 0;
+        }
+        return new Long(lo, hi);
+    }
+
+    Long_dec = function(a) {
+        var lo = (a.lo - 1) | 0;
+        var hi = a.hi;
+        if (lo === -1) {
+            hi = (hi - 1) | 0;
+        }
+        return new Long(lo, hi);
+    }
+
+    Long_neg = function(a) {
+        return Long_inc(new Long(a.lo ^ 0xFFFFFFFF, a.hi ^ 0xFFFFFFFF));
+    }
+
+    Long_sub = function(a, b) {
+        if (a.hi === (a.lo >> 31) && b.hi === (b.lo >> 31)) {
+            return Long_fromNumber(a.lo - b.lo);
+        }
+        var a_lolo = a.lo & 0xFFFF;
+        var a_lohi = a.lo >>> 16;
+        var a_hilo = a.hi & 0xFFFF;
+        var a_hihi = a.hi >>> 16;
+        var b_lolo = b.lo & 0xFFFF;
+        var b_lohi = b.lo >>> 16;
+        var b_hilo = b.hi & 0xFFFF;
+        var b_hihi = b.hi >>> 16;
+
+        var lolo = (a_lolo - b_lolo) | 0;
+        var lohi = (a_lohi - b_lohi + (lolo >> 16)) | 0;
+        var hilo = (a_hilo - b_hilo + (lohi >> 16)) | 0;
+        var hihi = (a_hihi - b_hihi + (hilo >> 16)) | 0;
+        return new Long((lolo & 0xFFFF) | ((lohi & 0xFFFF) << 16), (hilo & 0xFFFF) | ((hihi & 0xFFFF) << 16));
+    }
+
+    Long_compare = function(a, b) {
+        var r = a.hi - b.hi;
+        if (r !== 0) {
+            return r;
+        }
+        r = (a.lo >>> 1) - (b.lo >>> 1);
+        if (r !== 0) {
+            return r;
+        }
+        return (a.lo & 1) - (b.lo & 1);
+    }
+
+    Long_ucompare = function(a, b) {
+        var r = $rt_ucmp(a.hi, b.hi);
+        if (r !== 0) {
+            return r;
+        }
+        r = (a.lo >>> 1) - (b.lo >>> 1);
+        if (r !== 0) {
+            return r;
+        }
+        return (a.lo & 1) - (b.lo & 1);
+    }
+
+    Long_mul = function(a, b) {
+        var positive = Long_isNegative(a) === Long_isNegative(b);
+        if (Long_isNegative(a)) {
+            a = Long_neg(a);
+        }
+        if (Long_isNegative(b)) {
+            b = Long_neg(b);
+        }
+        var a_lolo = a.lo & 0xFFFF;
+        var a_lohi = a.lo >>> 16;
+        var a_hilo = a.hi & 0xFFFF;
+        var a_hihi = a.hi >>> 16;
+        var b_lolo = b.lo & 0xFFFF;
+        var b_lohi = b.lo >>> 16;
+        var b_hilo = b.hi & 0xFFFF;
+        var b_hihi = b.hi >>> 16;
+
+        var lolo = 0;
+        var lohi = 0;
+        var hilo = 0;
+        var hihi = 0;
+        lolo = (a_lolo * b_lolo) | 0;
+        lohi = lolo >>> 16;
+        lohi = ((lohi & 0xFFFF) + a_lohi * b_lolo) | 0;
+        hilo = (hilo + (lohi >>> 16)) | 0;
+        lohi = ((lohi & 0xFFFF) + a_lolo * b_lohi) | 0;
+        hilo = (hilo + (lohi >>> 16)) | 0;
+        hihi = hilo >>> 16;
+        hilo = ((hilo & 0xFFFF) + a_hilo * b_lolo) | 0;
+        hihi = (hihi + (hilo >>> 16)) | 0;
+        hilo = ((hilo & 0xFFFF) + a_lohi * b_lohi) | 0;
+        hihi = (hihi + (hilo >>> 16)) | 0;
+        hilo = ((hilo & 0xFFFF) + a_lolo * b_hilo) | 0;
+        hihi = (hihi + (hilo >>> 16)) | 0;
+        hihi = (hihi + a_hihi * b_lolo + a_hilo * b_lohi + a_lohi * b_hilo + a_lolo * b_hihi) | 0;
+        var result = new Long((lolo & 0xFFFF) | (lohi << 16), (hilo & 0xFFFF) | (hihi << 16));
+        return positive ? result : Long_neg(result);
+    }
+
+    Long_div = function(a, b) {
+        if (Math.abs(a.hi) < Long_MAX_NORMAL && Math.abs(b.hi) < Long_MAX_NORMAL) {
+            return Long_fromNumber(Long_toNumber(a) / Long_toNumber(b));
+        }
+        return Long_divRem(a, b)[0];
+    }
+
+    Long_udiv = function(a, b) {
+        if (a.hi >= 0 && a.hi < Long_MAX_NORMAL && b.hi >= 0 && b.hi < Long_MAX_NORMAL) {
+            return Long_fromNumber(Long_toNumber(a) / Long_toNumber(b));
+        }
+        return Long_udivRem(a, b)[0];
+    }
+
+    Long_rem = function(a, b) {
+        if (Math.abs(a.hi) < Long_MAX_NORMAL && Math.abs(b.hi) < Long_MAX_NORMAL) {
+            return Long_fromNumber(Long_toNumber(a) % Long_toNumber(b));
+        }
+        return Long_divRem(a, b)[1];
+    }
+
+    Long_urem = function(a, b) {
+        if (a.hi >= 0 && a.hi < Long_MAX_NORMAL && b.hi >= 0 && b.hi < Long_MAX_NORMAL) {
+            return Long_fromNumber(Long_toNumber(a) / Long_toNumber(b));
+        }
+        return Long_udivRem(a, b)[1];
+    }
+
+    Long_divRem = function(a, b) {
+        if (b.lo === 0 && b.hi === 0) {
+            throw new Error("Division by zero");
+        }
+        var positive = Long_isNegative(a) === Long_isNegative(b);
+        if (Long_isNegative(a)) {
+            a = Long_neg(a);
+        }
+        if (Long_isNegative(b)) {
+            b = Long_neg(b);
+        }
+        a = new LongInt(a.lo, a.hi, 0);
+        b = new LongInt(b.lo, b.hi, 0);
+        var q = LongInt_div(a, b);
+        a = new Long(a.lo, a.hi);
+        q = new Long(q.lo, q.hi);
+        return positive ? [q, a] : [Long_neg(q), Long_neg(a)];
+    };
+
+    Long_udivRem = function(a, b) {
+        if (b.lo === 0 && b.hi === 0) {
+            throw new Error("Division by zero");
+        }
+        a = new LongInt(a.lo, a.hi, 0);
+        b = new LongInt(b.lo, b.hi, 0);
+        var q = LongInt_div(a, b);
+        a = new Long(a.lo, a.hi);
+        q = new Long(q.lo, q.hi);
+        return [q, a];
+    };
+
+    Long_shiftLeft16 = function(a) {
+        return new Long(a.lo << 16, (a.lo >>> 16) | (a.hi << 16));
+    };
+
+    Long_shiftRight16 = function(a) {
+        return new Long((a.lo >>> 16) | (a.hi << 16), a.hi >>> 16);
+    };
+
+    Long_and = function(a, b) {
+        return new Long(a.lo & b.lo, a.hi & b.hi);
+    }
+
+    Long_or = function(a, b) {
+        return new Long(a.lo | b.lo, a.hi | b.hi);
+    }
+
+    Long_xor = function(a, b) {
+        return new Long(a.lo ^ b.lo, a.hi ^ b.hi);
+    }
+
+    Long_shl = function(a, b) {
+        b &= 63;
+        if (b === 0) {
+            return a;
+        } else if (b < 32) {
+            return new Long(a.lo << b, (a.lo >>> (32 - b)) | (a.hi << b));
+        } else if (b === 32) {
+            return new Long(0, a.lo);
+        } else {
+            return new Long(0, a.lo << (b - 32));
+        }
+    }
+
+    Long_shr = function(a, b) {
+        b &= 63;
+        if (b === 0) {
+            return a;
+        } else if (b < 32) {
+            return new Long((a.lo >>> b) | (a.hi << (32 - b)), a.hi >> b);
+        } else if (b === 32) {
+            return new Long(a.hi, a.hi >> 31);
+        } else {
+            return new Long((a.hi >> (b - 32)), a.hi >> 31);
+        }
+    }
+
+    Long_shru = function(a, b) {
+        b &= 63;
+        if (b === 0) {
+            return a;
+        } else if (b < 32) {
+            return new Long((a.lo >>> b) | (a.hi << (32 - b)), a.hi >>> b);
+        } else if (b === 32) {
+            return new Long(a.hi, 0);
+        } else {
+            return new Long((a.hi >>> (b - 32)), 0);
+        }
+    }
+
+    Long_not = function(a) {
+        return new Long(~a.hi, ~a.lo);
+    }
+
+    // Represents a mutable 80-bit unsigned integer
+    LongInt = function(lo, hi, sup) {
+        this.lo = lo;
+        this.hi = hi;
+        this.sup = sup;
+    };
+
+    LongInt_mul = function(a, b) {
+        var a_lolo = ((a.lo & 0xFFFF) * b) | 0;
+        var a_lohi = ((a.lo >>> 16) * b) | 0;
+        var a_hilo = ((a.hi & 0xFFFF) * b) | 0;
+        var a_hihi = ((a.hi >>> 16) * b) | 0;
+        var sup = (a.sup * b) | 0;
+
+        a_lohi = (a_lohi + (a_lolo >>> 16)) | 0;
+        a_hilo = (a_hilo + (a_lohi >>> 16)) | 0;
+        a_hihi = (a_hihi + (a_hilo >>> 16)) | 0;
+        sup = (sup + (a_hihi >>> 16)) | 0;
+        a.lo = (a_lolo & 0xFFFF) | (a_lohi << 16);
+        a.hi = (a_hilo & 0xFFFF) | (a_hihi << 16);
+        a.sup = sup & 0xFFFF;
+    };
+
+    LongInt_sub = function(a, b) {
+        var a_lolo = a.lo & 0xFFFF;
+        var a_lohi = a.lo >>> 16;
+        var a_hilo = a.hi & 0xFFFF;
+        var a_hihi = a.hi >>> 16;
+        var b_lolo = b.lo & 0xFFFF;
+        var b_lohi = b.lo >>> 16;
+        var b_hilo = b.hi & 0xFFFF;
+        var b_hihi = b.hi >>> 16;
+
+        a_lolo = (a_lolo - b_lolo) | 0;
+        a_lohi = (a_lohi - b_lohi + (a_lolo >> 16)) | 0;
+        a_hilo = (a_hilo - b_hilo + (a_lohi >> 16)) | 0;
+        a_hihi = (a_hihi - b_hihi + (a_hilo >> 16)) | 0;
+        var sup = (a.sup - b.sup + (a_hihi >> 16)) | 0;
+        a.lo = (a_lolo & 0xFFFF) | (a_lohi << 16);
+        a.hi = (a_hilo & 0xFFFF) | (a_hihi << 16);
+        a.sup = sup;
+    };
+
+    LongInt_add = function(a, b) {
+        var a_lolo = a.lo & 0xFFFF;
+        var a_lohi = a.lo >>> 16;
+        var a_hilo = a.hi & 0xFFFF;
+        var a_hihi = a.hi >>> 16;
+        var b_lolo = b.lo & 0xFFFF;
+        var b_lohi = b.lo >>> 16;
+        var b_hilo = b.hi & 0xFFFF;
+        var b_hihi = b.hi >>> 16;
+
+        a_lolo = (a_lolo + b_lolo) | 0;
+        a_lohi = (a_lohi + b_lohi + (a_lolo >> 16)) | 0;
+        a_hilo = (a_hilo + b_hilo + (a_lohi >> 16)) | 0;
+        a_hihi = (a_hihi + b_hihi + (a_hilo >> 16)) | 0;
+        var sup = (a.sup + b.sup + (a_hihi >> 16)) | 0;
+        a.lo = (a_lolo & 0xFFFF) | (a_lohi << 16);
+        a.hi = (a_hilo & 0xFFFF) | (a_hihi << 16);
+        a.sup = sup;
+    };
+
+    LongInt_inc = function(a) {
+        a.lo = (a.lo + 1) | 0;
+        if (a.lo === 0) {
+            a.hi = (a.hi + 1) | 0;
+            if (a.hi === 0) {
+                a.sup = (a.sup + 1) & 0xFFFF;
+            }
+        }
+    };
+
+    LongInt_dec = function(a) {
+        a.lo = (a.lo - 1) | 0;
+        if (a.lo === -1) {
+            a.hi = (a.hi - 1) | 0;
+            if (a.hi === -1) {
+                a.sup = (a.sup - 1) & 0xFFFF;
+            }
+        }
+    };
+
+    LongInt_ucompare = function(a, b) {
+        var r = (a.sup - b.sup);
+        if (r !== 0) {
+            return r;
+        }
+        r = (a.hi >>> 1) - (b.hi >>> 1);
+        if (r !== 0) {
+            return r;
+        }
+        r = (a.hi & 1) - (b.hi & 1);
+        if (r !== 0) {
+            return r;
+        }
+        r = (a.lo >>> 1) - (b.lo >>> 1);
+        if (r !== 0) {
+            return r;
+        }
+        return (a.lo & 1) - (b.lo & 1);
+    };
+
+    LongInt_numOfLeadingZeroBits = function(a) {
+        var n = 0;
+        var d = 16;
+        while (d > 0) {
+            if ((a >>> d) !== 0) {
+                a >>>= d;
+                n = (n + d) | 0;
+            }
+            d = (d / 2) | 0;
+        }
+        return 31 - n;
+    };
+
+    LongInt_shl = function(a, b) {
+        if (b === 0) {
+            return;
+        }
+        if (b < 32) {
+            a.sup = ((a.hi >>> (32 - b)) | (a.sup << b)) & 0xFFFF;
+            a.hi = (a.lo >>> (32 - b)) | (a.hi << b);
+            a.lo <<= b;
+        } else if (b === 32) {
+            a.sup = a.hi & 0xFFFF;
+            a.hi = a.lo;
+            a.lo = 0;
+        } else if (b < 64) {
+            a.sup = ((a.lo >>> (64 - b)) | (a.hi << (b - 32))) & 0xFFFF;
+            a.hi = a.lo << b;
+            a.lo = 0;
+        } else if (b === 64) {
+            a.sup = a.lo & 0xFFFF;
+            a.hi = 0;
+            a.lo = 0;
+        } else {
+            a.sup = (a.lo << (b - 64)) & 0xFFFF;
+            a.hi = 0;
+            a.lo = 0;
+        }
+    };
+
+    LongInt_shr = function(a, b) {
+        if (b === 0) {
+            return;
+        }
+        if (b === 32) {
+            a.lo = a.hi;
+            a.hi = a.sup;
+            a.sup = 0;
+        } else if (b < 32) {
+            a.lo = (a.lo >>> b) | (a.hi << (32 - b));
+            a.hi = (a.hi >>> b) | (a.sup << (32 - b));
+            a.sup >>>= b;
+        } else if (b === 64) {
+            a.lo = a.sup;
+            a.hi = 0;
+            a.sup = 0;
+        } else if (b < 64) {
+            a.lo = (a.hi >>> (b - 32)) | (a.sup << (64 - b));
+            a.hi = a.sup >>> (b - 32);
+            a.sup = 0;
+        } else {
+            a.lo = a.sup >>> (b - 64);
+            a.hi = 0;
+            a.sup = 0;
+        }
+    };
+
+    LongInt_copy = function(a) {
+        return new LongInt(a.lo, a.hi, a.sup);
+    };
+
+    LongInt_div = function(a, b) {
+        // Normalize divisor
+        var bits = b.hi !== 0 ? LongInt_numOfLeadingZeroBits(b.hi) : LongInt_numOfLeadingZeroBits(b.lo) + 32;
+        var sz = 1 + ((bits / 16) | 0);
+        var dividentBits = bits % 16;
+        LongInt_shl(b, bits);
+        LongInt_shl(a, dividentBits);
+        var q = new LongInt(0, 0, 0);
+        while (sz-- > 0) {
+            LongInt_shl(q, 16);
+            // Calculate approximate q
+            var digitA = (a.hi >>> 16) + (0x10000 * a.sup);
+            var digitB = b.hi >>> 16;
+            var digit = (digitA / digitB) | 0;
+            var t = LongInt_copy(b);
+            LongInt_mul(t, digit);
+            // Adjust q either down or up
+            if (LongInt_ucompare(t, a) >= 0) {
+                while (LongInt_ucompare(t, a) > 0) {
+                    LongInt_sub(t, b);
+                    --digit;
+                }
+            } else {
+                while (true) {
+                    var nextT = LongInt_copy(t);
+                    LongInt_add(nextT, b);
+                    if (LongInt_ucompare(nextT, a) > 0) {
+                        break;
+                    }
+                    t = nextT;
+                    ++digit;
+                }
+            }
+            LongInt_sub(a, t);
+            q.lo |= digit;
+            LongInt_shl(a, 16);
+        }
+        LongInt_shr(a, bits + 16);
+        return q;
+    };
+} else {
+    Long_eq = function(a, b) {
+        return a === b;
+    }
+
+    Long_ne = function(a, b) {
+        return a !== b;
+    }
+
+    Long_gt = function(a, b) {
+        return a > b;
+    }
+
+    Long_ge = function(a, b) {
+        return a >= b;
+    }
+
+    Long_lt = function(a, b) {
+        return a < b;
+    }
+
+    Long_le = function(a, b) {
+        return a <= b;
+    }
+
+    Long_add = function(a, b) {
+        return BigInt.asIntN(64, a + b);
+    }
+
+    Long_inc = function(a) {
+        return BigInt.asIntN(64, a + 1);
+    }
+
+    Long_dec = function(a) {
+        return BigInt.asIntN(64, a - 1);
+    }
+
+    Long_neg = function(a) {
+        return BigInt.asIntN(64, -a);
+    }
+
+    Long_sub = function(a, b) {
+        return BigInt.asIntN(64, a - b);
+    }
+
+    Long_compare = function(a, b) {
+        return a < b ? -1 : a > b ? 1 : 0;
+    }
+    Long_ucompare = function(a, b) {
+        a = BigInt.asUintN(64, a);
+        b = BigInt.asUintN(64, b);
+        return a < b ? -1 : a > b ? 1 : 0;
+    }
+
+    Long_mul = function(a, b) {
+        return BigInt.asIntN(64, a * b);
+    }
+
+    Long_div = function(a, b) {
+        return BigInt.asIntN(64, a / b);
+    }
+
+    Long_udiv = function(a, b) {
+        return BigInt.asIntN(64, BigInt.asUintN(64, a) / BigInt.asUintN(64, b));
+    }
+
+    Long_rem = function(a, b) {
+        return BigInt.asIntN(64, a % b);
+    }
+
+    Long_urem = function(a, b) {
+        return BigInt.asIntN(64, BigInt.asUintN(64, a) % BigInt.asUintN(64, b));
+    }
+
+    Long_and = function(a, b) {
+        return BigInt.asIntN(64, a & b);
+    }
+
+    Long_or = function(a, b) {
+        return BigInt.asIntN(64, a | b);
+    }
+
+    Long_xor = function(a, b) {
+        return BigInt.asIntN(64, a ^ b);
+    }
+
+    Long_shl = function(a, b) {
+        return BigInt.asIntN(64, a << BigInt(b & 63));
+    }
+
+    Long_shr = function(a, b) {
+        return BigInt.asIntN(64, a >> BigInt(b & 63));
+    }
+
+    Long_shru = function(a, b) {
+        return BigInt.asIntN(64, BigInt.asUintN(64, a) >> BigInt(b & 63));
+    }
+
+    Long_not = function(a) {
+        return BigInt.asIntN(64, ~a);
+    }
+}