diff --git a/build/build.properties b/build/build.properties index 8295d34d..c17623bb 100644 --- a/build/build.properties +++ b/build/build.properties @@ -2,4 +2,4 @@ mc_version=1.7.10 forge_version=10.13.4.1614-1.7.10 ccl_version=1.1.3.138 ccc_version=1.0.7.+ -mod_version=2.0.0-pre-9-GTNH +mod_version=2.0.0-pre-10-GTNH diff --git a/resources/assets/nei/lang/en_US.lang b/resources/assets/nei/lang/en_US.lang index 48e60b6b..c93c8049 100644 --- a/resources/assets/nei/lang/en_US.lang +++ b/resources/assets/nei/lang/en_US.lang @@ -66,10 +66,14 @@ nei.options.keys.gui.recipe=Recipe nei.options.keys.gui.usage=Usage nei.options.keys.gui.enchant=Enchantments nei.options.keys.gui.potion=Potions -nei.options.keys.gui.back=Prev Recipe -nei.options.keys.gui.prev=Prev Page -nei.options.keys.gui.next=Next Page +nei.options.keys.gui.back=Back to last Recipe +nei.options.keys.gui.prev=Prev Item Panel Page +nei.options.keys.gui.next=Next Item Panel Page nei.options.keys.gui.hide=Toggle NEI Visibility +nei.options.keys.gui.next_recipe=Next Recipe +nei.options.keys.gui.prev_recipe=Prev Recipe +nei.options.keys.gui.next_machine=Next Machine +nei.options.keys.gui.prev_machine=Prev Machine nei.options.keys.gui.search=Focus Search Bar nei.options.keys.gui.bookmark=Add Bookmark nei.options.keys.world=World diff --git a/src/codechicken/nei/NEIClientConfig.java b/src/codechicken/nei/NEIClientConfig.java index 44f04db6..8ec9810e 100644 --- a/src/codechicken/nei/NEIClientConfig.java +++ b/src/codechicken/nei/NEIClientConfig.java @@ -160,6 +160,10 @@ public class NEIClientConfig API.addKeyBind("gui.potion", Keyboard.KEY_P); API.addKeyBind("gui.prev", Keyboard.KEY_PRIOR); API.addKeyBind("gui.next", Keyboard.KEY_NEXT); + API.addKeyBind("gui.prev_machine", Keyboard.KEY_UP); + API.addKeyBind("gui.next_machine", Keyboard.KEY_DOWN); + API.addKeyBind("gui.prev_recipe", Keyboard.KEY_LEFT); + API.addKeyBind("gui.next_recipe", Keyboard.KEY_RIGHT); API.addKeyBind("gui.hide", Keyboard.KEY_O); API.addKeyBind("gui.search", Keyboard.KEY_F); API.addKeyBind("gui.bookmark", Keyboard.KEY_A); diff --git a/src/codechicken/nei/recipe/GuiRecipe.java b/src/codechicken/nei/recipe/GuiRecipe.java index f4c123fe..13b71b6a 100644 --- a/src/codechicken/nei/recipe/GuiRecipe.java +++ b/src/codechicken/nei/recipe/GuiRecipe.java @@ -18,6 +18,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import java.awt.Point; @@ -76,7 +77,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve @Override public void keyTyped(char c, int i) { - if (i == 1)//esc + if (i == Keyboard.KEY_ESCAPE) //esc { mc.displayGuiScreen(firstGui); return; @@ -93,6 +94,14 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve mc.displayGuiScreen(firstGui); else if (i == NEIClientConfig.getKeyBinding("gui.back")) mc.displayGuiScreen(prevGui); + else if (i == NEIClientConfig.getKeyBinding("gui.prev_machine")) + prevType(); + else if (i == NEIClientConfig.getKeyBinding("gui.next_machine")) + nextType(); + else if (i == NEIClientConfig.getKeyBinding("gui.prev_recipe")) + prevPage(); + else if (i == NEIClientConfig.getKeyBinding("gui.next_recipe")) + nextPage(); }