From de45cd3223db620fa57a3d3310633bb42f0d6abd Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 22 Aug 2023 22:00:44 +0800 Subject: [PATCH] Updated to 23w33a Signed-off-by: shedaniel --- .../mixin/fabric/client/MixinKeyboardHandler.java | 2 +- gradle.properties | 6 +++--- .../test/debug/client/ClientOverlayMessageSink.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinKeyboardHandler.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinKeyboardHandler.java index a0635cb0..c9da08f6 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinKeyboardHandler.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinKeyboardHandler.java @@ -81,7 +81,7 @@ public class MixinKeyboardHandler { target = "Lnet/minecraft/client/gui/screens/Screen;wrapScreenError(Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/String;)V", ordinal = 0, shift = At.Shift.AFTER), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true) - public void onKeyAfter(long long_1, int int_1, int int_2, int int_3, int int_4, CallbackInfo info, Screen screen, boolean bls[]) { + public void onKeyAfter(long long_1, int int_1, int int_2, int int_3, int int_4, CallbackInfo info, boolean f3Pressed, Screen screen, boolean bls[]) { if (!info.isCancelled() && !bls[0]) { EventResult result; if (int_3 != 1 && int_3 != 2) { diff --git a/gradle.properties b/gradle.properties index a8a668ed..2d61e3da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.daemon=false platforms=fabric -minecraft_version=23w32a -supported_version=23w32a +minecraft_version=23w33a +supported_version=23w33a artifact_type=beta @@ -14,7 +14,7 @@ base_version=10.0 maven_group=dev.architectury fabric_loader_version=0.14.22 -fabric_api_version=0.86.3+1.20.2 +fabric_api_version=0.87.1+1.20.2 mod_menu_version=7.0.0 forge_version=46.0.1 diff --git a/testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java b/testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java index 0bc72480..fdad6603 100644 --- a/testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java +++ b/testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java @@ -41,7 +41,7 @@ public class ClientOverlayMessageSink extends ConsoleMessageSink { public ClientOverlayMessageSink() { ClientGuiEvent.RENDER_POST.register((screen, graphics, mouseX, mouseY, delta) -> render(graphics, delta)); ClientGuiEvent.RENDER_HUD.register((graphics, tickDelta) -> { - if (Minecraft.getInstance().screen == null && !Minecraft.getInstance().options.renderDebug) { + if (Minecraft.getInstance().screen == null && !Minecraft.getInstance().gui.getDebugOverlay().showDebugScreen()) { render(graphics, tickDelta); } });