diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java index 38c6f60a..fe215793 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java @@ -9,6 +9,7 @@ public class IMCForNEI { public static void IMCSender() { sendHandler("alchemicalwizardry.meteor", "AWWayofTime:masterStone", 130); sendCatalyst("alchemicalwizardry.meteor", "AWWayofTime:masterStone"); + sendCatalyst("alchemicalwizardry.bindingritual", "AWWayofTime:masterStone"); } private static void sendHandler(String handlerName, String stack, int height) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java index 694977b7..7bcb6f97 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java @@ -1,8 +1,17 @@ package WayofTime.alchemicalWizardry.client.nei; +import java.awt.Point; import java.awt.Rectangle; +import java.util.List; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.client.nei.widgets.ReagentInfo; +import WayofTime.alchemicalWizardry.client.nei.widgets.RitualInfo; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.recipe.GuiRecipe; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRecipe; @@ -10,12 +19,18 @@ import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import net.minecraft.util.StatCollector; + +import static WayofTime.alchemicalWizardry.client.ClientUtils.mc; /** * Binding Ritual Handler by Arcaratus */ public class NEIBindingRitualHandler extends TemplateRecipeHandler { + private static final RitualInfo ritualInfo = new RitualInfo("AW006Binding", 1f); + private static final ReagentInfo reagentInfo = new ReagentInfo(1f); + public class CachedBindingRecipe extends CachedRecipe { PositionedStack input, output; @@ -53,7 +68,7 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler { public void loadCraftingRecipes(ItemStack result) { for (BindingRecipe recipe : BindingRegistry.bindingRecipes) { if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.outputItem, result)) { - if (recipe != null && recipe.outputItem != null) { + if (recipe.outputItem != null) { arecipes.add(new CachedBindingRecipe(recipe)); } } @@ -64,13 +79,45 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler { public void loadUsageRecipes(ItemStack ingredient) { for (BindingRecipe recipe : BindingRegistry.bindingRecipes) { if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.requiredItem, ingredient)) { - if (recipe != null && recipe.outputItem != null) { + if (recipe.outputItem != null) { arecipes.add(new CachedBindingRecipe(recipe)); } } } } + /** + * Draws for every recipe, but it should really just do it once per page. + * @param recipe The recipeIndex being drawn + */ + @Override + public void drawExtras(int recipe) { + super.drawExtras(recipe); + ritualInfo.onDraw(0, 0); + reagentInfo.onDraw(150, 0); + } + + @Override + public List handleTooltip(GuiRecipe gui, List list, int recipeIndex) { + if (GuiContainerManager.shouldShowTooltip(gui) && list.isEmpty()) { + CachedRecipe cRecipe = arecipes.get(recipeIndex); + Point mousePos = GuiDraw.getMousePosition(); + + if (cRecipe instanceof NEIBindingRitualHandler.CachedBindingRecipe) { + Rectangle rect = ritualInfo.getRect(gui); + if (rect.contains(mousePos)) { + ritualInfo.onHover(list); + } + + rect = reagentInfo.getRect(gui); + if (rect.contains(mousePos)) { + list.add(StatCollector.translateToLocal("nei.recipe.reagent.none")); + } + } + } + return super.handleTooltip(gui, list, recipeIndex); + } + @Override public String getOverlayIdentifier() { return "alchemicalwizardry.bindingritual"; diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java index 8c324b40..6a68d5c3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java @@ -323,7 +323,6 @@ public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { rect = reagentInfo.getRect(gui); if (rect.contains(mousePos)) { - list.add(StatCollector.translateToLocal("nei.recipe.reagent.text")); addMeteorReagentInfo(list, cachedRecipe); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/ReagentInfo.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/ReagentInfo.java index 0fb58ec0..cb4f1a18 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/ReagentInfo.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/ReagentInfo.java @@ -3,10 +3,12 @@ package WayofTime.alchemicalWizardry.client.nei.widgets; import static WayofTime.alchemicalWizardry.client.ClientUtils.mc; import java.awt.Rectangle; +import java.util.List; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; import WayofTime.alchemicalWizardry.ModBlocks; @@ -37,4 +39,11 @@ public class ReagentInfo { public Rectangle getRect(GuiRecipe gui) { return new Rectangle(gui.guiLeft + prevX + 4, gui.guiTop + prevY + 14, (int) (18 * scale), (int) (18 * scale)); } + + /** + * Adds the text Reagent effects: to the tooltip list. + */ + public void onHover(List list) { + list.add(StatCollector.translateToLocal("nei.recipe.reagent.text")); + } } diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 538c60b7..1d74aa6c 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -292,6 +292,7 @@ nei.recipe.reagent.meteor.filler.blocks= Replaces filler with %s nei.recipe.reagent.meteor.explosions= Entirely disables meteor explosions nei.recipe.reagent.meteor.blockDamage.on= Enables meteor block damage nei.recipe.reagent.meteor.blockDamage.off= Disables meteor block damage +nei.recipe.reagent.none=No reagents can be added to this ritual. #Rituals ritual.AW001Water.name=Ritual of the Full Spring