From 16483d4ea152a10220bb72333627c97403b757d8 Mon Sep 17 00:00:00 2001 From: J-RAP Date: Thu, 30 Nov 2023 19:55:34 -0600 Subject: [PATCH] Implemented ClientPauseEvent/Hook (#9782) --- .../net/minecraft/client/Minecraft.java.patch | 8 ++++ .../client/ForgeHooksClient.java | 6 +++ .../client/event/ClientPauseEvent.java | 40 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 src/main/java/net/minecraftforge/client/event/ClientPauseEvent.java diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 68da344091..d0683f5773 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -200,6 +200,14 @@ } if (this.fpsPieResults != null) { +@@ -1223,6 +_,7 @@ + } + + this.pause = flag1; ++ net.minecraftforge.client.ForgeHooksClient.onClientPauseUpdate(this.pause); + } + + long l = Util.getNanos(); @@ -1302,10 +_,12 @@ this.window.setGuiScale((double)i); if (this.screen != null) { diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 104a33dfc4..e440f42612 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -111,6 +111,7 @@ import net.minecraft.world.phys.HitResult; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.ClientChatEvent; import net.minecraftforge.client.event.ClientChatReceivedEvent; +import net.minecraftforge.client.event.ClientPauseEvent; import net.minecraftforge.client.event.ClientPlayerChangeGameTypeEvent; import net.minecraftforge.client.event.ClientPlayerNetworkEvent; import net.minecraftforge.client.event.ComputeFovModifierEvent; @@ -248,6 +249,11 @@ public class ForgeHooksClient { return 1000.0F + 10000.0F * (1 + guiLayers.size()); } + public static void onClientPauseUpdate(boolean paused) + { + MinecraftForge.EVENT_BUS.post(new ClientPauseEvent(paused)); + } + public static String getArmorTexture(Entity entity, ItemStack armor, String _default, EquipmentSlot slot, String type) { String result = armor.getItem().getArmorTexture(armor, entity, slot, type); return result != null ? result : _default; diff --git a/src/main/java/net/minecraftforge/client/event/ClientPauseEvent.java b/src/main/java/net/minecraftforge/client/event/ClientPauseEvent.java new file mode 100644 index 0000000000..84d859694b --- /dev/null +++ b/src/main/java/net/minecraftforge/client/event/ClientPauseEvent.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.client.event; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.eventbus.api.Cancelable; +import net.minecraftforge.eventbus.api.Event; + +import net.minecraft.client.Minecraft; +import net.minecraftforge.fml.LogicalSide; + +/** + * Fired when {@linkplain Minecraft#pause Minecraft.pause} value got updated by + * the {@linkplain Minecraft#runTick(boolean) Minecraft.runTick(...)} on a single-player world + * + *

This event is not {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}.

+ * + *

This event is fired on the {@linkplain MinecraftForge#EVENT_BUS main Forge event bus}, + * only on the {@linkplain LogicalSide#CLIENT logical client}.

+ */ +public class ClientPauseEvent extends Event +{ + private final boolean paused; + + public ClientPauseEvent(boolean isPaused) + { + this.paused = isPaused; + } + + /** + * {@return game is paused} + */ + public boolean isPaused() + { + return paused; + } +} \ No newline at end of file