fix: get book working again with virtualkeyboard

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookEditScreenAccessor.java

@@ -1,18 +1,12 @@
 package eu.midnightdust.midnightcontrols.client.mixin;
 
 import net.minecraft.client.gui.screen.ingame.BookEditScreen;
-import net.minecraft.client.util.SelectionManager;
+import net.minecraft.client.gui.widget.EditBoxWidget;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-import java.util.List;
 
 @Mixin(BookEditScreen.class)
 public interface BookEditScreenAccessor {
-    @Accessor("pages")
+    @Accessor("editBox")
-    List<String> midnightcontrols$getPages();
+    EditBoxWidget midnightcontrols$getEditBox();
-
-    @Accessor("currentPage")
-    int midnightcontrols$getCurrentPage();
 }

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookSigningScreenAccessor.java

@@ -0,0 +1,12 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import net.minecraft.client.gui.screen.ingame.BookSigningScreen;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(BookSigningScreen.class)
+public interface BookSigningScreenAccessor {
+    @Accessor("bookTitleTextField")
+    TextFieldWidget midnightcontrols$getBookTitleTextField();
+}

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/MouseClickInterceptor.java

@@ -6,6 +6,7 @@ import eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler.Defa
 import eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler.SignEditScreenClickHandler;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.BookEditScreen;
+import net.minecraft.client.gui.screen.ingame.BookSigningScreen;
 import net.minecraft.client.gui.screen.ingame.SignEditScreen;
 
 import java.util.HashMap;
@@ -18,6 +19,7 @@ public class MouseClickInterceptor {
 
     public MouseClickInterceptor() {
         this.clickHandlers = new HashMap<>();
+        this.clickHandlers.put(BookSigningScreen.class, new BookEditScreenClickHandler.Signing());
         this.clickHandlers.put(BookEditScreen.class, new BookEditScreenClickHandler());
         this.clickHandlers.put(SignEditScreen.class, new SignEditScreenClickHandler());
         this.clickHandlers.put(Screen.class, new DefaultScreenClickHandler());

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/clickhandler/BookEditScreenClickHandler.java

@@ -1,8 +1,11 @@
 package eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler;
 
 import eu.midnightdust.midnightcontrols.client.mixin.BookEditScreenAccessor;
+import eu.midnightdust.midnightcontrols.client.mixin.BookSigningScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.virtualkeyboard.gui.VirtualKeyboardScreen;
 import net.minecraft.client.gui.screen.ingame.BookEditScreen;
+import net.minecraft.client.gui.screen.ingame.BookSigningScreen;
+import net.minecraft.client.gui.widget.EditBoxWidget;
 
 import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
 
@@ -10,28 +13,35 @@ public class BookEditScreenClickHandler extends AbstractScreenClickHandler<BookE
     @Override
     public void handle(BookEditScreen screen, double mouseX, double mouseY) {
         // don't open the keyboard if a UI element was clicked
-        if(screen.hoveredElement(mouseX, mouseY).isPresent()) {
+        if(screen.hoveredElement(mouseX, mouseY).isPresent() && !(screen.hoveredElement(mouseX, mouseY).get() instanceof EditBoxWidget)) {
             return;
         }
 
         var accessor = (BookEditScreenAccessor) screen;
 
-        VirtualKeyboardScreen virtualKeyboardScreen;
+        VirtualKeyboardScreen virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getEditBox().getText(), (text) -> {
-//        if(accessor.midnightcontrols$isSigning()) {
-//            virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getTitle(), (text) -> {
-//                client.setScreen(screen);
-//                accessor.midnightcontrols$setTitle(text);
-//            }, true);
-//        }
-//        else {
-            virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getPages().get(accessor.midnightcontrols$getCurrentPage()), (text) -> {
             client.setScreen(screen);
-                accessor.midnightcontrols$getPages().add(accessor.midnightcontrols$getCurrentPage(), text);
+            accessor.midnightcontrols$getEditBox().setText(text);
-                accessor.midnightcontrols$getPages().remove(accessor.midnightcontrols$getCurrentPage()+1);
-                //accessor.midnightcontrols$getCurrentPageSelectionManager().putCursorAtEnd();
         }, true);
-        //}
 
         client.setScreen(virtualKeyboardScreen);
     }
+    public static class Signing extends AbstractScreenClickHandler<BookSigningScreen> {
+        @Override
+        public void handle(BookSigningScreen screen, double mouseX, double mouseY) {
+            // don't open the keyboard if a UI element was clicked
+            if(screen.hoveredElement(mouseX, mouseY).isPresent()) {
+                return;
+            }
+
+            var accessor = (BookSigningScreenAccessor) screen;
+
+            VirtualKeyboardScreen virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getBookTitleTextField().getText(), (text) -> {
+                client.setScreen(screen);
+                accessor.midnightcontrols$getBookTitleTextField().setText(text);
+            }, false);
+
+            client.setScreen(virtualKeyboardScreen);
+        }
+    }
 }

common/src/main/resources/midnightcontrols.mixins.json

@@ -7,6 +7,7 @@
     "AbstractSignEditScreenMixin",
     "AdvancementsScreenAccessor",
     "BookEditScreenAccessor",
+    "BookSigningScreenAccessor",
     "ChatScreenMixin",
     "ClickableWidgetAccessor",
     "ClientPlayerEntityMixin",