diff --git a/CREDITS b/CREDITS
index a6ed1369..fe69c9e5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -5,17 +5,19 @@
lax1dude:
- Creator of Eaglercraft
- - Ported the Minecraft 1.8 client src to TeaVM
+ - 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
- Wrote all desktop emulation code
- Wrote EaglercraftXBungee
+ - Wrote WebRTC Relay Server
- Wrote the patch and build system
ayunami2000:
- Many bug fixes
+ - WebRTC LAN worlds
- Added resource packs
- Added screen recording
- Added seamless fullscreen
@@ -129,6 +131,36 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ Project Name: JOML
+ Project Author: httpdigest
+ Project URL: https://github.com/JOML-CI/JOML
+
+ Used For: Math library for some calculations used by the renderer
+
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015-2023 JOML
+ *
+ * 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.
+
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
Project Name: NVIDIA FXAA
Project Author: Timothy Lottes, NVIDIA
Project URL: https://gist.github.com/kosua20/0c506b81b3812ac900048059d2383126
diff --git a/LICENSE b/LICENSE
index 3f0ae0ca..776d3ead 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,25 +1,5 @@
-Copyright (c) 2022-2023 LAX1DUDE. All Rights Reserved.
-
-WITH THE EXCEPTION OF PATCH FILES, MINIFIED JAVASCRIPT, AND ALL FILES NORMALLY
-FOUND IN AN UNMODIFIED MINECRAFT RESOURCE PACK, YOU ARE NOT ALLOWED TO SHARE,
-DISTRIBUTE, OR REPURPOSE ANY FILE USED BY OR PRODUCED BY THE SOFTWARE IN THIS
-REPOSITORY WITHOUT PRIOR PERMISSION FROM THE PROJECT AUTHOR.
-
-NOT FOR COMMERCIAL OR MALICIOUS USE
-
-Prohibited sharing, distribution, and repurposing these files includes but is not
-limited to: Publicly sharing or distributing any significant portion, modified or
-unmodified, of any source code files produced by the buildtools commands without
-minification or obfuscation, with the exception of patch files. Publicly
-repurposing, without permission, the source code for any file which is a part of
-the Eaglercraft runtime, as in any additional source files required for output of
-buildtools commands to run on a specific platform. Publicly repurposing, without
-permission, any resource file found in the project's default resource pack that
-does not exist in vanilla Minecraft resource packs. And, additionally, publicly
-repurposing, without permission, any data produced by the act of compiling or
-converting the files described in these previous three cases, besides the compiled
-or minified application (the 'game') itself.
+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
@@ -31,34 +11,3 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-
-Prohibited commercial use includes selling access to any files or data (including
-the game itself) contained or produced by this repository, requiring the direct
-forced viewing of advertisement presented when a user attempts to load a compiled
-version of this project (or follow a hyperlink to the project's source or files
-derived from it, examples include using adfoc.us or adf.ly on your site), and
-selling content in any form that can only be accessed through the use of this
-project or files produced by or derived from it. Making a pay-to-win multiplayer
-server, for example, would be prohibited under these terms.
-
-Malicious use includes creating and/or distributing modified versions of the
-game's 1.8 client (often referred to as "hacked clients") which give you an unfair
-advantage on multiplayer servers, creating and/or distributing modified clients
-which allow you to exploit bugs in EaglercraftXBungee or Eagler-compatible server
-software, creating and/or distributing modified clients which allow you to exploit
-bugs in Minecraft servers or Minecraft-compatible server software, or creating
-and/or distributing modified clients which allow you to exploit bugs in portions of
-any other software used in companion with EaglerXBungee or on an Eagler-compatible
-server (e.g. VIAaaS, NGINX, Caddy)
-
-Distribution of any file or a product of compilation or conversion covered by this
-document must retain all existing copyright notices found within the file and
-folders before any modifications were made.
-
-BY VIOLATING THESE TERMS YOU AGREE TO A BLOCK/BAN FROM ALL SOURCES OF DOCUMENTATION
-AND SUPPORT FOR THIS PROJECT, PERMISSION TO USE THESE FILES WAS GIVEN TO YOU IN
-GOOD FAITH THAT THE WORK WILL NOT BE ABUSED, AND VIOLATING THIS AGREEMENT IS A
-DEMONSTRATION OF A LACK OF RESPECT AND GOOD INTENTIONS ON BEHALF OF YOUR EFFORTS TO
-LEARN HOW TO USE THESE TOOLS CORRECTLY AND IS JUSTIFICATION FOR YOUR EXCLUSION FROM
-ANY AND ALL SOURCES OF DOCUMENTATION OR SUPPORT THAT WILL ASSIST YOU TO CONTINUE TO
-VIOLATE THESE TERMS
diff --git a/README.md b/README.md
index 73643c1e..8147afb3 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,9 @@
+
# EaglercraftX 1.8
-### Play real Minecraft 1.8 in your browser, currently only supports multiplayer
+### Play Minecraft 1.8 in your browser, supports singleplayer and multiplayer
-
-
-## ATTENTION MOJANG/MICROSOFT EMPLOYEE ASSIGNED TO STALK ME:
-
-### THIS REPOSITORY DOES NOT CONTAIN YOUR INTELLECTUAL PROPERTY
-
-### FILING A FALSE DMCA IS ILLEGAL AND IMMORAL
+
### This repository contains:
@@ -43,24 +38,108 @@
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
-## Making a TOS compliant Server:
+## Singleplayer
-**EaglercraftX 1.8's server is a BungeeCord/Waterfall PLUGIN, not an entire "fork" of bungeecord like the 1.5 Eaglerbungee was, and I can't believe I have to clarify this too but the EaglerXBungee 1.8 plugin is not compatible with the old 1.5 bungee, you must migrate to the latest version of official BungeeCord/Waterfall to use it**
+As of January 2024, singleplayer and shared worlds have been added to EaglercraftX 1.8.
-Simply set up the latest version of BungeeCord or Waterfall and download [EaglerXBungee-Latest.jar](https://gitlab.com/lax1dude/eaglercraftx-1.8/-/raw/main/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar) and place it in the plugins directory.
+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.
-Then to actually log in to the server with Eaglercraft, first join your server using vanilla Minecraft Java Edition 1.8 and run the new `/eagler` command to set a password. Then leave the server and switch to your EaglercraftX client.
+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.
-Set your EaglercraftX username to the same username as the vanilla minecraft account you set the password with, then when you try to join your server it will present you with a login screen where you can enter the password you set. If the password is correct it will let you join the server.
+## Shared Worlds
-If it is required for testing purposes, you can set `online_mode` to `false` on BungeeCord/Waterfall's config.yml to disable password system and join the server without setting a password like the old Eaglercraft. This should never be used in production because it allows you to play without owning a Minecraft account which violates the TOS.
+**This feature used to be known as "LAN Worlds" but has been renamed to "Shared Worlds" to avoid confusion**
-A detailed plugin config guide will be added here too eventually
+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.
-## Contributing:
+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.
-This part of the guide is incomplete
+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".
-## Developing a Client:
+## 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 concise 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.
+
+## 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.
+
+### 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.
+
+## 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
+- `worldsDB:` the name of the IndexedDB database to store worlds 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
+
+## 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/buildtools/BuildTools.jar b/buildtools/BuildTools.jar
index 771a303a..6de57ba8 100644
Binary files a/buildtools/BuildTools.jar and b/buildtools/BuildTools.jar differ
diff --git a/buildtools/TeaVMBridge.jar b/buildtools/TeaVMBridge.jar
index ed38b21e..88d347c9 100644
Binary files a/buildtools/TeaVMBridge.jar and b/buildtools/TeaVMBridge.jar differ
diff --git a/buildtools/production-index-ext.html b/buildtools/production-index-ext.html
index faa27f5b..12d635f1 100644
--- a/buildtools/production-index-ext.html
+++ b/buildtools/production-index-ext.html
@@ -13,7 +13,6 @@
-
-
+
+
+
+
+
+
+