diff options
Diffstat (limited to 'src/main/java/me/shedaniel/rei/client')
4 files changed, 27 insertions, 5 deletions
diff --git a/src/main/java/me/shedaniel/rei/client/ClientHelper.java b/src/main/java/me/shedaniel/rei/client/ClientHelper.java index ea7ce4d24..306ddaa6b 100644 --- a/src/main/java/me/shedaniel/rei/client/ClientHelper.java +++ b/src/main/java/me/shedaniel/rei/client/ClientHelper.java @@ -10,9 +10,13 @@ import me.shedaniel.rei.gui.widget.RecipeViewingWidget; import me.shedaniel.rei.listeners.ClientLoaded; import me.shedaniel.rei.listeners.IMixinContainerGui; import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding; +import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl; import net.fabricmc.loader.FabricLoader; import net.minecraft.client.MinecraftClient; import net.minecraft.client.Mouse; +import net.minecraft.client.resource.language.I18n; +import net.minecraft.client.util.InputUtil; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.Item; @@ -24,12 +28,17 @@ import net.minecraft.util.PacketByteBuf; import net.minecraft.util.registry.Registry; import java.awt.*; +import java.awt.event.KeyEvent; import java.util.HashMap; import java.util.List; import java.util.Map; public class ClientHelper implements ClientLoaded, ClientModInitializer { + private static final Identifier RECIPE_KEYBIND = new Identifier("roughlyenoughitems", "recipe_keybind"); + private static final Identifier USAGE_KEYBIND = new Identifier("roughlyenoughitems", "usage_keybind"); + private static final Identifier HIDE_KEYBIND = new Identifier("roughlyenoughitems", "hide_keybind"); + public static FabricKeyBinding RECIPE, USAGE, HIDE; private static List<ItemStack> itemList; private static boolean cheating; @@ -134,6 +143,15 @@ public class ClientHelper implements ClientLoaded, ClientModInitializer { @Override public void onInitializeClient() { this.cheating = false; + registerFabricKeyBinds(); + } + + private void registerFabricKeyBinds() { + String category = "key.rei.category"; + KeyBindingRegistryImpl.INSTANCE.addCategory(category); + KeyBindingRegistryImpl.INSTANCE.register(RECIPE = FabricKeyBinding.Builder.create(RECIPE_KEYBIND, InputUtil.Type.KEY_KEYBOARD, 82, category).build()); + KeyBindingRegistryImpl.INSTANCE.register(USAGE = FabricKeyBinding.Builder.create(USAGE_KEYBIND, InputUtil.Type.KEY_KEYBOARD, 85, category).build()); + KeyBindingRegistryImpl.INSTANCE.register(HIDE = FabricKeyBinding.Builder.create(HIDE_KEYBIND, InputUtil.Type.KEY_KEYBOARD, 79, category).build()); } } diff --git a/src/main/java/me/shedaniel/rei/client/ConfigManager.java b/src/main/java/me/shedaniel/rei/client/ConfigManager.java index a2d4d9890..3ff143f44 100644 --- a/src/main/java/me/shedaniel/rei/client/ConfigManager.java +++ b/src/main/java/me/shedaniel/rei/client/ConfigManager.java @@ -2,7 +2,6 @@ package me.shedaniel.rei.client; import me.shedaniel.rei.RoughlyEnoughItemsCore; import net.fabricmc.loader.FabricLoader; -import org.apache.logging.log4j.core.Core; import java.io.File; import java.io.FileWriter; diff --git a/src/main/java/me/shedaniel/rei/client/GuiHelper.java b/src/main/java/me/shedaniel/rei/client/GuiHelper.java index 09d05ec2c..21ff9c058 100644 --- a/src/main/java/me/shedaniel/rei/client/GuiHelper.java +++ b/src/main/java/me/shedaniel/rei/client/GuiHelper.java @@ -6,9 +6,18 @@ import net.minecraft.client.gui.ContainerGui; public class GuiHelper { + private static boolean overlayVisible = true; private static ContainerGuiOverlay overlay; public static TextFieldWidget searchField; + public static boolean isOverlayVisible() { + return overlayVisible; + } + + public static void toggleOverlayVisible() { + overlayVisible = !overlayVisible; + } + public static ContainerGuiOverlay getOverlay(ContainerGui lastGui) { if (overlay == null) { overlay = new ContainerGuiOverlay(lastGui); diff --git a/src/main/java/me/shedaniel/rei/client/REIConfig.java b/src/main/java/me/shedaniel/rei/client/REIConfig.java index dfc961f28..2f4060a9f 100644 --- a/src/main/java/me/shedaniel/rei/client/REIConfig.java +++ b/src/main/java/me/shedaniel/rei/client/REIConfig.java @@ -11,10 +11,6 @@ public class REIConfig { .setPrettyPrinting() .create(); - public int recipeKeyBind = KeyEvent.VK_R; - public int usageKeyBind = KeyEvent.VK_U; - public int hideKeyBind = KeyEvent.VK_O; - public boolean centreSearchBox = false; public REIItemListOrdering itemListOrdering = REIItemListOrdering.REGISTRY; public boolean isAscending = true; public boolean enableCraftableOnlyButton = true; |