diff --git a/CHANGELOG.md b/CHANGELOG.md index 34bd96c43..a755dc784 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### 1.5.22 - Added oredict, blocking, processing, ore inputs access to OpenComputers API (raoulvdberge) +- Added shortcut to clear Grid crafting matrix (CTRL+X) (raoulvdberge) - The Crafter can now only store 1 stack size pattern per slot (raoulvdberge) - You can now re-insert a Pattern in the pattern output slot in the Pattern Grid to modify an existing pattern (raoulvdberge) - Fixed not being able to use JEI R and U keys on Grid with tabs (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java b/src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java index e3b78f607..15e9fbf49 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java @@ -2,13 +2,16 @@ package com.raoulvdberge.refinedstorage; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.client.settings.KeyConflictContext; +import net.minecraftforge.client.settings.KeyModifier; import net.minecraftforge.fml.client.registry.ClientRegistry; import org.lwjgl.input.Keyboard; public final class RSKeyBindings { public static final KeyBinding FOCUS_SEARCH_BAR = new KeyBinding("key.refinedstorage.focusSearchBar", KeyConflictContext.GUI, Keyboard.KEY_TAB, "Refined Storage"); + public static final KeyBinding CLEAR_GRID_CRAFTING_MATRIX = new KeyBinding("key.refinedstorage.clearGridCraftingMatrix", KeyConflictContext.GUI, KeyModifier.CONTROL, Keyboard.KEY_X, "Refined Storage"); public static void init() { ClientRegistry.registerKeyBinding(FOCUS_SEARCH_BAR); + ClientRegistry.registerKeyBinding(CLEAR_GRID_CRAFTING_MATRIX); } } \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java index 6f11266fa..82181a7be 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java @@ -680,6 +680,8 @@ public class GuiGrid extends GuiBase implements IGridDisplay { saveHistory(); keyHandled = true; + } else if (keyCode == RSKeyBindings.CLEAR_GRID_CRAFTING_MATRIX.getKeyCode()) { + RS.INSTANCE.network.sendToServer(new MessageGridClear()); } else { super.keyTyped(character, keyCode); } diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.lang b/src/main/resources/assets/refinedstorage/lang/en_us.lang index b3fba0348..9155eefec 100644 --- a/src/main/resources/assets/refinedstorage/lang/en_us.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_us.lang @@ -1,6 +1,7 @@ itemGroup.refinedstorage=Refined Storage -key.refinedstorage.focusSearchBar=Grid Search Bar Focus +key.refinedstorage.focusSearchBar=Focus Grid Search Bar +key.refinedstorage.clearGridCraftingMatrix=Clear Grid Crafting Matrix gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.1=Creative Controller