From d863b3c3115a601441c4eecb276f15581758c35d Mon Sep 17 00:00:00 2001 From: Nilau1998 Date: Tue, 10 Sep 2024 22:59:36 +0200 Subject: [PATCH] [minor] better formatting, logic for bees, trees and butterflies. --- .../forestry/api/genetics/IIndividual.java | 4 ++ .../forestry/apiculture/genetics/Bee.java | 46 +++++++++++++------ .../forestry/arboriculture/genetics/Tree.java | 32 +++++++++++++ .../forestry/core/genetics/Individual.java | 8 ++++ .../java/forestry/core/genetics/ItemGE.java | 6 +++ .../java/forestry/core/utils/StringUtil.java | 24 ---------- .../lepidopterology/genetics/Butterfly.java | 32 +++++++++++++ .../resources/assets/forestry/lang/de_DE.lang | 1 + .../resources/assets/forestry/lang/en_US.lang | 1 + .../resources/assets/forestry/lang/no_NO.lang | 1 + 10 files changed, 116 insertions(+), 39 deletions(-) diff --git a/src/main/java/forestry/api/genetics/IIndividual.java b/src/main/java/forestry/api/genetics/IIndividual.java index 1d79620d2..972ab450a 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); + + void addLore(List text); + + 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 0067162b9..767a6f7cf 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -18,6 +18,7 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -377,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") && Proxies.common.isCtrlDown()) { + FontRenderer fontRenderer = Proxies.common.getClientInstance().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) { @@ -457,21 +488,6 @@ public class Bee extends IndividualLiving implements IBee { if (genome.getTolerantFlyer()) { list.add(EnumChatFormatting.WHITE + StringUtil.localize("gui.flyer.tooltip")); } - - // Add lore and discovered by - String descTokens[] = primary.getDescription().split("\\|"); - if (descTokens.length > 0) { - String speciesLore = descTokens[0]; - if (!speciesLore.isEmpty() && Proxies.common.isCtrlDown()) { - list.addAll(StringUtil.multilineStrings(speciesLore, 50)); - } - } - if (descTokens.length > 2) { - String discoveredBy = descTokens[2]; - if (!discoveredBy.isEmpty()) { - list.add("Discovered by " + discoveredBy); - } - } } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index dfca8ae9b..8cd8f25b9 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -16,6 +16,7 @@ import java.util.List; import javax.annotation.Nullable; import net.minecraft.block.Block; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; @@ -50,6 +51,7 @@ import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.core.config.Config; import forestry.core.genetics.Chromosome; import forestry.core.genetics.Individual; +import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; public class Tree extends Individual implements ITree, IPlantable { @@ -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") && Proxies.common.isCtrlDown()) { + FontRenderer fontRenderer = Proxies.common.getClientInstance().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/Individual.java b/src/main/java/forestry/core/genetics/Individual.java index 0028fd0ff..4f1f21a87 100755 --- a/src/main/java/forestry/core/genetics/Individual.java +++ b/src/main/java/forestry/core/genetics/Individual.java @@ -8,6 +8,8 @@ ******************************************************************************/ package forestry.core.genetics; +import java.util.List; + import net.minecraft.nbt.NBTTagCompound; import forestry.api.genetics.IChromosomeType; @@ -79,4 +81,10 @@ public abstract class Individual implements IIndividual { return getGenome().getActiveAllele(chromosomeType).getUID() .equals(getGenome().getInactiveAllele(chromosomeType).getUID()); } + + @Override + public void addLore(List text) {} + + @Override + public void addDiscoveredBy(List text) {} } 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/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java index 3f22d5986..841966f5d 100755 --- a/src/main/java/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -8,9 +8,7 @@ ******************************************************************************/ package forestry.core.utils; -import java.util.ArrayList; import java.util.IllegalFormatException; -import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -118,26 +116,4 @@ public class StringUtil { return lineCount * fontRenderer.FONT_HEIGHT; } - - public static List multilineStrings(String input, int n) { - List result = new ArrayList<>(); - - int start = 0; - while (start < input.length()) { - // Find the end index by starting with n characters ahead - int end = Math.min(start + n, input.length()); - - // If end is not at the end of the string, backtrack to the last space - if (end < input.length() && !Character.isWhitespace(input.charAt(end))) { - int lastSpace = input.lastIndexOf(' ', end); - if (lastSpace > start) { - end = lastSpace; - } - } - - result.add(input.substring(start, end).trim()); - start = end; - } - return result; - } } diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 9b41c616b..90de19908 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -14,6 +14,7 @@ import java.util.Locale; import java.util.Map; import java.util.Random; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.EntityCreature; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -41,6 +42,7 @@ import forestry.api.lepidopterology.IEntityButterfly; import forestry.core.genetics.Chromosome; import forestry.core.genetics.GenericRatings; import forestry.core.genetics.IndividualLiving; +import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; public class Butterfly extends IndividualLiving implements IButterfly { @@ -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") && Proxies.common.isCtrlDown()) { + FontRenderer fontRenderer = Proxies.common.getClientInstance().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!