From 30457d37b5fab14b386de209b9293cbf9a469e21 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 25 Dec 2015 02:47:29 +0000 Subject: [PATCH] NEI restructure and corporea requesting --- .../integration/nei/NEIBotaniaConfig.java | 16 ++++ .../integration/nei/NEIInputHandler.java | 94 +++++++++++++++++++ .../{ => recipe}/RecipeHandlerBrewery.java | 2 +- .../{ => recipe}/RecipeHandlerElvenTrade.java | 2 +- .../RecipeHandlerFloatingFlowers.java | 2 +- .../RecipeHandlerLexicaBotania.java | 4 +- .../{ => recipe}/RecipeHandlerManaPool.java | 2 +- .../RecipeHandlerPetalApothecary.java | 2 +- .../{ => recipe}/RecipeHandlerPureDaisy.java | 2 +- .../{ => recipe}/RecipeHandlerRunicAltar.java | 2 +- .../tile/corporea/TileCorporeaIndex.java | 2 +- .../resources/assets/botania/lang/en_US.lang | 1 + 12 files changed, 121 insertions(+), 10 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java rename src/main/java/vazkii/botania/client/integration/nei/{ => recipe}/RecipeHandlerBrewery.java (98%) rename src/main/java/vazkii/botania/client/integration/nei/{ => recipe}/RecipeHandlerElvenTrade.java (98%) rename src/main/java/vazkii/botania/client/integration/nei/{ => recipe}/RecipeHandlerFloatingFlowers.java (98%) rename src/main/java/vazkii/botania/client/integration/nei/{ => recipe}/RecipeHandlerLexicaBotania.java (97%) rename src/main/java/vazkii/botania/client/integration/nei/{ => recipe}/RecipeHandlerManaPool.java (98%) rename src/main/java/vazkii/botania/client/integration/nei/{ => recipe}/RecipeHandlerPetalApothecary.java (98%) rename src/main/java/vazkii/botania/client/integration/nei/{ => recipe}/RecipeHandlerPureDaisy.java (98%) rename src/main/java/vazkii/botania/client/integration/nei/{ => recipe}/RecipeHandlerRunicAltar.java (96%) diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java b/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java index 743c0945f..277bd5806 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java @@ -1,11 +1,24 @@ package vazkii.botania.client.integration.nei; +import org.lwjgl.input.Keyboard; + +import vazkii.botania.client.integration.nei.recipe.RecipeHandlerBrewery; +import vazkii.botania.client.integration.nei.recipe.RecipeHandlerElvenTrade; +import vazkii.botania.client.integration.nei.recipe.RecipeHandlerFloatingFlowers; +import vazkii.botania.client.integration.nei.recipe.RecipeHandlerLexicaBotania; +import vazkii.botania.client.integration.nei.recipe.RecipeHandlerManaPool; +import vazkii.botania.client.integration.nei.recipe.RecipeHandlerPetalApothecary; +import vazkii.botania.client.integration.nei.recipe.RecipeHandlerPureDaisy; +import vazkii.botania.client.integration.nei.recipe.RecipeHandlerRunicAltar; import vazkii.botania.common.lib.LibMisc; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; +import codechicken.nei.guihook.GuiContainerManager; public class NEIBotaniaConfig implements IConfigureNEI { + public static final String CORPOREA_KEY = "gui.botania_corporea_request"; + @Override public String getName() { return LibMisc.MOD_NAME; @@ -41,6 +54,9 @@ public class NEIBotaniaConfig implements IConfigureNEI { API.registerRecipeHandler(new RecipeHandlerLexicaBotania()); API.registerUsageHandler(new RecipeHandlerLexicaBotania()); + + API.addKeyBind(CORPOREA_KEY, Keyboard.KEY_C); + GuiContainerManager.addInputHandler(new NEIInputHandler()); } } diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java new file mode 100644 index 000000000..fe8edbc8a --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java @@ -0,0 +1,94 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/12/2015, 02:22:32 (GMT)] + */ +package vazkii.botania.client.integration.nei; + +import vazkii.botania.api.corporea.CorporeaHelper; +import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; +import codechicken.nei.LayoutManager; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.guihook.IContainerInputHandler; + +public class NEIInputHandler implements IContainerInputHandler { + + @Override + public boolean keyTyped(GuiContainer gui, char c, int i) { + Minecraft mc = Minecraft.getMinecraft(); + if(TileCorporeaIndex.InputHandler.getNearbyIndexes(mc.thePlayer).isEmpty()) + return false; + + int bind = NEIClientConfig.getKeyBinding(NEIBotaniaConfig.CORPOREA_KEY); + + if(i == bind) { + LayoutManager layoutManager = LayoutManager.instance(); + if(layoutManager != null && LayoutManager.itemPanel != null && !NEIClientConfig.isHidden()) { + ItemStack stack = GuiContainerManager.getStackMouseOver(gui); + if(stack != null && stack.getItem() != null) { + int count = NEIClientConfig.getItemQuantity(); + if(count > 0) { + String name = CorporeaHelper.stripControlCodes(stack.getDisplayName()); + String full = count + " " + name; + + mc.ingameGUI.getChatGUI().addToSentMessages(full); + mc.thePlayer.sendChatMessage(full); + return true; + } + } + } + } + + return false; + } + + @Override + public boolean lastKeyTyped(GuiContainer arg0, char arg1, int arg2) { + return false; + } + + @Override + public boolean mouseClicked(GuiContainer arg0, int arg1, int arg2, int arg3) { + return false; + } + + @Override + public boolean mouseScrolled(GuiContainer arg0, int arg1, int arg2, int arg3) { + return false; + } + + @Override + public void onKeyTyped(GuiContainer arg0, char arg1, int arg2) { + // NO-OP + } + + @Override + public void onMouseClicked(GuiContainer arg0, int arg1, int arg2, int arg3) { + } + + @Override + public void onMouseDragged(GuiContainer arg0, int arg1, int arg2, int arg3, long arg4) { + // NO-OP + } + + @Override + public void onMouseScrolled(GuiContainer arg0, int arg1, int arg2, int arg3) { + // NO-OP + } + + @Override + public void onMouseUp(GuiContainer arg0, int arg1, int arg2, int arg3) { + // NO-OP + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java similarity index 98% rename from src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java rename to src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java index 19b69a195..2a6e8659e 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java @@ -1,4 +1,4 @@ -package vazkii.botania.client.integration.nei; +package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; import java.util.ArrayList; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java similarity index 98% rename from src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java rename to src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java index 44de1a889..02aaebef0 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java @@ -1,4 +1,4 @@ -package vazkii.botania.client.integration.nei; +package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; import java.util.ArrayList; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerFloatingFlowers.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java similarity index 98% rename from src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerFloatingFlowers.java rename to src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java index 4fb007844..d1a1f397a 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerFloatingFlowers.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java @@ -1,4 +1,4 @@ -package vazkii.botania.client.integration.nei; +package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; import java.util.ArrayList; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerLexicaBotania.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java similarity index 97% rename from src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerLexicaBotania.java rename to src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java index 7a5ff33be..ea1933074 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerLexicaBotania.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java @@ -8,7 +8,7 @@ * * File Created @ [12/12/2015, 23:25:47 (GMT)] */ -package vazkii.botania.client.integration.nei; +package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; import java.util.ArrayList; @@ -32,7 +32,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.core.handler.HUDHandler; -import vazkii.botania.client.integration.nei.RecipeHandlerManaPool.CachedManaPoolRecipe; +import vazkii.botania.client.integration.nei.recipe.RecipeHandlerManaPool.CachedManaPoolRecipe; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java similarity index 98% rename from src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java rename to src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java index 5a5d5b976..8084b4d87 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java @@ -1,4 +1,4 @@ -package vazkii.botania.client.integration.nei; +package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; import java.util.ArrayList; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java similarity index 98% rename from src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java rename to src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java index aa9ee0017..d3d3fc96b 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java @@ -1,4 +1,4 @@ -package vazkii.botania.client.integration.nei; +package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; import java.util.ArrayList; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java similarity index 98% rename from src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java rename to src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java index f0afaf5aa..47cbedb63 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java @@ -1,4 +1,4 @@ -package vazkii.botania.client.integration.nei; +package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; import java.util.ArrayList; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerRunicAltar.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java similarity index 96% rename from src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerRunicAltar.java rename to src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java index 5708b08d0..506ad540d 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerRunicAltar.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java @@ -1,4 +1,4 @@ -package vazkii.botania.client.integration.nei; +package vazkii.botania.client.integration.nei.recipe; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index ca55eda1c..11875e1f0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -285,7 +285,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } } - public List getNearbyIndexes(EntityPlayer player) { + public static List getNearbyIndexes(EntityPlayer player) { List indexList = new ArrayList(); for(TileCorporeaIndex index : indexes) if(isInRangeOfIndex(player, index) && index.worldObj.isRemote == player.worldObj.isRemote) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index ae2aaf8a9..2c3a8d8fb 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -161,6 +161,7 @@ botania.nei.petalApothecary=Petal Apothecary botania.nei.runicAltar=Runic Altar botania.nei.pureDaisy=Pure Daisy botania.nei.lexica=Lexica Botania +nei.options.keys.gui.botania_corporea_request=Corporea Request botania.nei.lexicaSeparator=Extra Info: botania.nei.lexicaNoInfo=(there's no Extra Info for this entry, sorry!)