keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix ToggleableKeyBinding differences to vanilla. (#7338)

Browse source
This commit is contained in:
Take Weiland 2020-09-24 00:10:01 +02:00 committed by GitHub
parent b9b17d8331
commit 37be3aff2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch
View file

@ -54,7 +54,7 @@
public boolean func_151470_d() { public boolean func_151470_d() {
- return this.field_74513_e; - return this.field_74513_e;
+ return this.field_74513_e && getKeyConflictContext().isActive() && getKeyModifier().isActive(getKeyConflictContext()); + return this.field_74513_e && isConflictContextAndModifierActive();
} }
public String func_151466_e() { public String func_151466_e() {

17
patches/minecraft/net/minecraft/client/settings/ToggleableKeyBinding.java.patch Normal file
View file

@ -0,0 +1,17 @@
--- a/net/minecraft/client/settings/ToggleableKeyBinding.java
+++ b/net/minecraft/client/settings/ToggleableKeyBinding.java
@@ -16,7 +16,7 @@
public void func_225593_a_(boolean p_225593_1_) {
if (this.field_228053_a_.getAsBoolean()) {
- if (p_225593_1_) {
+ if (p_225593_1_ && isConflictContextAndModifierActive()) {
super.func_225593_a_(!this.func_151470_d());
}
} else {
@@ -24,4 +24,5 @@
}
}
+ @Override public boolean func_151470_d() { return this.field_74513_e; }
}

5
src/main/java/net/minecraftforge/client/extensions/IForgeKeybinding.java
View file

@ -55,6 +55,11 @@ public interface IForgeKeybinding
void setKeyModifierAndCode(KeyModifier keyModifier, InputMappings.Input keyCode); void setKeyModifierAndCode(KeyModifier keyModifier, InputMappings.Input keyCode);
default boolean isConflictContextAndModifierActive()
{
return getKeyConflictContext().isActive() && getKeyModifier().isActive(getKeyConflictContext());
}
/** /**
* Returns true when one of the bindings' key codes conflicts with the other's modifier. * Returns true when one of the bindings' key codes conflicts with the other's modifier.
*/ */

1
src/main/resources/META-INF/accesstransformer.cfg
View file

@ -176,6 +176,7 @@ private-f net.minecraft.client.renderer.model.ModelBakery field_217853_J # field
protected net.minecraft.client.renderer.model.ModelBakery func_177594_c(Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/model/BlockModel; # loadModel protected net.minecraft.client.renderer.model.ModelBakery func_177594_c(Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/model/BlockModel; # loadModel
private-f net.minecraft.client.renderer.tileentity.PistonTileEntityRenderer field_178462_c # blockRenderer - it's static so we need to un-finalize in case this class loads to early. private-f net.minecraft.client.renderer.tileentity.PistonTileEntityRenderer field_178462_c # blockRenderer - it's static so we need to un-finalize in case this class loads to early.
public net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher field_147557_n # fontRenderer - needed for rendering text in TESR items before entering world public net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher field_147557_n # fontRenderer - needed for rendering text in TESR items before entering world
default net.minecraft.client.settings.KeyBinding field_74513_e # pressed
public net.minecraft.command.arguments.EntityOptions func_202024_a(Ljava/lang/String;Lnet/minecraft/command/arguments/EntityOptions$IFilter;Ljava/util/function/Predicate;Lnet/minecraft/util/text/ITextComponent;)V # register public net.minecraft.command.arguments.EntityOptions func_202024_a(Ljava/lang/String;Lnet/minecraft/command/arguments/EntityOptions$IFilter;Ljava/util/function/Predicate;Lnet/minecraft/util/text/ITextComponent;)V # register
public net.minecraft.command.arguments.EntitySelectorParser func_197396_n()V # updateFilter public net.minecraft.command.arguments.EntitySelectorParser func_197396_n()V # updateFilter
public net.minecraft.command.arguments.EntitySelectorParser func_197404_d()V # parseArguments public net.minecraft.command.arguments.EntitySelectorParser func_197404_d()V # parseArguments