Merge remote-tracking branch 'origin/9.x-1.19' into 10.x-1.19.3

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/region/RegionEntryWidget.java

2 files changed, 5 insertions, 7 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
index 4e0c6cbee..b4826d6f7 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
@@ -61,10 +61,7 @@ import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
 import me.shedaniel.rei.impl.client.gui.screen.DefaultDisplayViewingScreen;
 import me.shedaniel.rei.impl.client.gui.widget.favorites.FavoritesListWidget;
 import me.shedaniel.rei.impl.client.search.method.DefaultInputMethod;
-import me.shedaniel.rei.impl.client.search.method.unihan.BomopofoInputMethod;
-import me.shedaniel.rei.impl.client.search.method.unihan.JyutpingInputMethod;
-import me.shedaniel.rei.impl.client.search.method.unihan.PinyinInputMethod;
-import me.shedaniel.rei.impl.client.search.method.unihan.UniHanManager;
+import me.shedaniel.rei.impl.client.search.method.unihan.*;
 import me.shedaniel.rei.impl.common.entry.type.EntryRegistryImpl;
 import me.shedaniel.rei.impl.common.entry.type.EntryRegistryListener;
 import me.shedaniel.rei.impl.common.util.HashedEntryStackWrapper;
@@ -178,6 +175,7 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin {
         registry.add(new ResourceLocation("rei:pinyin"), new PinyinInputMethod(manager));
         registry.add(new ResourceLocation("rei:jyutping"), new JyutpingInputMethod(manager));
         registry.add(new ResourceLocation("rei:bomopofo"), new BomopofoInputMethod(manager));
+        registry.add(new ResourceLocation("rei:double_pinyin"), new DoublePinyinInputMethod(manager));
     }
     
     private enum EntryStackFavoriteType implements FavoriteEntryType<EntryStackFavoriteEntry> {
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/InputMethodWatcher.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/InputMethodWatcher.java
index 071f11cbc..a9698b996 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/InputMethodWatcher.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/InputMethodWatcher.java
@@ -91,12 +91,12 @@ public class InputMethodWatcher implements HintProvider {
     @Override
     public List<HintButton> getButtons() {
         return List.of(
-                new HintButton(Component.translatable("text.rei.input.methods.hint.configure"), bounds -> {
+                new HintButton(Component.translatable("text.rei.hint.configure"), bounds -> {
                     MenuAccess access = ScreenOverlayImpl.getInstance().menuAccess();
                     access.openOrClose(CraftableFilterButtonWidget.FILTER_MENU_UUID, bounds.clone(),
-                            () -> CraftableFilterButtonWidget.createInputMethodEntries(CraftableFilterButtonWidget.getApplicableInputMethods()));
+                            () -> CraftableFilterButtonWidget.createInputMethodEntries(access, CraftableFilterButtonWidget.getApplicableInputMethods()));
                 }),
-                new HintButton(Component.translatable("text.rei.input.methods.hint.ignore"), bounds -> {
+                new HintButton(Component.translatable("text.rei.hint.ignore"), bounds -> {
                     ConfigManagerImpl.getInstance().getConfig().setInputMethodId(new ResourceLocation("rei:default"));
                     ConfigManager.getInstance().saveConfig();
                 })