Skip to content

Mark MC-61489 fix as incompatible with Scribble #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1.21.9
Choose a base branch
from
Open

Mark MC-61489 fix as incompatible with Scribble #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/BookEditScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/BookViewScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/client/java/dev/isxander/debugify/client/mixins/basic/mc61489/LecternScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down