Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ public void register(EmiRegistry registry) {
TestMachine.EMI.register(registry);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ public void setSearchFocused(boolean focused) {
EmiScreenManager.search.setFocused(focused);
}

public static boolean isSearchFocused(){
return EmiScreenManager.search.isFocused();
}

@Override
public @Nullable Object getCurrentlyDragged() {
if (currentIngredient == null || currentIngredient.isEmpty()) return null;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package brachy.modularui.integration.jei;

import brachy.modularui.ModularUI;
import brachy.modularui.integration.jei.handler.JeiContainerHandler;
import brachy.modularui.integration.jei.handler.JeiScreenHandler;
import brachy.modularui.screen.ContainerScreenWrapper;
import brachy.modularui.screen.ModularContainerMenu;
import brachy.modularui.screen.ScreenWrapper;

import net.minecraft.MethodsReturnNonnullByDefault;
Expand Down Expand Up @@ -63,4 +61,5 @@ public void registerRecipeTransferHandlers(IRecipeTransferRegistration registrat

//JeiContainerHandler.register(ModularContainerMenu.class, registration);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ public void setSearchFocused(boolean focused) {
}
}

public static boolean isSearchFocused(){
if (ModularUIJeiPlugin.getRuntime().getIngredientListOverlay() instanceof IngredientListOverlayAccessor accessor){
return accessor.getSearchField().isFocused();
}
return false;
}

@Override
public @Nullable Object getCurrentlyDragged() {
if (currentIngredient == null) return null;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package brachy.modularui.integration.recipeviewer.util;

import brachy.modularui.ModularUI;
import brachy.modularui.integration.emi.handler.EmiScreenHandler;
import brachy.modularui.integration.jei.handler.JeiScreenHandler;
import brachy.modularui.integration.rei.handler.REIScreenHandler;

public class RecipeViewerUtil {
public static boolean isSearchFocused(){
if (ModularUI.Mods.EMI.isLoaded()) {
return EmiScreenHandler.isSearchFocused();
}
if (ModularUI.Mods.REI.isLoaded()){
return REIScreenHandler.isSearchFocused();
}
if (ModularUI.Mods.JEI.isLoaded()){
return JeiScreenHandler.isSearchFocused();
}
return false;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ public void registerScreens(ScreenRegistry registry) {
REIScreenHandler.register(ScreenWrapper.class, registry);
REIScreenHandler.register(ContainerScreenWrapper.class, registry);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ public void setSearchFocused(boolean focused) {
if (searchField != null) searchField.setFocused(focused);
}

public static boolean isSearchFocused(){
TextField searchField = REIRuntime.getInstance().getSearchTextField();
if (searchField != null) return searchField.isFocused();
return false;
}

@Override
public @Nullable Object getCurrentlyDragged() {
if (currentIngredient == null) return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import brachy.modularui.drawable.GuiDraw;
import brachy.modularui.drawable.text.FontRenderHelper;
import brachy.modularui.integration.recipeviewer.handlers.RecipeViewerHandler;
import brachy.modularui.integration.recipeviewer.util.RecipeViewerUtil;
import brachy.modularui.network.ModularNetwork;
import brachy.modularui.overlay.OverlayStack;
import brachy.modularui.screen.viewport.GuiContext;
Expand Down Expand Up @@ -371,7 +372,7 @@ private static boolean keyTyped(Screen screen, int keyCode, int scanCode, int mo
}
if (!hasLevel) return false; // E only closes in world
if (Minecraft.getInstance().options.keyInventory
.isActiveAndMatches(InputConstants.getKey(keyCode, scanCode))) {
.isActiveAndMatches(InputConstants.getKey(keyCode, scanCode)) && !RecipeViewerUtil.isSearchFocused()) {
dropOrClosePanel();
return true;
}
Expand Down