Change IAllele.getName to IAllele.getAlleleName to fix obfuscation bugs

This commit is contained in:
mezz committed 2017-05-10 00:06:30 -07:00
1 parent 828dd63acd
commit 438883bb8e
21 files changed
+75 -50

No files matched your search

@@ -28,9 +28,20 @@ public interface IAllele {
/**
* @return Localized short, human-readable identifier used in tooltips and beealyzer.
* @deprecated since Forestry 5.3.4. Use {@link #getAlleleName()}.
*/
@Deprecated
String getName();
/**
* @return Localized short, human-readable identifier used in tooltips and beealyzer.
* @since Forestry 5.3.4
* @apiNote This can't be named "getName" or it can conflict during obfuscation. https://github.com/md-5/SpecialSource/issues/12
*/
default String getAlleleName() {
return getName();
}
/**
* @return The unlocalized identifier
*/
@@ -94,7 +94,7 @@ public class CommandBeeGive extends SubCommand {
ItemStack beeStack = BeeManager.beeRoot.getMemberStack(bee, beeType);
player.dropItem(beeStack, false, true);
CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.bee.give.given", player.getName(), bee.getGenome().getPrimary().getName(), beeType.getName());
CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.bee.give.given", player.getName(), bee.getGenome().getPrimary().getAlleleName(), beeType.getName());
}
private static IBeeGenome getBeeGenome(String speciesName) throws SpeciesNotFoundException, TemplateNotFoundException {
@@ -115,7 +115,7 @@ public class CommandBeeGive extends SubCommand {
if (species == null) {
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
if (allele instanceof IAlleleBeeSpecies && allele.getName().equals(speciesName)) {
if (allele instanceof IAlleleBeeSpecies && allele.getAlleleName().equals(speciesName)) {
species = (IAlleleBeeSpecies) allele;
break;
}
@@ -150,7 +150,7 @@ public class CommandBeeGive extends SubCommand {
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
if (allele instanceof IAlleleBeeSpecies) {
species.add(allele.getName());
species.add(allele.getAlleleName());
}
}
@@ -361,7 +361,7 @@ public class Bee extends IndividualLiving implements IBee {
IAlleleBeeSpecies primary = genome.getPrimary();
IAlleleBeeSpecies secondary = genome.getSecondary();
if (!isPureBred(EnumBeeChromosome.SPECIES)) {
list.add(TextFormatting.BLUE + Translator.translateToLocal("for.bees.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName()));
list.add(TextFormatting.BLUE + Translator.translateToLocal("for.bees.hybrid").replaceAll("%PRIMARY", primary.getAlleleName()).replaceAll("%SECONDARY", secondary.getAlleleName()));
}
if (generation > 0) {
@@ -389,12 +389,12 @@ public class Bee extends IndividualLiving implements IBee {
if (Translator.canTranslateToLocal(unlocalizedCustomSpeed)) {
speed = Translator.translateToLocal(unlocalizedCustomSpeed);
} else {
speed = speedAllele.getName() + ' ' + Translator.translateToLocal("for.gui.worker");
speed = speedAllele.getAlleleName() + ' ' + Translator.translateToLocal("for.gui.worker");
}
String lifespan = genome.getActiveAllele(EnumBeeChromosome.LIFESPAN).getName() + ' ' + Translator.translateToLocal("for.gui.life");
String tempTolerance = TextFormatting.GREEN + "T: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + tempToleranceAllele.getName();
String humidTolerance = TextFormatting.GREEN + "H: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + humidToleranceAllele.getName();
String lifespan = genome.getActiveAllele(EnumBeeChromosome.LIFESPAN).getAlleleName() + ' ' + Translator.translateToLocal("for.gui.life");
String tempTolerance = TextFormatting.GREEN + "T: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + tempToleranceAllele.getAlleleName();
String humidTolerance = TextFormatting.GREEN + "H: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + humidToleranceAllele.getAlleleName();
String flowers = genome.getFlowerProvider().getDescription();
list.add(lifespan);
@@ -33,4 +33,8 @@ public class AlleleFlowers extends AlleleCategorized implements IAlleleFlowers {
return getProvider().getDescription();
}
@Override
public String getAlleleName() {
return getProvider().getDescription();
}
}
@@ -62,11 +62,11 @@ public class GuiImprinter extends GuiForestry<ContainerImprinter> {
IAlleleBeeSpecies primary = itemInventory.getPrimary();
drawBeeSpeciesIcon(primary, startX + 12, startY + 32);
fontRendererObj.drawString(primary.getName(), startX + 32, startY + 36, ColourProperties.INSTANCE.get("gui.screen"));
fontRendererObj.drawString(primary.getAlleleName(), startX + 32, startY + 36, ColourProperties.INSTANCE.get("gui.screen"));
IAlleleBeeSpecies secondary = itemInventory.getSecondary();
drawBeeSpeciesIcon(secondary, startX + 12, startY + 52);
fontRendererObj.drawString(secondary.getName(), startX + 32, startY + 56, ColourProperties.INSTANCE.get("gui.screen"));
fontRendererObj.drawString(secondary.getAlleleName(), startX + 32, startY + 56, ColourProperties.INSTANCE.get("gui.screen"));
String youCheater = Translator.translateToLocal("for.gui.imprinter.cheater");
offset = (138 - fontRendererObj.getStringWidth(youCheater)) / 2;
@@ -72,7 +72,7 @@ public final class CommandTreeSpawn extends SubCommand {
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
if (allele instanceof IAlleleTreeSpecies) {
species.add(allele.getName().replaceAll("\\s", ""));
species.add(allele.getAlleleName().replaceAll("\\s", ""));
}
}
@@ -87,7 +87,7 @@ public final class TreeGenHelper {
if (species == null) {
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
if (allele instanceof IAlleleTreeSpecies && allele.getName().replaceAll("\\s", "").equals(speciesName)) {
if (allele instanceof IAlleleTreeSpecies && allele.getAlleleName().replaceAll("\\s", "").equals(speciesName)) {
species = (IAlleleTreeSpecies) allele;
break;
}
@@ -250,15 +250,15 @@ public class Tree extends Individual implements ITree, IPlantable {
IAlleleTreeSpecies primary = genome.getPrimary();
IAlleleTreeSpecies secondary = genome.getSecondary();
if (!isPureBred(EnumTreeChromosome.SPECIES)) {
list.add(TextFormatting.BLUE + Translator.translateToLocal("for.trees.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName()));
list.add(TextFormatting.BLUE + Translator.translateToLocal("for.trees.hybrid").replaceAll("%PRIMARY", primary.getAlleleName()).replaceAll("%SECONDARY", secondary.getAlleleName()));
}
String sappiness = TextFormatting.GOLD + "S: " + genome.getActiveAllele(EnumTreeChromosome.SAPPINESS).getName();
String maturation = TextFormatting.RED + "M: " + genome.getActiveAllele(EnumTreeChromosome.MATURATION).getName();
String height = TextFormatting.LIGHT_PURPLE + "H: " + genome.getActiveAllele(EnumTreeChromosome.HEIGHT).getName();
String sappiness = TextFormatting.GOLD + "S: " + genome.getActiveAllele(EnumTreeChromosome.SAPPINESS).getAlleleName();
String maturation = TextFormatting.RED + "M: " + genome.getActiveAllele(EnumTreeChromosome.MATURATION).getAlleleName();
String height = TextFormatting.LIGHT_PURPLE + "H: " + genome.getActiveAllele(EnumTreeChromosome.HEIGHT).getAlleleName();
String girth = TextFormatting.AQUA + "G: " + String.format("%sx%s", genome.getGirth(), genome.getGirth());
String saplings = TextFormatting.YELLOW + "S: " + genome.getActiveAllele(EnumTreeChromosome.FERTILITY).getName();
String yield = TextFormatting.WHITE + "Y: " + genome.getActiveAllele(EnumTreeChromosome.YIELD).getName();
String saplings = TextFormatting.YELLOW + "S: " + genome.getActiveAllele(EnumTreeChromosome.FERTILITY).getAlleleName();
String yield = TextFormatting.WHITE + "Y: " + genome.getActiveAllele(EnumTreeChromosome.YIELD).getAlleleName();
String carbonization = TextFormatting.GRAY + "CA: " + secondary.getWoodProvider().getCarbonization();
list.add(String.format("%s, %s", saplings, maturation));
list.add(String.format("%s, %s", height, girth));
@@ -39,6 +39,11 @@ public class AlleleFruit extends AlleleCategorized implements IAlleleFruit {
return getProvider().getDescription();
}
@Override
public String getAlleleName() {
return getProvider().getDescription();
}
@Nullable
@Override
public String getModelName() {
@@ -83,7 +83,7 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable, ICol
return Translator.translateToLocal(customTreeKey);
}
String typeString = Translator.translateToLocal("for.trees.grammar." + type.getName() + ".type");
return Translator.translateToLocal("for.trees.grammar." + type.getName()).replaceAll("%SPECIES", species.getName()).replaceAll("%TYPE", typeString);
return Translator.translateToLocal("for.trees.grammar." + type.getName()).replaceAll("%SPECIES", species.getAlleleName()).replaceAll("%TYPE", typeString);
}
@Override
@@ -177,7 +177,7 @@ public final class CommandSaveStats extends SubCommand {
notCounted = notCountedSymbol;
}
return speciesListEntry(discovered, blacklisted, notCounted, species.getUID(), species.getName(), species.getAuthority());
return speciesListEntry(discovered, blacklisted, notCounted, species.getUID(), species.getAlleleName(), species.getAuthority());
}
private static String speciesListEntry(String discovered, String blacklisted, String notCounted, String UID, String speciesName, String authority) {
@@ -18,7 +18,7 @@ public class TemplateNotFoundException extends CommandException {
private static final long serialVersionUID = 1L;
public TemplateNotFoundException(IAlleleSpecies species) {
super("Could not find template for species %s with UID %s", species.getName(), species.getUID());
super("Could not find template for species %s with UID %s", species.getAlleleName(), species.getUID());
}
}
@@ -54,7 +54,7 @@ public abstract class Individual implements IIndividual {
@Override
public String getDisplayName() {
return getGenome().getPrimary().getName();
return getGenome().getPrimary().getAlleleName();
}
/* INFORMATION */
@@ -92,11 +92,11 @@ public class ItemResearchNote extends ItemForestry {
return tooltips;
}
String species1 = encoded.getAllele0().getName();
String species2 = encoded.getAllele1().getName();
String species1 = encoded.getAllele0().getAlleleName();
String species2 = encoded.getAllele1().getAlleleName();
String mutationChanceKey = EnumMutateChance.rateChance(encoded.getBaseChance()).toString().toLowerCase(Locale.ENGLISH);
String mutationChance = Translator.translateToLocal("for.researchNote.chance." + mutationChanceKey);
String speciesResult = encoded.getTemplate()[root.getSpeciesChromosomeType().ordinal()].getName();
String speciesResult = encoded.getTemplate()[root.getSpeciesChromosomeType().ordinal()].getAlleleName();
tooltips.add(Translator.translateToLocal("for.researchNote.discovery.0"));
tooltips.add(Translator.translateToLocal("for.researchNote.discovery.1").replace("%SPEC1", species1).replace("%SPEC2", species2));
@@ -119,7 +119,7 @@ public class ItemResearchNote extends ItemForestry {
}
tooltips.add("researchNote.discovered.0");
tooltips.add(Translator.translateToLocalFormatted("for.researchNote.discovered.1", allele0.getName(), allele0.getBinomial()));
tooltips.add(Translator.translateToLocalFormatted("for.researchNote.discovered.1", allele0.getAlleleName(), allele0.getBinomial()));
}
return tooltips;
@@ -159,9 +159,9 @@ public class ItemResearchNote extends ItemForestry {
player.sendMessage(new TextComponentTranslation("for.chat.memorizednote"));
player.sendMessage(new TextComponentTranslation("for.chat.memorizednote2",
TextFormatting.GRAY + species0.getName(),
TextFormatting.GRAY + species1.getName(),
TextFormatting.GREEN + speciesResult.getName()));
TextFormatting.GRAY + species0.getAlleleName(),
TextFormatting.GRAY + species1.getAlleleName(),
TextFormatting.GREEN + speciesResult.getAlleleName()));
return true;
}
@@ -40,6 +40,11 @@ public abstract class Allele implements IAllele {
return Translator.translateToLocal(getUnlocalizedName());
}
@Override
public String getAlleleName() {
return Translator.translateToLocal(getUnlocalizedName());
}
@Override
public String getUnlocalizedName() {
return unlocalizedName;
@@ -94,7 +94,7 @@ public class GuiAlyzer extends GuiForestry<ContainerAlyzer> {
public final void drawChromosomeRow(String chromosomeName, IIndividual individual, IChromosomeType chromosome) {
IAllele active = individual.getGenome().getActiveAllele(chromosome);
IAllele inactive = individual.getGenome().getInactiveAllele(chromosome);
textLayout.drawRow(chromosomeName, active.getName(), inactive.getName(),
textLayout.drawRow(chromosomeName, active.getAlleleName(), inactive.getAlleleName(),
ColourProperties.INSTANCE.get("gui.screen"), getColorCoding(active.isDominant()),
getColorCoding(inactive.isDominant()));
}
@@ -111,8 +111,8 @@ public class GuiAlyzer extends GuiForestry<ContainerAlyzer> {
GuiUtil.drawItemStack(this, iconStacks.get(primary.getUID()), guiLeft + textLayout.column1 + columnwidth - 20, guiTop + 10);
GuiUtil.drawItemStack(this, iconStacks.get(secondary.getUID()), guiLeft + textLayout.column2 + columnwidth - 20, guiTop + 10);
String primaryName = customPrimaryName == null ? primary.getName() : customPrimaryName;
String secondaryName = customSecondaryName == null ? secondary.getName() : customSecondaryName;
String primaryName = customPrimaryName == null ? primary.getAlleleName() : customPrimaryName;
String secondaryName = customSecondaryName == null ? secondary.getAlleleName() : customSecondaryName;
drawSplitLine(primaryName, textLayout.column1, columnwidth, individual, chromosome, false);
drawSplitLine(secondaryName, textLayout.column2, columnwidth, individual, chromosome, true);
@@ -400,7 +400,7 @@ public class GuiAlyzer extends GuiForestry<ContainerAlyzer> {
public void drawToleranceInfo(IAlleleTolerance toleranceAllele, int x) {
int textColor = getColorCoding(toleranceAllele.isDominant());
EnumTolerance tolerance = toleranceAllele.getValue();
String text = "(" + toleranceAllele.getName() + ")";
String text = "(" + toleranceAllele.getAlleleName() + ")";
// Enable correct lighting.
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
@@ -159,7 +159,7 @@ public class GuiNaturalistInventory extends GuiForestry<Container> {
return;
}
textLayout.drawLine(species.getName(), x);
textLayout.drawLine(species.getAlleleName(), x);
GuiUtil.drawItemStack(this, iconStack, guiLeft + x + 69, guiTop + textLayout.getLineY() - 2);
textLayout.newLine();
@@ -364,7 +364,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
if (species == null) {
return super.getName();
}
return species.getName();
return species.getAlleleName();
}
@Override
@@ -88,21 +88,21 @@ public class Butterfly extends IndividualLiving implements IButterfly {
IAlleleButterflySpecies primary = genome.getPrimary();
IAlleleButterflySpecies secondary = genome.getSecondary();
if (!isPureBred(EnumButterflyChromosome.SPECIES)) {
list.add(TextFormatting.BLUE + Translator.translateToLocal("for.butterflies.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName()));
list.add(TextFormatting.BLUE + Translator.translateToLocal("for.butterflies.hybrid").replaceAll("%PRIMARY", primary.getAlleleName()).replaceAll("%SECONDARY", secondary.getAlleleName()));
}
if (getMate() != null) {
list.add(TextFormatting.RED + Translator.translateToLocal("for.gui.fecundated").toUpperCase(Locale.ENGLISH));
}
list.add(TextFormatting.YELLOW + genome.getActiveAllele(EnumButterflyChromosome.SIZE).getName());
list.add(TextFormatting.DARK_GREEN + genome.getActiveAllele(EnumButterflyChromosome.SPEED).getName());
list.add(genome.getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName() + ' ' + Translator.translateToLocal("for.gui.life"));
list.add(TextFormatting.YELLOW + genome.getActiveAllele(EnumButterflyChromosome.SIZE).getAlleleName());
list.add(TextFormatting.DARK_GREEN + genome.getActiveAllele(EnumButterflyChromosome.SPEED).getAlleleName());
list.add(genome.getActiveAllele(EnumButterflyChromosome.LIFESPAN).getAlleleName() + ' ' + Translator.translateToLocal("for.gui.life"));
IAlleleTolerance tempTolerance = (IAlleleTolerance) getGenome().getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE);
list.add(TextFormatting.GREEN + "T: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + tempTolerance.getName());
list.add(TextFormatting.GREEN + "T: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + tempTolerance.getAlleleName());
IAlleleTolerance humidTolerance = (IAlleleTolerance) getGenome().getActiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE);
list.add(TextFormatting.GREEN + "H: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + humidTolerance.getName());
list.add(TextFormatting.GREEN + "H: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + humidTolerance.getAlleleName());
list.add(TextFormatting.RED + GenericRatings.rateActivityTime(genome.getNocturnal(), genome.getPrimary().isNocturnal()));
@@ -75,17 +75,17 @@ public class FlutterlyzerPlugin implements IAlyzerPlugin {
guiAlyzer.drawSpeciesRow(Translator.translateToLocal("for.gui.species"), butterfly, EnumButterflyChromosome.SPECIES, null, null);
textLayout.newLine();
guiAlyzer.drawRow(Translator.translateToLocal("for.gui.size"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SIZE).getName(),
butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.SIZE).getName(), butterfly, EnumButterflyChromosome.SPEED);
guiAlyzer.drawRow(Translator.translateToLocal("for.gui.size"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SIZE).getAlleleName(),
butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.SIZE).getAlleleName(), butterfly, EnumButterflyChromosome.SPEED);
textLayout.newLine();
guiAlyzer.drawRow(Translator.translateToLocal("for.gui.lifespan"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName(),
butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.LIFESPAN).getName(), butterfly,
guiAlyzer.drawRow(Translator.translateToLocal("for.gui.lifespan"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.LIFESPAN).getAlleleName(),
butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.LIFESPAN).getAlleleName(), butterfly,
EnumButterflyChromosome.LIFESPAN);
textLayout.newLine();
guiAlyzer.drawRow(Translator.translateToLocal("for.gui.speed"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SPEED).getName(),
butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.SPEED).getName(), butterfly, EnumButterflyChromosome.SPEED);
guiAlyzer.drawRow(Translator.translateToLocal("for.gui.speed"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SPEED).getAlleleName(),
butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.SPEED).getAlleleName(), butterfly, EnumButterflyChromosome.SPEED);
textLayout.newLine();
guiAlyzer.drawRow(Translator.translateToLocal("for.gui.metabolism"), GenericRatings.rateMetabolism(butterfly.getGenome().getMetabolism()),
@@ -105,8 +105,8 @@ public class FlutterlyzerPlugin implements IAlyzerPlugin {
.getDescription(), butterfly, EnumButterflyChromosome.FLOWER_PROVIDER);
textLayout.newLine();
guiAlyzer.drawRow(Translator.translateToLocal("for.gui.effect"), butterfly.getGenome().getEffect().getName(),
butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.EFFECT).getName(), butterfly,
guiAlyzer.drawRow(Translator.translateToLocal("for.gui.effect"), butterfly.getGenome().getEffect().getAlleleName(),
butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.EFFECT).getAlleleName(), butterfly,
EnumButterflyChromosome.EFFECT);
textLayout.newLine();