From ad490f2ea7967cb6bb97cb797b33aa3554de46a5 Mon Sep 17 00:00:00 2001 From: nea Date: Sat, 28 Oct 2023 04:07:47 +0200 Subject: Rename mixins after what they do, rather than where they do it [no changelog] Mixins are now named after what they do, and mixins for the same class that do different things should be in two separate mixins now. --- .../moe/nea/firmament/mixins/MixinMinecraft.java | 32 ---------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/main/java/moe/nea/firmament/mixins/MixinMinecraft.java (limited to 'src/main/java/moe/nea/firmament/mixins/MixinMinecraft.java') diff --git a/src/main/java/moe/nea/firmament/mixins/MixinMinecraft.java b/src/main/java/moe/nea/firmament/mixins/MixinMinecraft.java deleted file mode 100644 index 90ecd36..0000000 --- a/src/main/java/moe/nea/firmament/mixins/MixinMinecraft.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2023 Linnea Gräf - * - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package moe.nea.firmament.mixins; - -import moe.nea.firmament.events.ScreenOpenEvent; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; -import org.jetbrains.annotations.Nullable; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(MinecraftClient.class) -public abstract class MixinMinecraft { - @Shadow - @Nullable - public Screen currentScreen; - - @Inject(method = "setScreen", at = @At("HEAD"), cancellable = true) - public void onScreenChange(Screen screen, CallbackInfo ci) { - var event = new ScreenOpenEvent(currentScreen, screen); - if (ScreenOpenEvent.Companion.publish(event).getCancelled()) { - ci.cancel(); - } - } -} -- cgit