From f7ad61a2f3eae736932e9200404fee9b60a51945 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 23 Apr 2016 22:10:59 -0700 Subject: [PATCH] Add better documentation for Frames --- lang | 2 +- .../compat/ApicultureJeiPlugin.java | 26 +++++++++++++++++++ .../apiculture/items/ItemHiveFrame.java | 24 +++++++++++++++-- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java diff --git a/lang b/lang index 0c7bc1bba..969088c31 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 0c7bc1bba2c4c4742452af8591e04836aefb09cb +Subproject commit 969088c317144e99adf003993887e704b2f80e87 diff --git a/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java new file mode 100644 index 000000000..9202fb4a4 --- /dev/null +++ b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java @@ -0,0 +1,26 @@ +package forestry.apiculture.compat; + +import javax.annotation.Nonnull; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.item.ItemStack; + +import forestry.apiculture.PluginApiculture; + +import mezz.jei.api.BlankModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.JEIPlugin; + +@JEIPlugin +public class ApicultureJeiPlugin extends BlankModPlugin { + @Override + public void register(@Nonnull IModRegistry registry) { + List frames = Arrays.asList( + new ItemStack(PluginApiculture.items.frameImpregnated), + new ItemStack(PluginApiculture.items.frameProven), + new ItemStack(PluginApiculture.items.frameUntreated) + ); + registry.addDescription(frames, "for.jei.description.frames"); + } +} diff --git a/src/main/java/forestry/apiculture/items/ItemHiveFrame.java b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java index eef5b1581..6defc07e3 100755 --- a/src/main/java/forestry/apiculture/items/ItemHiveFrame.java +++ b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.apiculture.items; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import forestry.api.apiculture.DefaultBeeModifier; @@ -21,9 +24,11 @@ import forestry.api.apiculture.IHiveFrame; import forestry.api.core.Tabs; import forestry.core.items.ItemForestry; +import mezz.jei.util.Translator; + public class ItemHiveFrame extends ItemForestry implements IHiveFrame { - private final IBeeModifier beeModifier; + private final HiveFrameBeeModifier beeModifier; public ItemHiveFrame(int maxDamage, float geneticDecay) { setMaxStackSize(1); @@ -48,7 +53,17 @@ public class ItemHiveFrame extends ItemForestry implements IHiveFrame { return beeModifier; } + @Override + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + super.addInformation(stack, playerIn, tooltip, advanced); + beeModifier.addInformation(stack, playerIn, tooltip, advanced); + if (!stack.isItemDamaged()) { + tooltip.add(Translator.translateToLocalFormatted("item.for.frame.durability", stack.getMaxDamage())); + } + } + private static class HiveFrameBeeModifier extends DefaultBeeModifier { + private static final float production = 2f; private final float geneticDecay; public HiveFrameBeeModifier(float geneticDecay) { @@ -57,12 +72,17 @@ public class ItemHiveFrame extends ItemForestry implements IHiveFrame { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return currentModifier < 10f ? 2f : 1f; + return currentModifier < 10f ? production : 1f; } @Override public float getGeneticDecay(IBeeGenome genome, float currentModifier) { return this.geneticDecay; } + + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + tooltip.add(Translator.translateToLocalFormatted("item.for.bee.modifier.production", production)); + tooltip.add(Translator.translateToLocalFormatted("item.for.bee.modifier.genetic.decay", geneticDecay)); + } } }