build: use ObsidianUI from MidnightDust maven

build.gradle

@@ -54,6 +54,10 @@ allprojects {
 
     repositories {
         maven { url 'https://aperlambda.github.io/maven' }
+        maven {
+            name "MidnightDust Snapshots"
+            url "https://maven.midnightdust.eu/snapshots"
+        }
     }
     dependencies {
         implementation('org.aperlambda:lambdajcommon:1.8.1') {

common/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     // Using the Fabric version of midnightlib here to create a common config and get useful utilities
     // Just make sure NOT to use classes from the .fabric classpath
     modCompileOnlyApi "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric"
-    modCompileOnlyApi "maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric"
+    modCompileOnlyApi "org.thinkingstudio.obsidianui:ObsidianUI-fabric:${rootProject.obsidianui_version}"
     modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") {
         exclude(group: "net.fabricmc.fabric-api")
     }

common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java

@@ -9,18 +9,13 @@
 
 package eu.midnightdust.midnightcontrols.client.gui;
 
-import com.mojang.blaze3d.opengl.GlStateManager;
-import com.mojang.blaze3d.systems.RenderSystem;
 import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil;
 import eu.midnightdust.midnightcontrols.client.virtualkeyboard.KeyboardLayoutManager;
-import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.util.math.ColorHelper;
 import org.thinkingstudio.obsidianui.background.Background;
-import org.thinkingstudio.obsidianui.mixin.DrawContextAccessor;
 import org.thinkingstudio.obsidianui.widget.SpruceWidget;
-import eu.midnightdust.lib.util.MidnightColorUtil;
 import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
@@ -39,18 +34,13 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.render.*;
 import net.minecraft.client.resource.language.I18n;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
-import org.joml.Matrix4f;
 import org.lwjgl.glfw.GLFW;
 
-import java.awt.*;
-
 /**
  * Represents the midnightcontrols settings screen.
  */

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")
-    List<String> midnightcontrols$getPages();
-
-    @Accessor("currentPage")
-    int midnightcontrols$getCurrentPage();
+    @Accessor("editBox")
+    EditBoxWidget midnightcontrols$getEditBox();
 }

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;
-//        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$getPages().remove(accessor.midnightcontrols$getCurrentPage()+1);
-                //accessor.midnightcontrols$getCurrentPageSelectionManager().putCursorAtEnd();
-            }, true);
-        //}
+        VirtualKeyboardScreen virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getEditBox().getText(), (text) -> {
+            client.setScreen(screen);
+            accessor.midnightcontrols$getEditBox().setText(text);
+        }, 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",

fabric/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
     modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
-    modImplementation include ("maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric") {}
+    modImplementation include ("org.thinkingstudio.obsidianui:ObsidianUI-fabric:${rootProject.obsidianui_version}")
     include 'org.aperlambda:lambdajcommon:1.8.1'
     modCompileOnly "maven.modrinth:emi:${project.emi_version}"
 

gradle.properties

@@ -8,14 +8,14 @@ yarn_mappings=1.21.6+build.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=midnightcontrols
-mod_version=1.11.0
+mod_version=1.11.1
 maven_group=eu.midnightdust
 release_type=release
 modrinth_id = bXX9h73M
 curseforge_id = 621768
 # Configure the IDs here after creating the projects on the websites
 
-midnightlib_version=1.7.4+1.21.6
+midnightlib_version=1.7.5+1.21.6
 
 fabric_loader_version=0.16.14
 fabric_api_version=0.127.0+1.21.6
@@ -27,7 +27,7 @@ quilt_loader_version=0.19.0-beta.18
 quilt_fabric_api_version=7.0.1+0.83.0-1.20
 
 sodium_version=mc1.21-0.6.0-beta.1
-obsidianui_version=0.2.11+mc1.21.5
+obsidianui_version=0.2.13+mc1.21.6
 modmenu_version=10.0.0-beta.1
 emotecraft_version=2.5.5+1.21.4-fabric
 bendylib_version=2.0.+

neoforge/build.gradle

@@ -41,7 +41,7 @@ configurations {
 dependencies {
     neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
     modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-neoforge")
-    modImplementation include ("maven.modrinth:obsidianui:${rootProject.obsidianui_version}-neoforge") {}
+    modImplementation include ("org.thinkingstudio.obsidianui:ObsidianUI-neoforge:${rootProject.obsidianui_version}")
     shadowBundle('org.aperlambda:lambdajcommon:1.8.1') {
         exclude group: 'com.google.code.gson'
         exclude group: 'com.google.guava'