From 78d69db79ed0ed88d9e312b24b76e37360a1415d Mon Sep 17 00:00:00 2001 From: sciwhiz12 Date: Sat, 3 Oct 2020 07:28:21 +0800 Subject: [PATCH] Fix toggleable keybindings still being active while in GUI Fixes #7370 (#7373) --- .../settings/ToggleableKeyBinding.java.patch | 2 +- .../client/SkyRenderHandler.java | 1 - .../debug/world/BiomeLoadingEventTest.java | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/settings/ToggleableKeyBinding.java.patch b/patches/minecraft/net/minecraft/client/settings/ToggleableKeyBinding.java.patch index da24c9588e..11a446c425 100644 --- a/patches/minecraft/net/minecraft/client/settings/ToggleableKeyBinding.java.patch +++ b/patches/minecraft/net/minecraft/client/settings/ToggleableKeyBinding.java.patch @@ -13,5 +13,5 @@ } } -+ @Override public boolean func_151470_d() { return this.field_74513_e; } ++ @Override public boolean func_151470_d() { return this.field_74513_e && (isConflictContextAndModifierActive() || field_228053_a_.getAsBoolean()); } } diff --git a/src/main/java/net/minecraftforge/client/SkyRenderHandler.java b/src/main/java/net/minecraftforge/client/SkyRenderHandler.java index 3809aa5614..404982e21e 100644 --- a/src/main/java/net/minecraftforge/client/SkyRenderHandler.java +++ b/src/main/java/net/minecraftforge/client/SkyRenderHandler.java @@ -1,4 +1,3 @@ - /* * Minecraft Forge * Copyright (c) 2016-2020. diff --git a/src/test/java/net/minecraftforge/debug/world/BiomeLoadingEventTest.java b/src/test/java/net/minecraftforge/debug/world/BiomeLoadingEventTest.java index f0fd8539c3..424035ae43 100644 --- a/src/test/java/net/minecraftforge/debug/world/BiomeLoadingEventTest.java +++ b/src/test/java/net/minecraftforge/debug/world/BiomeLoadingEventTest.java @@ -1,3 +1,22 @@ +/* + * Minecraft Forge + * Copyright (c) 2016-2020. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + package net.minecraftforge.debug.world; import net.minecraft.util.ResourceLocation;