From bfef4186deb3c2c9d52faf8110385996ccc616b9 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 1 Jun 2024 03:36:08 -0400 Subject: [PATCH] shift nei mana pool --- dependencies.gradle | 1 + .../nei/recipe/RecipeHandlerManaPool.java | 13 ++++++++++++- src/main/resources/assets/botania/lang/en_US.lang | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 7e0d5c04a..29238f15c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -14,5 +14,6 @@ dependencies { compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev') } diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java index 3548d4126..fe9192188 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java @@ -5,6 +5,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; @@ -49,6 +52,7 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler { otherStacks.add(new PositionedStack(new ItemStack(ModBlocks.conjurationCatalyst), 10, 37)); output = new PositionedStack(recipe.getOutput(), 101, 37); + // This value is where the mana bar is stored initially mana = recipe.getManaToConsume(); } @@ -94,9 +98,16 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler { super.drawBackground(recipe); GL11.glEnable(GL11.GL_BLEND); GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F); + // Mana infusion is the mana pool, super weird. GuiDraw.changeTexture(LibResources.GUI_MANA_INFUSION_OVERLAY); GuiDraw.drawTexturedModalRect(45, 20, 38, 35, 92, 50); - HUDHandler.renderManaBar(32, 80, 0x0000FF, 0.75F, ((CachedManaPoolRecipe) arecipes.get(recipe)).mana, TilePool.MAX_MANA / 10); + // Below is where the mana bar actually drawn. + int tempMana = ((CachedManaPoolRecipe) arecipes.get(recipe)).mana; + HUDHandler.renderManaBar(32, 80, 0x0000FF, 0.75F, GuiScreen.isShiftKeyDown() ? tempMana : tempMana * 10, TilePool.MAX_MANA / 10); + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + String size = GuiScreen.isShiftKeyDown() ? "1x " : "10x "; + String localized = StatCollector.translateToLocal("botaniamisc.neiratio"); + font.drawString(size + localized, 84 - font.getStringWidth(size + localized) / 2, 71, 0x000000); RenderTilePool.forceMana = true; } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 277197369..2199d4c15 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -50,6 +50,7 @@ botaniamisc.clickToSee=Click to read botaniamisc.shiftToRemove=Shift-click to remove botaniamisc.clickToAdd=Add Bookmark botaniamisc.ratio=%sx Zoom (hover to zoom out) +botaniamisc.neiratio=Zoom (shift to zoom out) botaniamisc.bottleTooltip=It has an acquired taste botaniamisc.coarseDirt0=Coarse Dirt, grass botaniamisc.coarseDirt1=won't grow on it