From c86df8714caff412d4495fa8cf7b680146383d56 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 19 May 2025 23:30:06 +0200 Subject: [PATCH] fix: crash on NeoForge 1.21.5 --- .../midnightcontrols/client/MidnightControlsClient.java | 4 +++- .../midnightcontrols/client/gui/MidnightControlsHud.java | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java index 847ac33..5af90dd 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java @@ -72,7 +72,7 @@ public class MidnightControlsClient extends MidnightControls { public static final Identifier WAYLAND_CURSOR_TEXTURE_LIGHT = id("cursor/light/mouse_pointer"); public static final Identifier WAYLAND_CURSOR_TEXTURE_DARK = id("cursor/dark/mouse_pointer"); public static final File MAPPINGS_FILE = new File("config/gamecontrollercustommappings.txt"); - public static final MinecraftClient client = MinecraftClient.getInstance(); + public static MinecraftClient client = MinecraftClient.getInstance(); public static final MidnightInput input = new MidnightInput(); public static final MidnightRing ring = new MidnightRing(); public static final MidnightReacharound reacharound = new MidnightReacharound(); @@ -82,6 +82,7 @@ public class MidnightControlsClient extends MidnightControls { private static ControlsMode previousControlsMode; public static void initClient() { + client = MinecraftClient.getInstance(); ring.registerAction("buttonbinding", ButtonBindingRingAction.FACTORY); int delay = 0; // delay for 0 sec. @@ -211,6 +212,7 @@ public class MidnightControlsClient extends MidnightControls { * Called when opening a screen. */ public static void onScreenOpen(Screen screen) { + client = MinecraftClient.getInstance(); if (screen == null && MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN) { screen = new TouchscreenOverlay(); screen.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight()); diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java index 91ef9a7..c4c28c9 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java @@ -10,7 +10,6 @@ package eu.midnightdust.midnightcontrols.client.gui; import eu.midnightdust.midnightcontrols.ControlsMode; -import eu.midnightdust.midnightcontrols.MidnightControlsConstants; import eu.midnightdust.midnightcontrols.client.enums.HudSide; import eu.midnightdust.midnightcontrols.client.MidnightControlsClient; import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig; @@ -24,7 +23,6 @@ import net.minecraft.client.resource.language.I18n; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.HitResult; import org.jetbrains.annotations.NotNull; @@ -40,7 +38,7 @@ import static eu.midnightdust.midnightcontrols.MidnightControls.id; * @since 1.0.0 */ public class MidnightControlsHud extends Hud { - private final MinecraftClient client = MinecraftClient.getInstance(); + private MinecraftClient client = MinecraftClient.getInstance(); private int attackWidth = 0; private int attackButtonWidth = 0; private int dropItemWidth = 0; @@ -63,6 +61,7 @@ public class MidnightControlsHud extends Hud { @Override public void init(@NotNull MinecraftClient client, int screenWidth, int screenHeight) { + this.client = MinecraftClient.getInstance(); super.init(client, screenWidth, screenHeight); this.inventoryWidth = this.width(ButtonBinding.INVENTORY); this.inventoryButtonWidth = MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.INVENTORY);