diff --git a/src/main/java/forestry/api/genetics/IIndividual.java b/src/main/java/forestry/api/genetics/IIndividual.java index 1d79620d2..6bdb190e9 100644 --- a/src/main/java/forestry/api/genetics/IIndividual.java +++ b/src/main/java/forestry/api/genetics/IIndividual.java @@ -52,4 +52,8 @@ public interface IIndividual extends INBTTagable { IIndividual copy(); boolean isPureBred(IChromosomeType chromosomeType); + + default void addLore(List text) {} + + default void addDiscoveredBy(List text) {} } diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 917993472..fea1ff5be 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -18,6 +18,8 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -376,6 +378,36 @@ public class Bee extends IndividualLiving implements IBee { return suitableBiomes; } + @Override + public void addLore(List text) { + IAlleleBeeSpecies primary = genome.getPrimary(); + String descTokens[] = primary.getDescription().split("\\|"); + + if (descTokens.length > 0) { + String speciesLore = descTokens[0]; + if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) { + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + String formattedLore = EnumChatFormatting.GOLD + speciesLore; + List formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200); + text.addAll(formattedLoreList); + } + } + } + + @Override + public void addDiscoveredBy(List text) { + IAlleleBeeSpecies primary = genome.getPrimary(); + String descTokens[] = primary.getDescription().split("\\|"); + + if (descTokens.length > 2) { + String discoveredBy = descTokens[2]; + if (!discoveredBy.isEmpty()) { + text.add(""); + text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy); + } + } + } + @Override public void addTooltip(List list) { diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index dfca8ae9b..947036eb2 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -16,6 +16,8 @@ import java.util.List; import javax.annotation.Nullable; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; @@ -298,6 +300,36 @@ public class Tree extends Individual implements ITree, IPlantable { return plantTypes; } + @Override + public void addLore(List text) { + IAlleleTreeSpecies primary = genome.getPrimary(); + String descTokens[] = primary.getDescription().split("\\|"); + + if (descTokens.length > 0) { + String speciesLore = descTokens[0]; + if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) { + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + String formattedLore = EnumChatFormatting.GOLD + speciesLore; + List formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200); + text.addAll(formattedLoreList); + } + } + } + + @Override + public void addDiscoveredBy(List text) { + IAlleleTreeSpecies primary = genome.getPrimary(); + String descTokens[] = primary.getDescription().split("\\|"); + + if (descTokens.length > 2) { + String discoveredBy = descTokens[2]; + if (!discoveredBy.isEmpty()) { + text.add(""); + text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy); + } + } + } + @Override public void addTooltip(List list) { diff --git a/src/main/java/forestry/core/genetics/ItemGE.java b/src/main/java/forestry/core/genetics/ItemGE.java index c793f20cc..8b823d2bb 100755 --- a/src/main/java/forestry/core/genetics/ItemGE.java +++ b/src/main/java/forestry/core/genetics/ItemGE.java @@ -72,6 +72,12 @@ public abstract class ItemGE extends ItemForestry { if (individual.isAnalyzed()) { if (Proxies.common.isShiftDown()) { individual.addTooltip(list); + individual.addDiscoveredBy(list); + if (Proxies.common.isCtrlDown()) { + individual.addLore(list); + } else { + list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tml") + ">"); + } } else { list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tmi") + ">"); } diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index fa81c312a..b566e2a5e 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -61,6 +61,10 @@ public class ProxyCommon { return false; } + public boolean isCtrlDown() { + return false; + } + public void playSoundFX(World world, int x, int y, int z, Block block) { Proxies.net.sendNetworkPacket(new PacketFXSignal(PacketFXSignal.SoundFXType.LEAF, x, y, z, block, 0), world); } diff --git a/src/main/java/forestry/core/proxy/ProxyCommonClient.java b/src/main/java/forestry/core/proxy/ProxyCommonClient.java index 97720e1be..83b51590c 100644 --- a/src/main/java/forestry/core/proxy/ProxyCommonClient.java +++ b/src/main/java/forestry/core/proxy/ProxyCommonClient.java @@ -63,6 +63,11 @@ public class ProxyCommonClient extends ProxyCommon { return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); } + @Override + public boolean isCtrlDown() { + return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL); + } + @Override public String getDisplayName(ItemStack itemstack) { return itemstack.getItem().getItemStackDisplayName(itemstack); diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 9b41c616b..063919934 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -14,6 +14,8 @@ import java.util.Locale; import java.util.Map; import java.util.Random; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.EntityCreature; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -60,6 +62,36 @@ public class Butterfly extends IndividualLiving implements IButterfly { this.genome = genome; } + @Override + public void addLore(List text) { + IAlleleButterflySpecies primary = genome.getPrimary(); + String descTokens[] = primary.getDescription().split("\\|"); + + if (descTokens.length > 0) { + String speciesLore = descTokens[0]; + if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) { + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + String formattedLore = EnumChatFormatting.GOLD + speciesLore; + List formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200); + text.addAll(formattedLoreList); + } + } + } + + @Override + public void addDiscoveredBy(List text) { + IAlleleButterflySpecies primary = genome.getPrimary(); + String descTokens[] = primary.getDescription().split("\\|"); + + if (descTokens.length > 2) { + String discoveredBy = descTokens[2]; + if (!discoveredBy.isEmpty()) { + text.add(""); + text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy); + } + } + } + @Override public void addTooltip(List list) { IAlleleButterflySpecies primary = genome.getPrimary(); diff --git a/src/main/resources/assets/forestry/lang/de_DE.lang b/src/main/resources/assets/forestry/lang/de_DE.lang index 0b1f31369..218d4d441 100644 --- a/src/main/resources/assets/forestry/lang/de_DE.lang +++ b/src/main/resources/assets/forestry/lang/de_DE.lang @@ -335,6 +335,7 @@ for.gui.temperature=Temperatur for.gui.tolerance=Toleranz for.gui.temptol=Temp.Tol for.gui.tooltip.tmi=Drücke die Umschalttaste für mehr Infos. +for.gui.tooltip.tml=Drücke die Steuerungstaste für mehr Geschichte. for.gui.triple=Dreifache for.gui.unknown=Unbekannt for.gui.warm=Warm diff --git a/src/main/resources/assets/forestry/lang/en_US.lang b/src/main/resources/assets/forestry/lang/en_US.lang index 846afa8e9..8e7dca313 100644 --- a/src/main/resources/assets/forestry/lang/en_US.lang +++ b/src/main/resources/assets/forestry/lang/en_US.lang @@ -341,6 +341,7 @@ for.gui.temperature=Temperature for.gui.tolerance=Tolerance for.gui.temptol=Temperature Tol. for.gui.tooltip.tmi=Hold shift for details +for.gui.tooltip.tml=Hold ctrl for lore for.gui.triple=Triple for.gui.unknown=Unknown genome for.gui.warm=Warm diff --git a/src/main/resources/assets/forestry/lang/no_NO.lang b/src/main/resources/assets/forestry/lang/no_NO.lang index a5eae6a69..d08de37a2 100644 --- a/src/main/resources/assets/forestry/lang/no_NO.lang +++ b/src/main/resources/assets/forestry/lang/no_NO.lang @@ -244,6 +244,7 @@ gui.higher=Higher gui.highest=Highest gui.fecundated=Mated gui.tooltip.tmi=Hold shift for details +gui.tooltip.tml=Hold ctrl for lore gui.worktable.clear=Click to clear Grid gui.escritoire.probe=Examine Specimens hints.beebiomes.tag=Choose your biome!