From 5816af57bc83e8c3f43ebf299d2c2d201cf13f78 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 12 Feb 2017 00:01:53 -0800 Subject: [PATCH] Add tooltips to frames to show what each does --- .../core/genetics/BeeModifierLogic.java | 38 ++++++++++++++++--- .../extrabees/apiary/EnumHiveFrame.java | 9 +++++ .../extrabees/apiary/ItemHiveFrame.java | 19 +++++++--- .../resources/assets/genetics/lang/en_US.lang | 3 ++ 4 files changed, 57 insertions(+), 12 deletions(-) diff --git a/src/main/java/binnie/core/genetics/BeeModifierLogic.java b/src/main/java/binnie/core/genetics/BeeModifierLogic.java index fe730034..b87ebe8d 100644 --- a/src/main/java/binnie/core/genetics/BeeModifierLogic.java +++ b/src/main/java/binnie/core/genetics/BeeModifierLogic.java @@ -1,5 +1,11 @@ package binnie.core.genetics; +import forestry.core.utils.Translator; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -19,17 +25,17 @@ public class BeeModifierLogic { return 1.0f; } final float mult = this.modifiers.get(modifier)[0]; - final float max = this.modifiers.get(modifier)[1]; - if (max >= 1.0f) { - if (max <= currentModifier) { + final float limit = this.modifiers.get(modifier)[1]; + if (limit >= 1.0f) { + if (limit <= currentModifier) { return 1.0f; } - return Math.min(max / currentModifier, mult); + return Math.min(limit / currentModifier, mult); } else { - if (max >= currentModifier) { + if (limit >= currentModifier) { return 1.0f; } - return Math.max(max / currentModifier, mult); + return Math.max(limit / currentModifier, mult); } } @@ -44,4 +50,24 @@ public class BeeModifierLogic { public void setModifier(final EnumBeeModifier modifier, final float mult, final float max) { this.modifiers.put(modifier, new Float[]{mult, max}); } + + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + for (Map.Entry modifier : modifiers.entrySet()) { + final EnumBeeModifier key = modifier.getKey(); + final Float[] value = modifier.getValue(); + final String modifierName = Translator.translateToLocal(key.getName()); + Float multiplier = value[0]; + Float limit = value[1]; + if (multiplier < 0.01) { + multiplier = 0f; + } + if (limit < 0.01) { + limit = 0f; + } + final String formatKey = limit >= 1.0f ? "bee.modifier.format.max" : "bee.modifier.format.min"; + final String valueString = Translator.translateToLocalFormatted(formatKey, multiplier, limit); + tooltip.add(modifierName + ": " + valueString); + } + } } diff --git a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java index 6ca2dc5c..14401342 100644 --- a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java @@ -10,13 +10,17 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IHiveFrame; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; +import java.util.List; public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { Cocoa, @@ -137,4 +141,9 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { public Item getItem() { return item; } + + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + this.logic.addInformation(stack, playerIn, tooltip, advanced); + } } diff --git a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java index 455f1d91..8c68837d 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java @@ -8,15 +8,18 @@ import forestry.api.apiculture.IHiveFrame; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; +import forestry.core.utils.Translator; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; +import java.util.List; public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IItemModelRegister { - EnumHiveFrame frame; + private final EnumHiveFrame frame; @Override public String getItemStackDisplayName(final ItemStack par1ItemStack) { @@ -91,11 +94,15 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt return false; } -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = ExtraBees.proxy.getIcon(register, "frame" + this.frame.toString()); -// } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + super.addInformation(stack, playerIn, tooltip, advanced); + this.frame.addInformation(stack, playerIn, tooltip, advanced); + if (!stack.isItemDamaged()) { + tooltip.add(Translator.translateToLocalFormatted("item.for.durability", stack.getMaxDamage())); + } + } @Override public float getGeneticDecay(final IBeeGenome genome, final float currentModifier) { diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index 1961a063..6dab9b9d 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -115,3 +115,6 @@ genetics.item.sequence.2=Weak genetics.item.sequence.3=Average genetics.item.sequence.4=Strong genetics.item.sequence.5=Very Strong + +bee.modifier.format.max=%.2fx (Max: %.2fx) +bee.modifier.format.min=%.2fx (Min: %.2fx)