From 7d691a29675135975138e5856eba888ebe2e352a Mon Sep 17 00:00:00 2001 From: LAX1DUDE Date: Wed, 1 Mar 2023 20:05:51 -0800 Subject: [PATCH] Update #17 - (sorry mojang) Fixed gap between E, R on main menu --- README.md | 11 +++++------ client_version | 2 +- .../net/minecraft/client/gui/GuiMainMenu.edit.java | 6 +++++- .../lax1dude/eaglercraft/v1_8/EaglercraftVersion.java | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 03ff317..73643c1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ### Play real Minecraft 1.8 in your browser, currently only supports multiplayer -![EaglercraftX 1.8 Screenshot Main Menu](https://media.discordapp.net/attachments/1042594789943689327/1057655404454223932/eaglerx-480p.png) +![EaglercraftX 1.8 Screenshot Main Menu](https://media.discordapp.net/attachments/1042594789943689327/1080697078583394355/eaglerx-480p.png) ## ATTENTION MOJANG/MICROSOFT EMPLOYEE ASSIGNED TO STALK ME: @@ -14,7 +14,6 @@ - **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** - - **Source code for an OpenGL 1.3 emulator built on top of WebGL 2.0** - **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** @@ -24,7 +23,7 @@ - **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** - - **Code configured by default to allow users to play without owning a copy of Minecraft** + - **Software configured by default to allow users to play without owning a copy of Minecraft** ## Getting Started: @@ -44,7 +43,7 @@ 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 Server: +## Making a TOS compliant Server: **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** @@ -54,9 +53,9 @@ Then to actually log in to the server with Eaglercraft, first join your server u 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. -**NOTE: If you set `online_mode` to `false` on BungeeCord/Waterfall's config.yml, the password system will be disabled and you will be able to join with any username without setting a password like Eaglercraft 1.5. This should only ever be used for testing.** +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. -A config guide will be added here too eventually +A detailed plugin config guide will be added here too eventually ## Contributing: diff --git a/client_version b/client_version index d6a640f..c386376 100644 --- a/client_version +++ b/client_version @@ -1 +1 @@ -u16 \ No newline at end of file +u17 \ No newline at end of file diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java index c8ce100..8a89ac7 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java @@ -205,7 +205,11 @@ ~ if (this.isDefault || (double) this.updateCounter < 1.0E-4D) { -> INSERT 10 : 23 @ 10 +> CHANGE 4 : 5 @ 4 : 5 + +~ this.drawTexturedModalRect(k + 154, b0 + 0, 0, 45, 155, 44); + +> INSERT 5 : 18 @ 5 + boolean isForkLabel = ((this.openGLWarning1 != null && this.openGLWarning1.length() > 0) + || (this.openGLWarning2 != null && this.openGLWarning2.length() > 0)); diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index 4aee00a..3a0dd4a 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -8,7 +8,7 @@ public class EaglercraftVersion { /// Customize these to fit your fork: public static final String projectForkName = "EaglercraftX"; - public static final String projectForkVersion = "u16"; + public static final String projectForkVersion = "u17"; public static final String projectForkVendor = "lax1dude"; public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; @@ -23,7 +23,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 = "u16"; + public static final String projectOriginVersion = "u17"; public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8";