From 14f7a32f293271b304ea87e3edb0da7d4bdf586d Mon Sep 17 00:00:00 2001 From: chrrs <9766338+chrrs@users.noreply.github.com> Date: Wed, 17 Sep 2025 19:27:39 +0100 Subject: [PATCH] Mark MC-61489 fix as incompatible with Scribble --- .../client/mixins/basic/mc61489/BookEditScreenMixin.java | 2 +- .../client/mixins/basic/mc61489/BookViewScreenMixin.java | 2 +- .../client/mixins/basic/mc61489/LecternScreenMixin.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/BookEditScreenMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/BookEditScreenMixin.java index 62c186f5..daab84c1 100644 --- a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/BookEditScreenMixin.java +++ b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/BookEditScreenMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.ModifyArg; // Compared to the original patch, we use / 3 here since it seems to line up better. Else, in a windowed screen the Done button appears at the very bottom / slightly off-screen. -@BugFix(id = "MC-61489", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, modConflicts = "fixbookgui", description = "Book GUI is not vertically centered") +@BugFix(id = "MC-61489", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, modConflicts = {"fixbookgui", "scribble"}, description = "Book GUI is not vertically centered") @Mixin(BookEditScreen.class) public class BookEditScreenMixin extends Screen { @Shadow diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/BookViewScreenMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/BookViewScreenMixin.java index f32afc59..53d90875 100644 --- a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/BookViewScreenMixin.java +++ b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/BookViewScreenMixin.java @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.ModifyArg; // Compared to the original patch, we use / 3 here since it seems to line up better. Else, in a windowed screen the Done button appears at the very bottom / slightly off-screen. -@BugFix(id = "MC-61489", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, modConflicts = "fixbookgui", description = "Book GUI is not vertically centered") +@BugFix(id = "MC-61489", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, modConflicts = {"fixbookgui", "scribble"}, description = "Book GUI is not vertically centered") @Mixin(BookViewScreen.class) public class BookViewScreenMixin extends Screen { @Shadow diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/LecternScreenMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/LecternScreenMixin.java index 1758c236..3b15b500 100644 --- a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/LecternScreenMixin.java +++ b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/LecternScreenMixin.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.ModifyArg; // Compared to the original patch, we use / 3 here since it seems to line up better. Else, in a windowed screen the Done button appears at the very bottom / slightly off-screen. -@BugFix(id = "MC-61489", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, modConflicts = "fixbookgui", description = "Book GUI is not vertically centered") +@BugFix(id = "MC-61489", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, modConflicts = {"fixbookgui", "scribble"}, description = "Book GUI is not vertically centered") @Mixin(LecternScreen.class) public class LecternScreenMixin extends BookViewScreen { @ModifyArg(method = "createMenuControls", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/Button$Builder;bounds(IIII)Lnet/minecraft/client/gui/components/Button$Builder;"), index = 1)