mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 12:42:26 +00:00
Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider Provided access to lookupProvider for datagen Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18 Added a test mod for the new CreativeModeTabEvent Throws better error message for Forge registries in tag datagen Deleted ForgeRegistryTagsProvider Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes Added patches for both sign related methods in ModelLayers Changed RegisterShadersEvent to use ResourceProvider Migrated old Mojang math types to JOML Co-authored-by: Marc Hermans <[email protected]> Co-authored-by: LexManos <[email protected]> Co-authored-by: sciwhiz12 <[email protected]> Co-authored-by: coehlrich <[email protected]>
72 lines
4.1 KiB
Diff
72 lines
4.1 KiB
Diff
--- a/net/minecraft/client/KeyboardHandler.java
|
|
+++ b/net/minecraft/client/KeyboardHandler.java
|
|
@@ -298,7 +_,9 @@
|
|
}
|
|
|
|
Screen screen = this.f_90867_.f_91080_;
|
|
- 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_());
|
|
@@ -316,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_()) {
|
|
@@ -338,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());
|
|
@@ -395,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());
|
|
}
|
|
}
|