mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Properly move `ServerStatusPing` to codec Reimplement custom display contexts Co-authored-by: Matyrobbrt <[email protected]> Co-authored-by: coehlrich <[email protected]> Signed-off-by: SizableShrimp <[email protected]>
72 lines
4.0 KiB
Diff
72 lines
4.0 KiB
Diff
--- a/net/minecraft/client/KeyboardHandler.java
|
|
+++ b/net/minecraft/client/KeyboardHandler.java
|
|
@@ -328,7 +_,9 @@
|
|
}
|
|
}
|
|
|
|
- if (p_90897_ == 1 && (!(this.f_90867_.f_91080_ instanceof KeyBindsScreen) || ((KeyBindsScreen)screen).f_193976_ <= Util.m_137550_() - 20L)) {
|
|
+
|
|
+ if ((!(this.f_90867_.f_91080_ instanceof KeyBindsScreen) || ((KeyBindsScreen)screen).f_193976_ <= Util.m_137550_() - 20L)) {
|
|
+ if (p_90897_ == 1) {
|
|
if (this.f_90867_.f_91066_.f_92105_.m_90832_(p_90895_, p_90896_)) {
|
|
this.f_90867_.m_91268_().m_85438_();
|
|
this.f_90867_.f_91066_.m_231829_().m_231514_(this.f_90867_.m_91268_().m_85440_());
|
|
@@ -346,6 +_,8 @@
|
|
});
|
|
return;
|
|
}
|
|
+ } else if (p_90897_ == 0 /*GLFW_RELEASE*/ && this.f_90867_.f_91080_ instanceof KeyBindsScreen)
|
|
+ ((KeyBindsScreen)this.f_90867_.f_91080_).f_193975_ = null; //Forge: Unset pure modifiers.
|
|
}
|
|
|
|
if (this.f_90867_.m_240477_().m_93316_()) {
|
|
@@ -368,11 +_,15 @@
|
|
Screen.m_96579_(() -> {
|
|
if (p_90897_ != 1 && p_90897_ != 2) {
|
|
if (p_90897_ == 0) {
|
|
- aboolean[0] = screen.m_7920_(p_90895_, p_90896_, p_90898_);
|
|
+ aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleasedPre(screen, p_90895_, p_90896_, p_90898_);
|
|
+ if (!aboolean[0]) aboolean[0] = screen.m_7920_(p_90895_, p_90896_, p_90898_);
|
|
+ if (!aboolean[0]) aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleasedPost(screen, p_90895_, p_90896_, p_90898_);
|
|
}
|
|
} else {
|
|
screen.m_169416_();
|
|
- aboolean[0] = screen.m_7933_(p_90895_, p_90896_, p_90898_);
|
|
+ aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressedPre(screen, p_90895_, p_90896_, p_90898_);
|
|
+ if (!aboolean[0]) aboolean[0] = screen.m_7933_(p_90895_, p_90896_, p_90898_);
|
|
+ if (!aboolean[0]) aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressedPost(screen, p_90895_, p_90896_, p_90898_);
|
|
}
|
|
|
|
}, "keyPressed event handler", screen.getClass().getCanonicalName());
|
|
@@ -425,22 +_,26 @@
|
|
}
|
|
}
|
|
}
|
|
-
|
|
+ net.minecraftforge.client.ForgeHooksClient.onKeyInput(p_90895_, p_90896_, p_90897_, p_90898_);
|
|
}
|
|
}
|
|
|
|
private void m_90889_(long p_90890_, int p_90891_, int p_90892_) {
|
|
if (p_90890_ == this.f_90867_.m_91268_().m_85439_()) {
|
|
- GuiEventListener guieventlistener = this.f_90867_.f_91080_;
|
|
+ Screen guieventlistener = this.f_90867_.f_91080_;
|
|
if (guieventlistener != null && this.f_90867_.m_91265_() == null) {
|
|
if (Character.charCount(p_90891_) == 1) {
|
|
Screen.m_96579_(() -> {
|
|
- guieventlistener.m_5534_((char)p_90891_, p_90892_);
|
|
+ if (net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPre(guieventlistener, (char)p_90891_, p_90892_)) return;
|
|
+ if (guieventlistener.m_5534_((char)p_90891_, p_90892_)) return;
|
|
+ net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPost(guieventlistener, (char)p_90891_, p_90892_);
|
|
}, "charTyped event handler", guieventlistener.getClass().getCanonicalName());
|
|
} else {
|
|
for(char c0 : Character.toChars(p_90891_)) {
|
|
Screen.m_96579_(() -> {
|
|
- guieventlistener.m_5534_(c0, p_90892_);
|
|
+ if (net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPre(guieventlistener, c0, p_90892_)) return;
|
|
+ if (guieventlistener.m_5534_(c0, p_90892_)) return;
|
|
+ net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPost(guieventlistener, c0, p_90892_);
|
|
}, "charTyped event handler", guieventlistener.getClass().getCanonicalName());
|
|
}
|
|
}
|