Merge remote-tracking branch 'Nilau1998/bee-lore+name' into dev

This commit is contained in:
Martin Robertz committed 2024-09-11 08:22:18 +02:00
commit 1cdc3d9a1f
10 files changed
+116 -39

No files matched your search

@@ -52,4 +52,8 @@ public interface IIndividual extends INBTTagable {
IIndividual copy();
boolean isPureBred(IChromosomeType chromosomeType);
void addLore(List<String> text);
void addDiscoveredBy(List<String> text);
}
@@ -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<String> 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<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
text.addAll(formattedLoreList);
}
}
}
@Override
public void addDiscoveredBy(List<String> 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<String> 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
@@ -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<String> 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<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
text.addAll(formattedLoreList);
}
}
}
@Override
public void addDiscoveredBy(List<String> 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<String> list) {
@@ -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<String> text) {}
@Override
public void addDiscoveredBy(List<String> text) {}
}
@@ -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") + ">");
}
@@ -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<String> multilineStrings(String input, int n) {
List<String> 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;
}
}
@@ -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<String> 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<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
text.addAll(formattedLoreList);
}
}
}
@Override
public void addDiscoveredBy(List<String> 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<String> list) {
IAlleleButterflySpecies primary = genome.getPrimary();
@@ -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
@@ -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
@@ -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!