From 6041bfbbd7472828e4892d8d626f59927a3e3163 Mon Sep 17 00:00:00 2001 From: LAX1DUDE Date: Mon, 26 Dec 2022 01:50:25 -0800 Subject: [PATCH] Update #3 - Fixed graphical bug in survival inventory --- client_version | 2 +- .../client/gui/inventory/GuiContainer.edit.java | 16 ++++++++++------ .../eaglercraft/v1_8/EaglercraftVersion.java | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/client_version b/client_version index be76e85..4849584 100644 --- a/client_version +++ b/client_version @@ -1 +1 @@ -u2 \ No newline at end of file +u3 \ No newline at end of file diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java index faab928..3ea91da 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java @@ -24,27 +24,31 @@ > DELETE 22 @ 19 : 20 -> CHANGE 210 : 211 @ 208 : 209 +> INSERT 103 : 104 @ 101 + ++ GlStateManager.enableAlpha(); + +> CHANGE 211 : 212 @ 208 : 209 ~ EaglerTextureAtlasSprite textureatlassprite = this.mc.getTextureMapBlocks().getAtlasSprite(s1); -> CHANGE 267 : 268 @ 265 : 266 +> CHANGE 268 : 269 @ 265 : 266 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { -> CHANGE 503 : 507 @ 501 : 503 +> CHANGE 504 : 508 @ 501 : 503 ~ protected void keyTyped(char parChar1, int parInt1) { ~ if (parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode() ~ || parInt1 == this.mc.gameSettings.keyBindInventory.getKeyCode() ~ || (parInt1 == 1 && this.mc.gameSettings.keyBindClose.getKeyCode() == 0)) { -> CHANGE 508 : 510 @ 504 : 512 +> CHANGE 509 : 511 @ 504 : 512 ~ if (this.mc.currentScreen == null) { ~ this.mc.setIngameFocus(); -> INSERT 511 : 522 @ 513 +> INSERT 512 : 523 @ 513 + } else if (parInt1 == 1) { + showingCloseKey = System.currentTimeMillis(); @@ -58,6 +62,6 @@ + } + } -> DELETE 523 @ 514 : 515 +> DELETE 524 @ 514 : 515 > EOF 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 d75bcee..5d86c90 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 = "u2"; + public static final String projectForkVersion = "u3"; 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 = "u2"; + public static final String projectOriginVersion = "u3"; public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8";