From ff8466ae0019e72cd6289f1d6e502495bbe45583 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Mon, 21 Apr 2025 13:59:51 -0400 Subject: [PATCH 1/7] Revamp the NEI meteor handler. Add a new Ritual Info widget that shows the required activation crystal, ritual name, and activation cost when hovered. Suitable for use in any other NEI ritual handlers. Move the cost and radius to the top of the page so they don't get hidden with certain UI scales. Cost now shows the blood orb required (works with any IBloodOrb, but does not account for Runes of the Orb). The orb is darkened and the hover text includes "Insufficient LP" if the player does not have enough LP to summon that meteor. Radius shows the diameter (and its formula because it's actually 2r + 1) when hovered. Add a new Reagent Effects widget (also suitable for use in other handlers), and have it show effects for the currently selected meteor (meteors with no filler will not show things that impact filler, new filler chance will be calculated, new radius will be calculated). Center focus item and arrow on the texture because they were not centered before. --- .../client/nei/NEIConfig.java | 14 ++ .../client/nei/NEIMeteorRecipeHandler.java | 140 ++++++++++++++++-- .../client/nei/widgets/CostInfo.java | 92 ++++++++++++ .../client/nei/widgets/RadiusInfo.java | 51 +++++++ .../client/nei/widgets/ReagentInfo.java | 40 +++++ .../client/nei/widgets/RitualInfo.java | 66 +++++++++ .../common/summoning/meteor/Meteor.java | 8 +- .../alchemicalwizardry/gui/nei/meteor.png | Bin 3666 -> 1106 bytes .../assets/alchemicalwizardry/lang/en_US.lang | 13 +- 9 files changed, 404 insertions(+), 20 deletions(-) create mode 100644 src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/CostInfo.java create mode 100644 src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/RadiusInfo.java create mode 100644 src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/ReagentInfo.java create mode 100644 src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/RitualInfo.java diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java index a9947596..6baa9fba 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java @@ -13,6 +13,7 @@ import codechicken.nei.api.IConfigureNEI; public class NEIConfig implements IConfigureNEI { private static ArrayList bloodOrbs = null; + private static ArrayList byCapacity = null; public static ArrayList getBloodOrbs() { if (bloodOrbs == null) { @@ -44,6 +45,19 @@ public class NEIConfig implements IConfigureNEI { return bloodOrbsTemp; } + public static ArrayList getOrbsByCapacity() { + if (byCapacity == null) { + byCapacity = new ArrayList<>(getBloodOrbs()); + byCapacity.sort((a, b) -> { + if (a instanceof IBloodOrb && b instanceof IBloodOrb) { + return Integer.compare(((IBloodOrb) a).getMaxEssence(), ((IBloodOrb) b).getMaxEssence()); + } + return 0; + }); + } + return byCapacity; + } + @Override public void loadConfig() { API.registerRecipeHandler(new NEIAlchemyRecipeHandler()); diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java index 3831e22c..8c324b40 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java @@ -1,51 +1,70 @@ package WayofTime.alchemicalWizardry.client.nei; +import static WayofTime.alchemicalWizardry.client.ClientUtils.mc; + import java.awt.Point; import java.awt.Rectangle; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; -import net.minecraft.client.Minecraft; +import WayofTime.alchemicalWizardry.client.nei.widgets.CostInfo; +import WayofTime.alchemicalWizardry.client.nei.widgets.RadiusInfo; +import WayofTime.alchemicalWizardry.client.nei.widgets.ReagentInfo; +import WayofTime.alchemicalWizardry.client.nei.widgets.RitualInfo; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; import com.google.common.base.Joiner; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.summoning.meteor.Meteor; import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorComponent; +import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorReagent; +import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorReagentRegistry; import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; +import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { + private static final RitualInfo ritualInfo = new RitualInfo("AW019FallingTower", 0.75f); + private static final ReagentInfo reagentInfo = new ReagentInfo(0.75f); + public class CachedMeteorRecipe extends CachedRecipe { private final List input = new ArrayList<>(); private final List outputs = new ArrayList<>(); - private final int cost; - private final int radius; + private final CostInfo costInfo; + private final RadiusInfo radiusInfo; private Point focus; + public float fillerChance; + public CachedMeteorRecipe(Meteor meteor, ItemStack focusStack) { - this.input.add(new PositionedStack(meteor.focusItem, 74, 4)); + this.input.add(new PositionedStack(meteor.focusItem, 75, 4)); int row = 0; int col = 0; float totalComponentWeight = MeteorComponent.getTotalListWeight(meteor.ores); - float fillerChance = meteor.fillerChance; + fillerChance = meteor.fillerChance; List sortedComponents = new ArrayList<>(meteor.ores); sortedComponents.sort(Comparator.comparingInt(c -> -c.getWeight())); @@ -115,8 +134,8 @@ public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { } } - this.radius = meteor.radius; - this.cost = meteor.cost; + this.costInfo = new CostInfo(meteor.cost); + this.radiusInfo = new RadiusInfo(meteor.radius); } private String getReagentStrings(MeteorComponent component) { @@ -144,11 +163,11 @@ public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { } public int getCost() { - return cost; + return costInfo.getCost(); } public int getRadius() { - return radius; + return radiusInfo.getRadius(); } } @@ -238,12 +257,10 @@ public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { @Override public void drawExtras(int recipe) { CachedMeteorRecipe meteorRecipe = (CachedMeteorRecipe) this.arecipes.get(recipe); - int cost = meteorRecipe.getCost(); - int radius = meteorRecipe.getRadius(); - Minecraft.getMinecraft().fontRenderer - .drawString(I18n.format("nei.recipe.meteor.cost", String.format("%,d", cost)), 2, 168, 0x000000); - Minecraft.getMinecraft().fontRenderer - .drawString(I18n.format("nei.recipe.meteor.radius", radius), 2, 179, 0x000000); + meteorRecipe.costInfo.onDraw(30, 4); + meteorRecipe.radiusInfo.onDraw(120, 4); + ritualInfo.onDraw(0, 0); + reagentInfo.onDraw(153, 0); } @Override @@ -275,6 +292,91 @@ public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { return currenttip; } + @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 CachedMeteorRecipe) { + CachedMeteorRecipe cachedRecipe = (CachedMeteorRecipe) cRecipe; + Rectangle rect = cachedRecipe.costInfo.getRect(gui); + if (rect.contains(mousePos)) { + list.add(StatCollector.translateToLocal("nei.recipe.meteor.cost")); + if (SoulNetworkHandler.getCurrentEssence(mc.thePlayer.getDisplayName()) < cachedRecipe.getCost()) { + list.add(EnumChatFormatting.RED + StatCollector.translateToLocal("nei.recipe.meteor.tooExpensive")); + } + } + + rect = cachedRecipe.radiusInfo.getRect(gui); + if (rect.contains(mousePos)) { + list.add( + StatCollector.translateToLocalFormatted( + "nei.recipe.meteor.diameter", + 2 * cachedRecipe.radiusInfo.getRadius() + 1)); + } + + 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.text")); + addMeteorReagentInfo(list, cachedRecipe); + } + } + } + return super.handleTooltip(gui, list, recipeIndex); + } + + private void addMeteorReagentInfo(List list, CachedMeteorRecipe cachedRecipe) { + DecimalFormat fmt = new DecimalFormat("###.##"); + for (Map.Entry entry : MeteorReagentRegistry.reagents.entrySet()) { + ArrayList l = new ArrayList<>(); + Reagent r = entry.getKey(); + MeteorReagent mr = entry.getValue(); + + if (mr.radiusChange != 0) { + l.add( + StatCollector.translateToLocalFormatted( + "nei.recipe.reagent.meteor.radius", + mr.radiusChange, + Meteor.getNewRadius(cachedRecipe.getRadius(), Collections.singletonList(r)))); + } + + if (cachedRecipe.fillerChance > 0) { + if (mr.fillerChanceChange != 0 || mr.rawFillerChanceChange != 0) { + l.add( + StatCollector.translateToLocalFormatted( + "nei.recipe.reagent.meteor.filler.chance", + fmt.format(Meteor.getNewFillerChance( + cachedRecipe.fillerChance, + Collections.singletonList(r))))); + } + + if (!mr.filler.isEmpty()) { + l.add( + StatCollector.translateToLocalFormatted("nei.recipe.reagent.meteor.filler.blocks", reagentFillerBlockNames(mr))); + } + } + + if (mr.disableExplosions) { + l.add(StatCollector.translateToLocal("nei.recipe.reagent.meteor.explosions")); + } else if (mr.invertExplosionBlockDamage && AlchemicalWizardry.doMeteorsDestroyBlocks) { + l.add(StatCollector.translateToLocal("nei.recipe.reagent.meteor.blockDamage.off")); + } else if (mr.invertExplosionBlockDamage) { + l.add(StatCollector.translateToLocal("nei.recipe.reagent.meteor.blockDamage.on")); + } + + if (!l.isEmpty()) { + list.add(r.name + ":"); + list.addAll(l); + } + } + } + @Override public String getRecipeName() { return I18n.format("nei.recipe.meteor.category"); @@ -292,4 +394,12 @@ public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { private int getEstimatedAmount(float chance, int radius) { return (int) Math.ceil(4f / 3 * Math.PI * Math.pow(radius + 0.5, 3) * chance); } + + private String reagentFillerBlockNames(MeteorReagent mr) { + ArrayList blockNames = new ArrayList<>(); + for (MeteorComponent mc : mr.filler) { + blockNames.add(mc.getBlock().getDisplayName()); + } + return Joiner.on(", ").join(blockNames); + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/CostInfo.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/CostInfo.java new file mode 100644 index 00000000..3f2cbc29 --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/CostInfo.java @@ -0,0 +1,92 @@ +package WayofTime.alchemicalWizardry.client.nei.widgets; + +import static WayofTime.alchemicalWizardry.client.ClientUtils.mc; +import static WayofTime.alchemicalWizardry.client.nei.NEIConfig.getBloodOrbs; +import static WayofTime.alchemicalWizardry.client.nei.NEIConfig.getOrbsByCapacity; + +import java.awt.Rectangle; +import java.util.ArrayList; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import org.lwjgl.opengl.GL11; + +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import codechicken.nei.recipe.GuiRecipe; + +public class CostInfo { + + private final int cost; + private int prevX, prevY; + private final int orbLP; + private final ItemStack orbStack; + private static final RenderItem renderItem = new RenderItem(); + static { + renderItem.renderWithColor = false; + } + + public CostInfo(int cost) { + this.cost = cost; + + Item orb = null; + getOrbsByCapacity(); + ArrayList orbList = getBloodOrbs(); + for (Item o : orbList) { + if (((IBloodOrb) o).getMaxEssence() >= cost) { + orb = o; + break; + } + } + if (orb == null) { + orb = orbList.get(orbList.size() - 1); + } + + orbLP = ((IBloodOrb) orb).getMaxEssence(); + orbStack = new ItemStack(orb); + } + + public int getCost() { + return cost; + } + + public void onDraw(int x, int y) { + prevX = x; + prevY = y; + + int currentLP = SoulNetworkHandler.getCurrentEssence(mc.thePlayer.getDisplayName()); + + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + if (orbLP > currentLP) { + GL11.glColor4f(0.4f, 0.4f, 0.4f, 1.0f); + } else { + GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + } + + renderItem.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.getTextureManager(), orbStack, x, y); + + GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + + String costText = String.format("%,d", cost); + FontRenderer fontRenderer = mc.fontRenderer; + + int textWidth = fontRenderer.getStringWidth(costText); + int textX = x + 9 - (textWidth / 2); + int textY = y + 18; + + fontRenderer.drawString(costText, textX, textY, 0x000000); + } + + public Rectangle getRect(GuiRecipe gui) { + return new Rectangle(gui.guiLeft + prevX + 4, gui.guiTop + prevY + 14, 18, 18); + } + +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/RadiusInfo.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/RadiusInfo.java new file mode 100644 index 00000000..ef8f93dc --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/RadiusInfo.java @@ -0,0 +1,51 @@ +package WayofTime.alchemicalWizardry.client.nei.widgets; + +import static WayofTime.alchemicalWizardry.client.ClientUtils.mc; + +import java.awt.Rectangle; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + +import WayofTime.alchemicalWizardry.ModItems; +import codechicken.nei.recipe.GuiRecipe; + +public class RadiusInfo { + + private final int radius; + private int prevX, prevY; + private static final RenderItem renderItem = new RenderItem(); + // It's a circle with a dot in the center. Couldn't ask for a better item! + private static final ItemStack item = new ItemStack(ModItems.demonPlacer); + + public RadiusInfo(int radius) { + this.radius = radius; + } + + public int getRadius() { + return radius; + } + + public void onDraw(int x, int y) { + prevX = x; + prevY = y; + + renderItem.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, x, y); + + String costText = StatCollector.translateToLocalFormatted("nei.recipe.meteor.radius", radius); + FontRenderer fontRenderer = mc.fontRenderer; + + int textWidth = fontRenderer.getStringWidth(costText); + int textX = x + 9 - (textWidth / 2); + int textY = y + 18; + + fontRenderer.drawString(costText, textX, textY, 0x000000); + } + + public Rectangle getRect(GuiRecipe gui) { + return new Rectangle(gui.guiLeft + prevX + 5, gui.guiTop + prevY + 15, 16, 16); + } + +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/ReagentInfo.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/ReagentInfo.java new file mode 100644 index 00000000..0fb58ec0 --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/ReagentInfo.java @@ -0,0 +1,40 @@ +package WayofTime.alchemicalWizardry.client.nei.widgets; + +import static WayofTime.alchemicalWizardry.client.ClientUtils.mc; + +import java.awt.Rectangle; + +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; + +import org.lwjgl.opengl.GL11; + +import WayofTime.alchemicalWizardry.ModBlocks; +import codechicken.nei.recipe.GuiRecipe; + +public class ReagentInfo { + + private final float scale; + private int prevX, prevY; + private static final RenderItem renderItem = new RenderItem(); + private static final ItemStack item = new ItemStack(ModBlocks.blockReagentConduit); + + public ReagentInfo(float scale) { + this.scale = scale; + } + + public void onDraw(int x, int y) { + prevX = x; + prevY = y; + + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, 0); + GL11.glScalef(scale, scale, 1.0f); + renderItem.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, 0, 0); + GL11.glPopMatrix(); + } + + public Rectangle getRect(GuiRecipe gui) { + return new Rectangle(gui.guiLeft + prevX + 4, gui.guiTop + prevY + 14, (int) (18 * scale), (int) (18 * scale)); + } +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/RitualInfo.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/RitualInfo.java new file mode 100644 index 00000000..9aea6863 --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/RitualInfo.java @@ -0,0 +1,66 @@ +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.ModItems; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import codechicken.nei.recipe.GuiRecipe; + +public class RitualInfo { + + private final String id; + private final int cost; + private final float scale; + private final ItemStack crystal; + private int prevX, prevY; + private static final RenderItem renderItem = new RenderItem(); + + public RitualInfo(String id, float scale) { + this.id = id; + this.scale = scale; + this.cost = Rituals.getCostForActivation(id); + Rituals r = Rituals.ritualMap.get(id); + + // This is hardcoded unlike the orbs. I'm not aware of any addon that makes tier 3 rituals or crystals. + if (r == null || r.crystalLevel == 1) { + crystal = new ItemStack(ModItems.activationCrystal); + } else { + crystal = new ItemStack(ModItems.activationCrystal, 1, 1); + } + } + + public int getCost() { + return cost; + } + + public void onDraw(int x, int y) { + prevX = x; + prevY = y; + + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, 0); + GL11.glScalef(scale, scale, 1.0f); + renderItem.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.getTextureManager(), crystal, 0, 0); + GL11.glPopMatrix(); + } + + public Rectangle getRect(GuiRecipe gui) { + return new Rectangle(gui.guiLeft + prevX + 4, gui.guiTop + prevY + 14, (int) (18 * scale), (int) (18 * scale)); + } + + public void onHover(List list) { + list.add( + StatCollector + .translateToLocalFormatted("nei.recipe.ritual.name", Rituals.getLocalizedNameOfRitual(id))); + list.add(StatCollector.translateToLocalFormatted("nei.recipe.ritual.cost", this.cost)); + } +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/Meteor.java b/src/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/Meteor.java index dc0ed91d..fd22efd1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/Meteor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/Meteor.java @@ -87,13 +87,13 @@ public class Meteor { } } - private int getNewRadius(int radius, List reagents) { + public static int getNewRadius(int radius, List reagents) { radius += MeteorReagentRegistry.getLargestRadiusIncrease(reagents); radius += MeteorReagentRegistry.getLargestRadiusDecrease(reagents); return Math.max(radius, 1); } - private float getNewFillerChance(float fillerChance, List reagents) { + public static float getNewFillerChance(float fillerChance, List reagents) { // Don't add filler to meteors that have none if (fillerChance <= 0) { return 0; @@ -120,7 +120,7 @@ public class Meteor { * @return a new filler list. The original list is entirely replaced if any of the supplied reagents have a filler * config. */ - private List getNewFillerList(List fillerList, List reagents) { + public static List getNewFillerList(List fillerList, List reagents) { List reagentFillers = getFillerList(reagents); reagentFillers = removeBlocksMissingRequiredReagents(reagentFillers, reagents); if (!reagentFillers.isEmpty() && reagentFillers.get(0) != defaultMeteorBlock) { @@ -129,7 +129,7 @@ public class Meteor { return removeBlocksMissingRequiredReagents(fillerList, reagents); } - private List removeBlocksMissingRequiredReagents(List blockList, + public static List removeBlocksMissingRequiredReagents(List blockList, List reagents) { ArrayList newList = new ArrayList<>(); for (MeteorComponent component : blockList) { diff --git a/src/main/resources/assets/alchemicalwizardry/gui/nei/meteor.png b/src/main/resources/assets/alchemicalwizardry/gui/nei/meteor.png index 3774f089dcc5c1343a2af45d69feca97d6b3b236..d0711fd008917632519e30b14e9ce7be796d8d5e 100644 GIT binary patch literal 1106 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZzY=1HA;AcrO0(btiI zVPik{pF~z5Um@8e$d`ekN{xY`p@o6r7f`6-1p`B=0RzLU1O^7H84L{K1#@-<+5jck zlDyqr7#@Ql%Y@tBKoQOYkH}&M25w;xW@MN(M*=9wUgGKN%Knl?lvhZ9i>iGb0|WCk zPZ!6Kid%2*80KAZ5NUWAIpy#H(QCQOmR8y7u3fs5?YYO}>^0jT`YmMeo~RJG#sApm zneVe3#WTbHnPyKZkGlSK=YhFDem>5wa$CE#=I6hXqFGCAESTQ;t~LGo-rl}Wd#R1( ziJ(*J?hH%}91IE!4Gidv1F;`ZJ8*usS)T6VGIQCm=_~+h}$Bp>o8G!-G!XUul018ng1`C74QW9ZO#z4BSx?Ot{BiTu&(zEcGtfD{r*q(J!=8;4~D$T3ATSY4lEG-@IjfO+3mpL zeg+;XMt*xHgA5iMsKjOM|GX6+tQiZK8Gh|%Jo9h_u=T`eIf+yz4J==4K zqr`5$zufKrCCoSM8hE7h&zwBBQSgK{hPROdLVy7j)I2BL6pDAvKU|l?Vzm6Xr5Tg# vs1ei%i+guCSoQ*=ARK!X0J9i1z>n$iC1&gV3?>RhgN*ZZ^>bP0l+XkKZu>Eg literal 3666 zcmeH~YgAKL7RS%IUg(X0Bm|jI5dwr*ENDP6S|wZ*0zrrr99UA7sQ4I)D8YifuL?y+ z&c!A2hCkpR8c!6j>4tFz`q`-M;UvCi6O z@Bja|&)xTwx6n;*;kyd~0D1y<7ass1c?$uiObZm^`N`BsF~{GBw0QD-4kv} ze|7)We?Kl*UJ@?sapdMNE^LdNnHrmkdf_ahBQulgz%SpQntWCmI6YpLP$dv!zAI#=$l@D(SIqtwk}W zP6jC6uy_3>GAR7jpdyKq+a9}$F%jOZ9{Vw{YO+7SZ$ou1ib|dwL>S#suab@(S9SIz zo5g1cUPw<{5d#Q?UPwyRY=I*c$91>i&ny9N^($SiSfCJb5|Q9{KpHcySR3Fj=7gN53s05-e~>;Z*Y zb6uJQzPU>(v3sV05AsBgo*p3iWPpwd3@DG^>G{@B8J75k3`@E7hI|1<=5h7rLz?W{ zzCYyu?~7|`B8l$@DWKSeLP`|b9ycbQh?#CVs|L|1MRxDm0S9P88*0C3frFMo(z7>Q znDD(>N9(+IHfBaFp)l_arJW-EpmeaZoW8VrWiE?IKWZRfC!%zi6s$Z0l!OBe`q}^| zlzI9w4w>y*S95rQZeWih)Rl&x-0y~%PKWiPoQKZ?SP+f!V|8?9FA#!oO&g!ISGj-x zOxYDj&2SM#l+~GMj4|tm9a?V)n{X>3|ukv7dQ z%n05_m}&>yUU2L3RAs`P)X;i-x$whI-|rJ%-TJ$s^lpt)V>k`aa&p&8w=$ ze>na4ouf}J8{(p0uGs90iJn?d?zMrsL$Oca33b>-my6Pk?qD*|_q_o!KFT&g7$N`K z$bg1S8gAy}BS9OLfvHSl`4#T7G`*_t@81e=L^;hlNgU)o+#ZgYTWJYE+;kI$e3fPo zOWkR>&f^**lDWyC6NPKUg??u#q9TFLF4UXo#u}5)8?xZYguf*w^LRj$x&9dhl$+kn z0NVdtwj}n(xtJT#Bn4gpm?eR*+z4Jy4wE8lsD9TO{L$wOu=PP3?~E4x9p#+lwRGgC zD)O85yiRr!~lkZr{ZwT9&CIG@U3% z-P924n<_mM8tEo(e}b)68wxSG7w>VWm7Ag|{>VqyOz8ktnwtB4>^Z6kt?!Pf0Z5fQ z>$A+to9^-fiUU;TA^QX9aLOO6)Df%cXEmV*8^CzeFsh{k5M4MKW1c`Qr=lbU=Q>TR_bnJu4e z+L2oAz=Pd8$x3FeuBFNJt*zaW-r+(%760tKC4SlvmL7HtxxVBWyRo8H$*VLpqsv{= zO%qLppd>J}()e4w4P}vCm)2F#4*XdlBDc-~?x?}~Z;H@zK{A8dlEv52-mOFbc9BjhK8adDz-MkxNxMYW@n)uIO<}|y9 z37nLq9cK}|nP3!d6|6)4KTexdaeA*Wx9xs-0^JkPy`rhnYhiu-=&JUuU7vo@`sAD< zl8gLs)~Nk1X|9ZaqG-TN{Wy^R0J z&Q_~@V&72blc9YKu1e9Cy8r0_U)GXGw%uQV0y{F79UbSn?4;uJ?98(>&(1I3$G4n2 z{y-UbtsYCEsg&|pv&e5XplVh~g=YQJqo?D_!tKw z*n-a%9m~Y1a$!ZTA9{xze08^efJTr5+4{i?0W^%9q&ePw^Fih{`4vvaS1$d~TR*pp Rqb7e6fxuPhQm|2U{Ad41rMLh9 diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 8b31777f..8efa5d51 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -275,12 +275,23 @@ text.recipe.altar.tier=Tier: %s text.recipe.altar.bloodRequired=LP: %s text.recipe.shapedOrb=Shaped Orb Recipe nei.recipe.meteor.category=Meteor Ritual -nei.recipe.meteor.cost=Cost: %s LP +nei.recipe.meteor.cost=LP cost to summon this meteor +nei.recipe.meteor.tooExpensive=Insufficient LP nei.recipe.meteor.radius=Radius: %s +nei.recipe.meteor.diameter=Diameter: %d (2r + 1) nei.recipe.meteor.chance=Chance: %s%% nei.recipe.meteor.amount=Estimated amount: %s nei.recipe.meteor.filler=§7Filler block nei.recipe.meteor.reagent=§nRequired reagent§r: %s +nei.recipe.ritual.name=Ritual Name: %s +nei.recipe.ritual.cost=Activation Cost: %,d +nei.recipe.reagent.text=Reagent effects: +nei.recipe.reagent.meteor.radius= %+d radius (%s) +nei.recipe.reagent.meteor.filler.chance= Changes chance for filler block to %f%% +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 #Rituals ritual.AW001Water.name=Ritual of the Full Spring From d24de9e13d6e76f9fa00b0283c635129df5f6039 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Mon, 21 Apr 2025 17:12:44 -0400 Subject: [PATCH 2/7] Add ritual (name and cost) and reagent (message saying there are none that apply) to the binding ritual handler. It shows them for every recipe. It should only show once per page, but I'm stumped on how to actually do that. --- .../client/nei/IMCForNEI.java | 1 + .../client/nei/NEIBindingRitualHandler.java | 51 ++++++++++++++++++- .../client/nei/NEIMeteorRecipeHandler.java | 1 - .../client/nei/widgets/ReagentInfo.java | 9 ++++ .../assets/alchemicalwizardry/lang/en_US.lang | 1 + 5 files changed, 60 insertions(+), 3 deletions(-) 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 8efa5d51..4479efcd 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 From 78b0acad7edcad6b7501e40a6676b7ee937212d8 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Mon, 21 Apr 2025 17:44:31 -0400 Subject: [PATCH 3/7] Move the + button down for the meteor handler so it's not on top of the item slot graphics. --- .../java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java index fe215793..5a3c6b96 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java @@ -7,7 +7,7 @@ import cpw.mods.fml.common.event.FMLInterModComms; public class IMCForNEI { public static void IMCSender() { - sendHandler("alchemicalwizardry.meteor", "AWWayofTime:masterStone", 130); + sendHandler("alchemicalwizardry.meteor", "AWWayofTime:masterStone", 181); sendCatalyst("alchemicalwizardry.meteor", "AWWayofTime:masterStone"); sendCatalyst("alchemicalwizardry.bindingritual", "AWWayofTime:masterStone"); } From a29a4084edf6abad1216e985595ada4416a82c0e Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Mon, 21 Apr 2025 17:49:07 -0400 Subject: [PATCH 4/7] Spotless --- .../client/nei/NEIBindingRitualHandler.java | 17 ++++++------- .../client/nei/NEIMeteorRecipeHandler.java | 24 ++++++++++++------- .../client/nei/widgets/ReagentInfo.java | 2 +- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java index 7bcb6f97..0e2fad25 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java @@ -4,24 +4,20 @@ 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 net.minecraft.util.StatCollector; import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRecipe; import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry; +import WayofTime.alchemicalWizardry.client.nei.widgets.ReagentInfo; +import WayofTime.alchemicalWizardry.client.nei.widgets.RitualInfo; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -import net.minecraft.util.StatCollector; - -import static WayofTime.alchemicalWizardry.client.ClientUtils.mc; /** * Binding Ritual Handler by Arcaratus @@ -88,6 +84,7 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler { /** * Draws for every recipe, but it should really just do it once per page. + * * @param recipe The recipeIndex being drawn */ @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java index 6a68d5c3..a0134d6e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java @@ -13,10 +13,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import WayofTime.alchemicalWizardry.client.nei.widgets.CostInfo; -import WayofTime.alchemicalWizardry.client.nei.widgets.RadiusInfo; -import WayofTime.alchemicalWizardry.client.nei.widgets.ReagentInfo; -import WayofTime.alchemicalWizardry.client.nei.widgets.RitualInfo; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -31,6 +27,10 @@ import com.google.common.base.Joiner; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.client.nei.widgets.CostInfo; +import WayofTime.alchemicalWizardry.client.nei.widgets.RadiusInfo; +import WayofTime.alchemicalWizardry.client.nei.widgets.ReagentInfo; +import WayofTime.alchemicalWizardry.client.nei.widgets.RitualInfo; import WayofTime.alchemicalWizardry.common.summoning.meteor.Meteor; import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorComponent; import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorReagent; @@ -304,7 +304,9 @@ public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { if (rect.contains(mousePos)) { list.add(StatCollector.translateToLocal("nei.recipe.meteor.cost")); if (SoulNetworkHandler.getCurrentEssence(mc.thePlayer.getDisplayName()) < cachedRecipe.getCost()) { - list.add(EnumChatFormatting.RED + StatCollector.translateToLocal("nei.recipe.meteor.tooExpensive")); + list.add( + EnumChatFormatting.RED + + StatCollector.translateToLocal("nei.recipe.meteor.tooExpensive")); } } @@ -323,6 +325,7 @@ public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { rect = reagentInfo.getRect(gui); if (rect.contains(mousePos)) { + reagentInfo.onHover(list); addMeteorReagentInfo(list, cachedRecipe); } } @@ -350,14 +353,17 @@ public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { l.add( StatCollector.translateToLocalFormatted( "nei.recipe.reagent.meteor.filler.chance", - fmt.format(Meteor.getNewFillerChance( - cachedRecipe.fillerChance, - Collections.singletonList(r))))); + fmt.format( + Meteor.getNewFillerChance( + cachedRecipe.fillerChance, + Collections.singletonList(r))))); } if (!mr.filler.isEmpty()) { l.add( - StatCollector.translateToLocalFormatted("nei.recipe.reagent.meteor.filler.blocks", reagentFillerBlockNames(mr))); + StatCollector.translateToLocalFormatted( + "nei.recipe.reagent.meteor.filler.blocks", + reagentFillerBlockNames(mr))); } } 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 cb4f1a18..fdb63048 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/ReagentInfo.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/widgets/ReagentInfo.java @@ -7,8 +7,8 @@ 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; From 13748db6db48fb7981a083522a6c02e870351a56 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Mon, 21 Apr 2025 18:00:30 -0400 Subject: [PATCH 5/7] Capitalize this to match other text --- src/main/resources/assets/alchemicalwizardry/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 4479efcd..77d2cc8e 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -285,7 +285,7 @@ nei.recipe.meteor.filler=§7Filler block nei.recipe.meteor.reagent=§nRequired reagent§r: %s nei.recipe.ritual.name=Ritual Name: %s nei.recipe.ritual.cost=Activation Cost: %,d -nei.recipe.reagent.text=Reagent effects: +nei.recipe.reagent.text=Reagent Effects: nei.recipe.reagent.meteor.radius= %+d radius (%s) nei.recipe.reagent.meteor.filler.chance= Changes chance for filler block to %f%% nei.recipe.reagent.meteor.filler.blocks= Replaces filler with %s From 57fa14baf259da3aea7f66d70ff9324cb57991fd Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Mon, 21 Apr 2025 18:08:32 -0400 Subject: [PATCH 6/7] Make this message more clear --- src/main/resources/assets/alchemicalwizardry/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 77d2cc8e..7dde658b 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -276,7 +276,7 @@ text.recipe.altar.bloodRequired=LP: %s text.recipe.shapedOrb=Shaped Orb Recipe nei.recipe.meteor.category=Meteor Ritual nei.recipe.meteor.cost=LP cost to summon this meteor -nei.recipe.meteor.tooExpensive=Insufficient LP +nei.recipe.meteor.tooExpensive=Insufficient LP in Soul Network nei.recipe.meteor.radius=Radius: %s nei.recipe.meteor.diameter=Diameter: %d (2r + 1) nei.recipe.meteor.chance=Chance: %s%% From f0596f167018e36e8427b6042e256c43d370ebe4 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Fri, 25 Apr 2025 07:34:28 -0400 Subject: [PATCH 7/7] This works to make it only show this info on the first page of results, which seems fine. --- .../client/nei/NEIBindingRitualHandler.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java index 0e2fad25..7e22ef2a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java @@ -82,16 +82,15 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler { } } - /** - * 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); + + // Only shows these for the first result + if (recipe == 0) { + ritualInfo.onDraw(0, 0); + reagentInfo.onDraw(150, 0); + } } @Override @@ -100,7 +99,7 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler { CachedRecipe cRecipe = arecipes.get(recipeIndex); Point mousePos = GuiDraw.getMousePosition(); - if (cRecipe instanceof NEIBindingRitualHandler.CachedBindingRecipe) { + if (recipeIndex == 0 && cRecipe instanceof NEIBindingRitualHandler.CachedBindingRecipe) { Rectangle rect = ritualInfo.getRect(gui); if (rect.contains(mousePos)) { ritualInfo.onHover(list);