From 1d8f2dae6694d2b443fc70399e9628a086a2e12c Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 30 Apr 2016 02:32:44 -0700 Subject: [PATCH] Use Translator.java for all translation --- src/main/java/forestry/Forestry.java | 27 -------- .../java/forestry/api/circuits/ICircuit.java | 2 +- .../java/forestry/api/core/IErrorState.java | 4 +- .../java/forestry/api/core/IModelManager.java | 6 +- .../forestry/apiculture/PluginApiculture.java | 6 +- .../commands/BeeStatsSaveHelper.java | 10 +-- .../apiculture/flowers/FlowerProvider.java | 10 +-- .../forestry/apiculture/genetics/Bee.java | 20 +++--- .../forestry/apiculture/gui/GuiBeealyzer.java | 63 ++++++++++--------- .../apiculture/gui/GuiHabitatLocator.java | 4 +- .../forestry/apiculture/gui/GuiImprinter.java | 8 +-- .../apiculture/items/ItemArmorApiarist.java | 2 +- .../forestry/apiculture/items/ItemBeeGE.java | 16 ++--- .../apiculture/items/ItemHabitatLocator.java | 8 +-- .../multiblock/AlvearyController.java | 12 ++-- .../arboriculture/FruitProviderNone.java | 9 +-- .../arboriculture/FruitProviderPod.java | 4 +- .../arboriculture/FruitProviderRandom.java | 4 +- .../arboriculture/FruitProviderRipening.java | 4 +- .../forestry/arboriculture/WoodHelper.java | 14 ++--- .../genetics/GrowthProvider.java | 4 +- .../genetics/GrowthProviderTropical.java | 4 +- .../forestry/arboriculture/genetics/Tree.java | 11 ++-- .../genetics/alleles/AlleleFruit.java | 20 +++--- .../arboriculture/gui/GuiTreealyzer.java | 58 ++++++++--------- .../arboriculture/items/ItemGermlingGE.java | 12 ++-- src/main/java/forestry/core/PluginFluids.java | 6 +- .../java/forestry/core/access/EnumAccess.java | 12 ++-- .../forestry/core/blocks/BlockRegistry.java | 3 +- .../core/blocks/MachineProperties.java | 5 +- .../java/forestry/core/circuits/Circuit.java | 12 ++-- .../forestry/core/circuits/CircuitBoard.java | 4 +- .../forestry/core/circuits/CircuitLayout.java | 6 +- .../core/circuits/GuiSolderingIron.java | 8 +-- .../core/commands/CommandHelpers.java | 6 +- .../core/commands/CommandPlugins.java | 7 +-- .../core/commands/CommandSaveStats.java | 28 ++++----- .../java/forestry/core/config/Config.java | 12 ++-- .../core/config/LocalizedConfiguration.java | 36 +++++------ .../core/entities/EntityMinecartForestry.java | 4 +- .../forestry/core/errors/EnumErrorCode.java | 8 +-- .../core/fluids/tanks/FilteredTank.java | 3 +- .../core/genetics/Classification.java | 6 +- .../core/genetics/GenericRatings.java | 21 +++---- .../java/forestry/core/genetics/ItemGE.java | 6 +- .../core/genetics/ItemResearchNote.java | 22 +++---- .../core/genetics/alleles/Allele.java | 5 +- .../genetics/alleles/AlleleCategorized.java | 4 +- .../core/genetics/alleles/AlleleSpecies.java | 4 +- .../core/genetics/alleles/EnumAllele.java | 2 +- .../mutations/MutationConditionBiome.java | 6 +- .../mutations/MutationConditionDaytime.java | 6 +- .../mutations/MutationConditionHumidity.java | 6 +- .../MutationConditionRequiresResource.java | 4 +- ...ationConditionRequiresResourceOreDict.java | 4 +- .../MutationConditionTemperature.java | 6 +- .../MutationConditionTimeLimited.java | 4 +- .../java/forestry/core/gui/GuiAlyzer.java | 36 +++++------ .../java/forestry/core/gui/GuiEscritoire.java | 4 +- .../forestry/core/gui/GuiForestryTitled.java | 4 +- .../core/gui/GuiNaturalistInventory.java | 14 ++--- .../core/gui/ledgers/ClimateLedger.java | 7 ++- .../core/gui/ledgers/ErrorLedger.java | 7 ++- .../forestry/core/gui/ledgers/HintLedger.java | 8 +-- .../core/gui/ledgers/OwnerLedger.java | 10 +-- .../core/gui/ledgers/PowerLedger.java | 10 +-- .../core/gui/widgets/ProbeButton.java | 4 +- .../core/gui/widgets/SocketWidget.java | 6 +- .../core/items/ItemArmorNaturalist.java | 2 +- .../java/forestry/core/items/ItemCrated.java | 14 +++-- .../forestry/core/items/ItemElectronTube.java | 6 +- .../forestry/core/items/ItemForestry.java | 2 +- .../forestry/core/items/ItemForestryFood.java | 2 +- .../java/forestry/core/items/ItemOverlay.java | 2 +- .../forestry/core/items/ItemRegistry.java | 3 +- .../java/forestry/core/models/ModelCrate.java | 16 ++--- .../forestry/core/models/ModelManager.java | 25 ++------ .../core/proxy/ProxyRenderClient.java | 6 +- .../recipes/jei/ForestryTooltipCallback.java | 8 ++- .../forestry/core/recipes/jei/JEIUtils.java | 5 -- .../core/tiles/EscritoireGameToken.java | 4 +- .../java/forestry/core/triggers/Trigger.java | 10 +-- .../java/forestry/core/utils/ClimateUtil.java | 4 +- .../java/forestry/core/utils/PlayerUtil.java | 2 +- .../java/forestry/core/utils/StringUtil.java | 55 ---------------- .../java/forestry/energy/gui/GuiEngine.java | 10 +-- .../energy/gui/widgets/BiogasSlot.java | 4 +- .../factory/triggers/TriggerLowFuel.java | 4 +- .../java/forestry/farming/gui/FarmLedger.java | 13 ++-- .../farming/multiblock/FarmController.java | 8 +-- .../java/forestry/food/BeverageEffect.java | 11 ++-- .../forestry/food/BeverageEffectAntidote.java | 3 +- .../forestry/food/BeverageEffectDrunk.java | 3 +- .../blocks/BlockGreenhouseDoor.java | 4 +- .../gui/widgets/WidgetCamouflageSlot.java | 25 ++++---- .../PluginLepidopterology.java | 12 ++-- .../lepidopterology/genetics/Butterfly.java | 10 +-- .../lepidopterology/gui/GuiFlutterlyzer.java | 51 +++++++-------- src/main/java/forestry/mail/Letter.java | 6 +- .../java/forestry/mail/PostalCarrier.java | 4 +- src/main/java/forestry/mail/TradeStation.java | 8 +-- .../java/forestry/mail/gui/GuiCatalogue.java | 18 +++--- .../java/forestry/mail/gui/GuiLetter.java | 14 ++--- .../java/forestry/mail/gui/GuiTradeName.java | 4 +- .../java/forestry/mail/gui/GuiTrader.java | 9 ++- .../mail/gui/widgets/AddresseeSlot.java | 4 +- .../java/forestry/mail/items/ItemLetter.java | 4 +- .../java/forestry/plugins/PluginManager.java | 4 +- .../forestry/storage/BackpackDefinition.java | 4 +- .../java/forestry/storage/CrateRegistry.java | 3 +- .../java/forestry/storage/PluginStorage.java | 6 +- .../forestry/storage/items/ItemBackpack.java | 11 ++-- 112 files changed, 521 insertions(+), 620 deletions(-) diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 995813ac3..425f4bd29 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -12,9 +12,6 @@ package forestry; import java.io.File; -import net.minecraft.block.Block; -import net.minecraft.item.Item; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.Mod; @@ -22,14 +19,11 @@ import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.event.FMLInterModComms.IMCEvent; -import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; -import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.MissingMapping; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry.Type; import forestry.api.core.ForestryAPI; import forestry.core.EventHandlerCore; @@ -42,8 +36,6 @@ import forestry.core.gui.GuiHandler; import forestry.core.multiblock.MultiblockEventHandler; import forestry.core.network.PacketHandler; import forestry.core.proxy.Proxies; -import forestry.core.utils.Log; -import forestry.core.utils.StringUtil; import forestry.core.worldgen.WorldGenerator; import forestry.plugins.PluginManager; @@ -138,23 +130,4 @@ public class Forestry { public void processIMCMessages(IMCEvent event) { PluginManager.processIMCMessages(event.getMessages()); } - - @EventHandler - public void missingMapping(FMLMissingMappingsEvent event) { - for (MissingMapping mapping : event.get()) { - if (mapping.type == Type.BLOCK) { - Block block = GameRegistry.findBlock(Constants.MOD_ID, StringUtil.cleanTags(mapping.name)); - if (block != null) { - mapping.remap(block); - Log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block)); - } - } else { - Item item = GameRegistry.findItem(Constants.MOD_ID, StringUtil.cleanTags(mapping.name)); - if (item != null) { - mapping.remap(item); - Log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanItemName(item)); - } - } - } - } } diff --git a/src/main/java/forestry/api/circuits/ICircuit.java b/src/main/java/forestry/api/circuits/ICircuit.java index aecfbbc87..bdc71d430 100644 --- a/src/main/java/forestry/api/circuits/ICircuit.java +++ b/src/main/java/forestry/api/circuits/ICircuit.java @@ -14,7 +14,7 @@ public interface ICircuit { int getLimit(); - String getName(); + String getUnlocalizedName(); boolean isCircuitable(Object tile); diff --git a/src/main/java/forestry/api/core/IErrorState.java b/src/main/java/forestry/api/core/IErrorState.java index 9310c952e..c752583a1 100644 --- a/src/main/java/forestry/api/core/IErrorState.java +++ b/src/main/java/forestry/api/core/IErrorState.java @@ -20,9 +20,9 @@ public interface IErrorState { String getUniqueName(); - String getDescription(); + String getUnlocalizedDescription(); - String getHelp(); + String getUnlocalizedHelp(); @SideOnly(Side.CLIENT) void registerSprite(); diff --git a/src/main/java/forestry/api/core/IModelManager.java b/src/main/java/forestry/api/core/IModelManager.java index 5bad377b3..957cfa895 100644 --- a/src/main/java/forestry/api/core/IModelManager.java +++ b/src/main/java/forestry/api/core/IModelManager.java @@ -20,14 +20,10 @@ public interface IModelManager { void registerItemModel(Item item, int meta, String identifier); - void registerItemModel(Item item, int meta, boolean withMeta); + void registerItemModel(Item item, int meta); ModelResourceLocation getModelLocation(Item item); - ModelResourceLocation getModelLocation(Item item, int meta); - - ModelResourceLocation getModelLocation(Item item, int meta, String identifier); - ModelResourceLocation getModelLocation(String identifier); ModelResourceLocation getModelLocation(String modID, String identifier); diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 90d330abb..0a7d01834 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -122,7 +122,7 @@ import forestry.core.utils.IMCUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.Stack; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.food.PluginFood; import forestry.food.items.ItemRegistryFood; import forestry.plugins.BlankForestryPlugin; @@ -235,8 +235,8 @@ public class PluginApiculture extends BlankForestryPlugin { secondPrincessChance = config.getFloatLocalized("beekeeping", "second.princess", secondPrincessChance, 0.0f, 100.0f); - String acceptedFlowerMessage = StringUtil.localize("config.beekeeping.flowers.accepted.comment"); - String plantableFlowerMessage = StringUtil.localize("config.beekeeping.flowers.plantable.comment"); + String acceptedFlowerMessage = Translator.translateToLocal("for.config.beekeeping.flowers.accepted.comment"); + String plantableFlowerMessage = Translator.translateToLocal("for.config.beekeeping.flowers.plantable.comment"); FlowerRegistry flowerRegistry = (FlowerRegistry) FlowerManager.flowerRegistry; diff --git a/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java b/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java index 75a35e6d3..38ed146cf 100644 --- a/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java +++ b/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java @@ -13,7 +13,6 @@ package forestry.apiculture.commands; import java.util.ArrayList; import java.util.Collection; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -27,6 +26,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.core.commands.IStatsSaveHelper; import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class BeeStatsSaveHelper implements IStatsSaveHelper { @@ -38,13 +38,13 @@ public class BeeStatsSaveHelper implements IStatsSaveHelper { @Override public void addExtraInfo(Collection statistics, IBreedingTracker breedingTracker) { IApiaristTracker tracker = (IApiaristTracker) breedingTracker; - String discoveredLine = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.discovered") + ":"; + String discoveredLine = Translator.translateToLocal("for.chat.command.forestry.stats.save.key.discovered") + ":"; statistics.add(discoveredLine); statistics.add(StringUtil.line(discoveredLine.length())); - String queen = StatCollector.translateToLocal("for.bees.grammar.queen.type"); - String princess = StatCollector.translateToLocal("for.bees.grammar.princess.type"); - String drone = StatCollector.translateToLocal("for.bees.grammar.drone.type"); + String queen = Translator.translateToLocal("for.bees.grammar.queen.type"); + String princess = Translator.translateToLocal("for.bees.grammar.princess.type"); + String drone = Translator.translateToLocal("for.bees.grammar.drone.type"); statistics.add(queen + ":\t\t" + tracker.getQueenCount()); statistics.add(princess + ":\t" + tracker.getPrincessCount()); statistics.add(drone + ":\t\t" + tracker.getDroneCount()); diff --git a/src/main/java/forestry/apiculture/flowers/FlowerProvider.java b/src/main/java/forestry/apiculture/flowers/FlowerProvider.java index 8e4865a1b..103eeee98 100644 --- a/src/main/java/forestry/apiculture/flowers/FlowerProvider.java +++ b/src/main/java/forestry/apiculture/flowers/FlowerProvider.java @@ -22,16 +22,16 @@ import forestry.api.apiculture.FlowerManager; import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class FlowerProvider implements IFlowerProvider { private final String flowerType; - private final String description; + private final String unlocalizedDescription; - public FlowerProvider(String flowerType, String description) { + public FlowerProvider(String flowerType, String unlocalizedDescription) { this.flowerType = flowerType; - this.description = description; + this.unlocalizedDescription = unlocalizedDescription; } @Override @@ -56,7 +56,7 @@ public class FlowerProvider implements IFlowerProvider { @Override public String getDescription() { - return StringUtil.localize(this.description); + return Translator.translateToLocal(this.unlocalizedDescription); } @Override diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 34e37278f..7abe69aad 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -67,7 +67,7 @@ import forestry.core.genetics.GenericRatings; import forestry.core.genetics.IndividualLiving; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.Log; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.core.utils.vect.Vect; public class Bee extends IndividualLiving implements IBee { @@ -369,7 +369,7 @@ public class Bee extends IndividualLiving implements IBee { // No info 4 u! if (!isAnalyzed) { - list.add("<" + StringUtil.localize("gui.unknown") + ">"); + list.add("<" + Translator.translateToLocal("for.gui.unknown") + ">"); return; } @@ -377,7 +377,7 @@ public class Bee extends IndividualLiving implements IBee { IAlleleBeeSpecies primary = genome.getPrimary(); IAlleleBeeSpecies secondary = genome.getSecondary(); if (!isPureBred(EnumBeeChromosome.SPECIES)) { - list.add(EnumChatFormatting.BLUE + StringUtil.localize("bees.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName())); + list.add(EnumChatFormatting.BLUE + Translator.translateToLocal("for.bees.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName())); } if (generation > 0) { @@ -392,7 +392,7 @@ public class Bee extends IndividualLiving implements IBee { rarity = EnumRarity.COMMON; } - String generationString = rarity.rarityColor + StringUtil.localizeAndFormat("gui.beealyzer.generations", generation); + String generationString = rarity.rarityColor + Translator.translateToLocalFormatted("for.gui.beealyzer.generations", generation); list.add(generationString); } @@ -400,15 +400,15 @@ public class Bee extends IndividualLiving implements IBee { IAlleleTolerance tempToleranceAllele = (IAlleleTolerance) getGenome().getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE); IAlleleTolerance humidToleranceAllele = (IAlleleTolerance) getGenome().getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE); - String unlocalizedCustomSpeed = "tooltip.worker." + speedAllele.getUnlocalizedName().replaceAll("(.*)\\.", ""); + String unlocalizedCustomSpeed = "for.tooltip.worker." + speedAllele.getUnlocalizedName().replaceAll("(.*)\\.", ""); String speed; - if (StringUtil.canTranslate(unlocalizedCustomSpeed)) { - speed = StringUtil.localize(unlocalizedCustomSpeed); + if (Translator.canTranslateToLocal(unlocalizedCustomSpeed)) { + speed = Translator.translateToLocal(unlocalizedCustomSpeed); } else { - speed = speedAllele.getName() + ' ' + StringUtil.localize("gui.worker"); + speed = speedAllele.getName() + ' ' + Translator.translateToLocal("for.gui.worker"); } - String lifespan = genome.getActiveAllele(EnumBeeChromosome.LIFESPAN).getName() + ' ' + StringUtil.localize("gui.life"); + String lifespan = genome.getActiveAllele(EnumBeeChromosome.LIFESPAN).getName() + ' ' + Translator.translateToLocal("for.gui.life"); String tempTolerance = EnumChatFormatting.GREEN + "T: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + tempToleranceAllele.getName(); String humidTolerance = EnumChatFormatting.GREEN + "H: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + humidToleranceAllele.getName(); String flowers = genome.getFlowerProvider().getDescription(); @@ -424,7 +424,7 @@ public class Bee extends IndividualLiving implements IBee { } if (genome.getToleratesRain()) { - list.add(EnumChatFormatting.WHITE + StringUtil.localize("gui.flyer.tooltip")); + list.add(EnumChatFormatting.WHITE + Translator.translateToLocal("for.gui.flyer.tooltip")); } } diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index 32251d5c0..bc3234706 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -32,11 +32,12 @@ import forestry.core.gui.GuiAlyzer; import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class GuiBeealyzer extends GuiAlyzer { public GuiBeealyzer(EntityPlayer player, ItemInventoryBeealyzer inventory) { - super(BeeManager.beeRoot, player, new ContainerAlyzer(inventory, player), inventory, "gui.beealyzer"); + super(BeeManager.beeRoot, player, new ContainerAlyzer(inventory, player), inventory, "for.gui.beealyzer"); ArrayList beeList = new ArrayList<>(); PluginApiculture.items.beeDroneGE.addCreativeItems(beeList, false); @@ -100,40 +101,40 @@ public class GuiBeealyzer extends GuiAlyzer { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - textLayout.drawLine(StringUtil.localize("gui.active"), COLUMN_1); - textLayout.drawLine(StringUtil.localize("gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); textLayout.newLine(); textLayout.newLine(); { - String customPrimaryBeeKey = "bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getPrimary().getUnlocalizedName().replace("bees.species.", ""); - String customSecondaryBeeKey = "bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getSecondary().getUnlocalizedName().replace("bees.species.", ""); + String customPrimaryBeeKey = "for.bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getPrimary().getUnlocalizedName().replace("bees.species.", ""); + String customSecondaryBeeKey = "for.bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getSecondary().getUnlocalizedName().replace("bees.species.", ""); - drawSpeciesRow(StringUtil.localize("gui.species"), bee, EnumBeeChromosome.SPECIES, checkCustomName(customPrimaryBeeKey), checkCustomName(customSecondaryBeeKey)); + drawSpeciesRow(Translator.translateToLocal("for.gui.species"), bee, EnumBeeChromosome.SPECIES, checkCustomName(customPrimaryBeeKey), checkCustomName(customSecondaryBeeKey)); textLayout.newLine(); } - drawChromosomeRow(StringUtil.localize("gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN); + drawChromosomeRow(Translator.translateToLocal("for.gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN); textLayout.newLine(); - drawChromosomeRow(StringUtil.localize("gui.speed"), bee, EnumBeeChromosome.SPEED); + drawChromosomeRow(Translator.translateToLocal("for.gui.speed"), bee, EnumBeeChromosome.SPEED); textLayout.newLine(); - drawChromosomeRow(StringUtil.localize("gui.pollination"), bee, EnumBeeChromosome.FLOWERING); + drawChromosomeRow(Translator.translateToLocal("for.gui.pollination"), bee, EnumBeeChromosome.FLOWERING); textLayout.newLine(); - drawChromosomeRow(StringUtil.localize("gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER); + drawChromosomeRow(Translator.translateToLocal("for.gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.fertility"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.fertility"), COLUMN_0); IAlleleInteger primaryFertility = (IAlleleInteger) bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY); IAlleleInteger secondaryFertility = (IAlleleInteger) bee.getGenome().getInactiveAllele(EnumBeeChromosome.FERTILITY); drawFertilityInfo(primaryFertility.getValue(), COLUMN_1, getColorCoding(primaryFertility.isDominant()), 0); drawFertilityInfo(secondaryFertility.getValue(), COLUMN_2, getColorCoding(secondaryFertility.isDominant()), 0); textLayout.newLine(); - drawChromosomeRow(StringUtil.localize("gui.area"), bee, EnumBeeChromosome.TERRITORY); + drawChromosomeRow(Translator.translateToLocal("for.gui.area"), bee, EnumBeeChromosome.TERRITORY); textLayout.newLine(); - drawChromosomeRow(StringUtil.localize("gui.effect"), bee, EnumBeeChromosome.EFFECT); + drawChromosomeRow(Translator.translateToLocal("for.gui.effect"), bee, EnumBeeChromosome.EFFECT); textLayout.newLine(); textLayout.endPage(); @@ -143,39 +144,39 @@ public class GuiBeealyzer extends GuiAlyzer { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - textLayout.drawLine(StringUtil.localize("gui.active"), COLUMN_1); - textLayout.drawLine(StringUtil.localize("gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); textLayout.newLine(); - drawRow(StringUtil.localize("gui.climate"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getTemperature()), + drawRow(Translator.translateToLocal("for.gui.climate"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getTemperature()), AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getTemperature()), bee, EnumBeeChromosome.SPECIES); textLayout.newLine(); IAlleleTolerance tempToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE); IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE); - textLayout.drawLine(" " + StringUtil.localize("gui.tolerance"), COLUMN_0); + textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), COLUMN_0); drawToleranceInfo(tempToleranceActive, COLUMN_1); drawToleranceInfo(tempToleranceInactive, COLUMN_2); textLayout.newLine(16); - drawRow(StringUtil.localize("gui.humidity"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getHumidity()), + drawRow(Translator.translateToLocal("for.gui.humidity"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getHumidity()), AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getHumidity()), bee, EnumBeeChromosome.SPECIES); textLayout.newLine(); IAlleleTolerance humidToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE); IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE); - textLayout.drawLine(" " + StringUtil.localize("gui.tolerance"), COLUMN_0); + textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), COLUMN_0); drawToleranceInfo(humidToleranceActive, COLUMN_1); drawToleranceInfo(humidToleranceInactive, COLUMN_2); textLayout.newLine(16); - String yes = StringUtil.localize("yes"); - String no = StringUtil.localize("no"); + String yes = Translator.translateToLocal("for.yes"); + String no = Translator.translateToLocal("for.no"); String diurnal0, diurnal1, nocturnal0, nocturnal1; if (bee.getGenome().getNeverSleeps()) { @@ -191,12 +192,12 @@ public class GuiBeealyzer extends GuiAlyzer { diurnal1 = !bee.getGenome().getSecondary().isNocturnal() ? yes : no; } - textLayout.drawLine(StringUtil.localize("gui.diurnal"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.diurnal"), COLUMN_0); textLayout.drawLine(diurnal0, COLUMN_1, getColorCoding(false)); textLayout.drawLine(diurnal1, COLUMN_2, getColorCoding(false)); textLayout.newLineCompressed(); - textLayout.drawLine(StringUtil.localize("gui.nocturnal"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.nocturnal"), COLUMN_0); textLayout.drawLine(nocturnal0, COLUMN_1, getColorCoding(false)); textLayout.drawLine(nocturnal1, COLUMN_2, getColorCoding(false)); textLayout.newLineCompressed(); @@ -204,30 +205,30 @@ public class GuiBeealyzer extends GuiAlyzer { String primary = StringUtil.readableBoolean(bee.getGenome().getToleratesRain(), yes, no); String secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERATES_RAIN)).getValue(), yes, no); - drawRow(StringUtil.localize("gui.flyer"), primary, secondary, bee, EnumBeeChromosome.TOLERATES_RAIN); + drawRow(Translator.translateToLocal("for.gui.flyer"), primary, secondary, bee, EnumBeeChromosome.TOLERATES_RAIN); textLayout.newLineCompressed(); primary = StringUtil.readableBoolean(bee.getGenome().getCaveDwelling(), yes, no); secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.CAVE_DWELLING)).getValue(), yes, no); - drawRow(StringUtil.localize("gui.cave"), primary, secondary, bee, EnumBeeChromosome.CAVE_DWELLING); + drawRow(Translator.translateToLocal("for.gui.cave"), primary, secondary, bee, EnumBeeChromosome.CAVE_DWELLING); textLayout.newLine(); String displayText; if (type == EnumBeeType.PRINCESS || type == EnumBeeType.QUEEN) { - displayText = "bees.stock.pristine"; + String displayTextKey = "for.bees.stock.pristine"; if (!bee.isNatural()) { - displayText = "bees.stock.ignoble"; + displayTextKey = "for.bees.stock.ignoble"; } - displayText = StringUtil.localize(displayText); + displayText = Translator.translateToLocal(displayTextKey); textLayout.drawCenteredLine(displayText, 8, 208, fontColor.get("gui.beealyzer.binomial")); } if (bee.getGeneration() >= 0) { textLayout.newLineCompressed(); - displayText = StringUtil.localizeAndFormat("gui.beealyzer.generations", bee.getGeneration()); + displayText = Translator.translateToLocalFormatted("for.gui.beealyzer.generations", bee.getGeneration()); textLayout.drawCenteredLine(displayText, 8, 208, fontColor.get("gui.beealyzer.binomial")); } @@ -238,7 +239,7 @@ public class GuiBeealyzer extends GuiAlyzer { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - textLayout.drawLine(StringUtil.localize("gui.beealyzer.produce") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.produce") + ":", COLUMN_0); textLayout.newLine(); @@ -258,7 +259,7 @@ public class GuiBeealyzer extends GuiAlyzer { textLayout.newLine(); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.beealyzer.specialty") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.specialty") + ":", COLUMN_0); textLayout.newLine(); x = COLUMN_0; diff --git a/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java index 784a4cb53..03058ff00 100755 --- a/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java +++ b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java @@ -22,7 +22,6 @@ import java.util.Set; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.StatCollector; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; @@ -31,6 +30,7 @@ import forestry.apiculture.gui.widgets.HabitatSlot; import forestry.apiculture.inventory.ItemInventoryHabitatLocator; import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; +import forestry.core.utils.Translator; public class GuiHabitatLocator extends GuiForestry { private static final LinkedListMultimap habitats = LinkedListMultimap.create(); @@ -84,7 +84,7 @@ public class GuiHabitatLocator extends GuiForestry { @@ -57,8 +57,8 @@ public class GuiImprinter extends GuiForestry drops; - public FruitProviderPod(String key, IFruitFamily family, EnumPodType type, ItemStack... dropOnMature) { - super(key, family); + public FruitProviderPod(String unlocalizedDescription, IFruitFamily family, EnumPodType type, ItemStack... dropOnMature) { + super(unlocalizedDescription, family); this.type = type; this.drops = new HashMap<>(); for (ItemStack drop : dropOnMature) { diff --git a/src/main/java/forestry/arboriculture/FruitProviderRandom.java b/src/main/java/forestry/arboriculture/FruitProviderRandom.java index 50f98ad70..18ddaf0c4 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRandom.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRandom.java @@ -36,8 +36,8 @@ public class FruitProviderRandom extends FruitProviderNone { private final Map products = new HashMap<>(); private int colour = 0xffffff; - public FruitProviderRandom(String key, IFruitFamily family, ItemStack product, float modifier) { - super(key, family); + public FruitProviderRandom(String unlocalizedDescription, IFruitFamily family, ItemStack product, float modifier) { + super(unlocalizedDescription, family); products.put(product, modifier); } diff --git a/src/main/java/forestry/arboriculture/FruitProviderRipening.java b/src/main/java/forestry/arboriculture/FruitProviderRipening.java index 246d807d1..4cbff63f8 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRipening.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRipening.java @@ -38,8 +38,8 @@ public class FruitProviderRipening extends FruitProviderNone { private int diffG; private int diffB; - public FruitProviderRipening(String key, IFruitFamily family, ItemStack product, float modifier) { - super(key, family); + public FruitProviderRipening(String unlocalizedDescription, IFruitFamily family, ItemStack product, float modifier) { + super(unlocalizedDescription, family); products.put(product, modifier); } diff --git a/src/main/java/forestry/arboriculture/WoodHelper.java b/src/main/java/forestry/arboriculture/WoodHelper.java index 333894d36..563b711d6 100644 --- a/src/main/java/forestry/arboriculture/WoodHelper.java +++ b/src/main/java/forestry/arboriculture/WoodHelper.java @@ -15,7 +15,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumWoodType; import forestry.core.models.ModelManager; import forestry.core.render.ForestryResource; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class WoodHelper { @Nonnull @@ -23,18 +23,18 @@ public class WoodHelper { String blockKind = wood.getBlockKind(); String displayName; - String customUnlocalizedName = blockKind + "." + woodType.ordinal() + ".name"; - if (StringUtil.canTranslateTile(customUnlocalizedName)) { - displayName = StringUtil.localizeTile(customUnlocalizedName); + String customUnlocalizedName = "tile.for." + blockKind + "." + woodType.ordinal() + ".name"; + if (Translator.canTranslateToLocal(customUnlocalizedName)) { + displayName = Translator.translateToLocal(customUnlocalizedName); } else { - String woodGrammar = StringUtil.localize(blockKind + ".grammar"); - String woodTypeName = StringUtil.localize("trees.woodType." + woodType); + String woodGrammar = Translator.translateToLocal("for." + blockKind + ".grammar"); + String woodTypeName = Translator.translateToLocal("for.trees.woodType." + woodType); displayName = woodGrammar.replaceAll("%TYPE", woodTypeName); } if (wood.isFireproof()) { - displayName = StringUtil.localizeAndFormatRaw("tile.for.fireproof", displayName); + displayName = Translator.translateToLocalFormatted("tile.for.fireproof", displayName); } return displayName; diff --git a/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java index cd9716811..cb69ebd34 100755 --- a/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java +++ b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java @@ -22,7 +22,7 @@ import forestry.api.arboriculture.ITreeGenome; import forestry.api.core.ForestryAPI; import forestry.arboriculture.tiles.TileSapling; import forestry.core.utils.BlockUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.core.utils.vect.Vect; public class GrowthProvider implements IGrowthProvider { @@ -47,7 +47,7 @@ public class GrowthProvider implements IGrowthProvider { @Override public String getDescription() { - return StringUtil.localize("growth.normal"); + return Translator.translateToLocal("for.growth.normal"); } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java index 3c5cb5cba..e7656239a 100755 --- a/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java +++ b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java @@ -18,7 +18,7 @@ import net.minecraft.world.biome.BiomeGenBase; import forestry.api.arboriculture.EnumGrowthConditions; import forestry.api.arboriculture.ITreeGenome; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class GrowthProviderTropical extends GrowthProvider { @@ -49,7 +49,7 @@ public class GrowthProviderTropical extends GrowthProvider { @Override public String getDescription() { - return StringUtil.localize("growth.tropical"); + return Translator.translateToLocal("for.growth.tropical"); } } diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index 22141f92b..028686cb4 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -25,7 +25,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -57,7 +56,7 @@ import forestry.core.config.Config; import forestry.core.genetics.Chromosome; import forestry.core.genetics.Individual; import forestry.core.utils.BlockUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class Tree extends Individual implements ITree, IPlantable { @@ -281,7 +280,7 @@ public class Tree extends Individual implements ITree, IPlantable { // No info 4 u! if (!isAnalyzed) { - list.add("<" + StringUtil.localize("gui.unknown") + ">"); + list.add("<" + Translator.translateToLocal("for.gui.unknown") + ">"); return; } @@ -289,7 +288,7 @@ public class Tree extends Individual implements ITree, IPlantable { IAlleleTreeSpecies primary = genome.getPrimary(); IAlleleTreeSpecies secondary = genome.getSecondary(); if (!isPureBred(EnumTreeChromosome.SPECIES)) { - list.add(EnumChatFormatting.BLUE + StringUtil.localize("trees.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName())); + list.add(EnumChatFormatting.BLUE + Translator.translateToLocal("for.trees.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName())); } String sappiness = EnumChatFormatting.GOLD + "S: " + genome.getActiveAllele(EnumTreeChromosome.SAPPINESS).getName(); @@ -304,7 +303,7 @@ public class Tree extends Individual implements ITree, IPlantable { IAlleleBoolean primaryFireproof = (IAlleleBoolean) genome.getActiveAllele(EnumTreeChromosome.FIREPROOF); if (primaryFireproof.getValue()) { - list.add(EnumChatFormatting.RED + StatCollector.translateToLocal("for.gui.fireresist")); + list.add(EnumChatFormatting.RED + Translator.translateToLocal("for.gui.fireresist")); } IAllele fruit = getGenome().getActiveAllele(EnumTreeChromosome.FRUITS); @@ -313,7 +312,7 @@ public class Tree extends Individual implements ITree, IPlantable { if (!canBearFruit()) { strike = EnumChatFormatting.STRIKETHROUGH.toString(); } - list.add(strike + EnumChatFormatting.GREEN + "F: " + StringUtil.localize(genome.getFruitProvider().getDescription())); + list.add(strike + EnumChatFormatting.GREEN + "F: " + genome.getFruitProvider().getDescription()); } } diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java index 2883e0b04..fd9cbf915 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java @@ -54,29 +54,29 @@ public class AlleleFruit extends AlleleCategorized implements IAlleleFruit { public static void createAlleles() { List fruitAlleles = Arrays.asList( - fruitNone = new AlleleFruit("none", new FruitProviderNone("none", null)), - fruitApple = new AlleleFruit("apple", new FruitProviderRandom("apple", EnumFruitFamily.POMES, new ItemStack(Items.apple), 1.0f) + fruitNone = new AlleleFruit("none", new FruitProviderNone("for.fruits.none", null)), + fruitApple = new AlleleFruit("apple", new FruitProviderRandom("for.fruits.apple", EnumFruitFamily.POMES, new ItemStack(Items.apple), 1.0f) .setColour(new Color(0xff2e2e)) .setOverlay("pomes")), - fruitCocoa = new AlleleFruit("cocoa", new FruitProviderPod("cocoa", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.COCOA, new ItemStack(Items.dye, 1, EnumDyeColor.BROWN.getDyeDamage()))), + fruitCocoa = new AlleleFruit("cocoa", new FruitProviderPod("for.fruits.cocoa", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.COCOA, new ItemStack(Items.dye, 1, EnumDyeColor.BROWN.getDyeDamage()))), // .setColours(0xecdca5, 0xc4d24a), true); - fruitChestnut = new AlleleFruit("chestnut", new FruitProviderRipening("chestnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.CHESTNUT.getStack(), 1.0f) + fruitChestnut = new AlleleFruit("chestnut", new FruitProviderRipening("for.fruits.chestnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.CHESTNUT.getStack(), 1.0f) .setRipeningPeriod(6) .setColours(new Color(0x7f333d), new Color(0xc4d24a)) .setOverlay("nuts"), true), - fruitWalnut = new AlleleFruit("walnut", new FruitProviderRipening("walnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.WALNUT.getStack(), 1.0f) + fruitWalnut = new AlleleFruit("walnut", new FruitProviderRipening("for.fruits.walnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.WALNUT.getStack(), 1.0f) .setRipeningPeriod(8) .setColours(new Color(0xfba248), new Color(0xc4d24a)) .setOverlay("nuts"), true), - fruitCherry = new AlleleFruit("cherry", new FruitProviderRipening("cherry", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.CHERRY.getStack(), 1.0f) + fruitCherry = new AlleleFruit("cherry", new FruitProviderRipening("for.fruits.cherry", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.CHERRY.getStack(), 1.0f) .setColours(new Color(0xff2e2e), new Color(0xc4d24a)) .setOverlay("berries"), true), - fruitDates = new AlleleFruit("dates", new FruitProviderPod("dates", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.DATES, ItemFruit.EnumFruit.DATES.getStack(4))), - fruitPapaya = new AlleleFruit("papaya", new FruitProviderPod("papaya", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.PAPAYA, ItemFruit.EnumFruit.PAPAYA.getStack())), - fruitLemon = new AlleleFruit("lemon", new FruitProviderRipening("lemon", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.LEMON.getStack(), 1.0f) + fruitDates = new AlleleFruit("dates", new FruitProviderPod("for.fruits.dates", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.DATES, ItemFruit.EnumFruit.DATES.getStack(4))), + fruitPapaya = new AlleleFruit("papaya", new FruitProviderPod("for.fruits.papaya", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.PAPAYA, ItemFruit.EnumFruit.PAPAYA.getStack())), + fruitLemon = new AlleleFruit("lemon", new FruitProviderRipening("for.fruits.lemon", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.LEMON.getStack(), 1.0f) .setColours(new Color(0xeeee00), new Color(0x99ff00)) .setOverlay("citrus"), true), - fruitPlum = new AlleleFruit("plum", new FruitProviderRipening("plum", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.PLUM.getStack(), 1.0f) + fruitPlum = new AlleleFruit("plum", new FruitProviderRipening("for.fruits.plum", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.PLUM.getStack(), 1.0f) .setColours(new Color(0x663446), new Color(0xeeff1a)) .setOverlay("plums"), true) ); diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index 403cc4dc1..393ff2f44 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -39,12 +39,12 @@ import forestry.core.genetics.alleles.AllelePlantType; import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; import forestry.core.inventory.ItemInventoryAlyzer; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class GuiTreealyzer extends GuiAlyzer { public GuiTreealyzer(EntityPlayer player, ItemInventoryTreealyzer inventory) { - super(TreeManager.treeRoot, player, new ContainerAlyzer(inventory, player), inventory, "gui.treealyzer"); + super(TreeManager.treeRoot, player, new ContainerAlyzer(inventory, player), inventory, "for.gui.treealyzer"); ArrayList treeList = new ArrayList<>(); PluginArboriculture.items.sapling.addCreativeItems(treeList, false); @@ -107,8 +107,8 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - textLayout.drawLine(StringUtil.localize("gui.active"), COLUMN_1); - textLayout.drawLine(StringUtil.localize("gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); textLayout.newLine(); textLayout.newLine(); @@ -117,31 +117,31 @@ public class GuiTreealyzer extends GuiAlyzer { String customPrimaryTreeKey = "trees.custom.treealyzer." + type.getName() + "." + tree.getGenome().getPrimary().getUnlocalizedName().replace("trees.species.", ""); String customSecondaryTreeKey = "trees.custom.treealyzer." + type.getName() + "." + tree.getGenome().getSecondary().getUnlocalizedName().replace("trees.species.", ""); - drawSpeciesRow(StringUtil.localize("gui.species"), tree, EnumTreeChromosome.SPECIES, checkCustomName(customPrimaryTreeKey), checkCustomName(customSecondaryTreeKey)); + drawSpeciesRow(Translator.translateToLocal("for.gui.species"), tree, EnumTreeChromosome.SPECIES, checkCustomName(customPrimaryTreeKey), checkCustomName(customSecondaryTreeKey)); textLayout.newLine(); } - drawChromosomeRow(StringUtil.localize("gui.saplings"), tree, EnumTreeChromosome.FERTILITY); + drawChromosomeRow(Translator.translateToLocal("for.gui.saplings"), tree, EnumTreeChromosome.FERTILITY); textLayout.newLineCompressed(); - drawChromosomeRow(StringUtil.localize("gui.maturity"), tree, EnumTreeChromosome.MATURATION); + drawChromosomeRow(Translator.translateToLocal("for.gui.maturity"), tree, EnumTreeChromosome.MATURATION); textLayout.newLineCompressed(); - drawChromosomeRow(StringUtil.localize("gui.height"), tree, EnumTreeChromosome.HEIGHT); + drawChromosomeRow(Translator.translateToLocal("for.gui.height"), tree, EnumTreeChromosome.HEIGHT); textLayout.newLineCompressed(); IAlleleInteger activeGirth = (IAlleleInteger) tree.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH); IAlleleInteger inactiveGirth = (IAlleleInteger) tree.getGenome().getInactiveAllele(EnumTreeChromosome.GIRTH); - textLayout.drawLine(StringUtil.localize("gui.girth"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.girth"), COLUMN_0); drawLine(String.format("%sx%s", activeGirth.getValue(), activeGirth.getValue()), COLUMN_1, tree, EnumTreeChromosome.GIRTH, false); drawLine(String.format("%sx%s", inactiveGirth.getValue(), inactiveGirth.getValue()), COLUMN_2, tree, EnumTreeChromosome.GIRTH, true); textLayout.newLineCompressed(); - drawChromosomeRow(StringUtil.localize("gui.yield"), tree, EnumTreeChromosome.YIELD); + drawChromosomeRow(Translator.translateToLocal("for.gui.yield"), tree, EnumTreeChromosome.YIELD); textLayout.newLineCompressed(); - drawChromosomeRow(StringUtil.localize("gui.sappiness"), tree, EnumTreeChromosome.SAPPINESS); + drawChromosomeRow(Translator.translateToLocal("for.gui.sappiness"), tree, EnumTreeChromosome.SAPPINESS); textLayout.newLineCompressed(); - drawChromosomeRow(StringUtil.localize("gui.effect"), tree, EnumTreeChromosome.EFFECT); + drawChromosomeRow(Translator.translateToLocal("for.gui.effect"), tree, EnumTreeChromosome.EFFECT); textLayout.endPage(); } @@ -153,28 +153,28 @@ public class GuiTreealyzer extends GuiAlyzer { int speciesDominance0 = getColorCoding(tree.getGenome().getPrimary().isDominant()); int speciesDominance1 = getColorCoding(tree.getGenome().getSecondary().isDominant()); - textLayout.drawLine(StringUtil.localize("gui.active"), COLUMN_1); - textLayout.drawLine(StringUtil.localize("gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); textLayout.newLine(); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.growth"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.growth"), COLUMN_0); drawLine(tree.getGenome().getGrowthProvider().getDescription(), COLUMN_1, tree, EnumTreeChromosome.GROWTH, false); drawLine(((IAlleleGrowth) tree.getGenome().getInactiveAllele(EnumTreeChromosome.GROWTH)).getProvider().getDescription(), COLUMN_2, tree, EnumTreeChromosome.GROWTH, true); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.native"), COLUMN_0); - textLayout.drawLine(StringUtil.localize("gui." + tree.getGenome().getPrimary().getPlantType().toString().toLowerCase(Locale.ENGLISH)), COLUMN_1, + textLayout.drawLine(Translator.translateToLocal("for.gui.native"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui." + tree.getGenome().getPrimary().getPlantType().toString().toLowerCase(Locale.ENGLISH)), COLUMN_1, speciesDominance0); - textLayout.drawLine(StringUtil.localize("gui." + tree.getGenome().getSecondary().getPlantType().toString().toLowerCase(Locale.ENGLISH)), COLUMN_2, + textLayout.drawLine(Translator.translateToLocal("for.gui." + tree.getGenome().getSecondary().getPlantType().toString().toLowerCase(Locale.ENGLISH)), COLUMN_2, speciesDominance1); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.tolerated"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.tolerated"), COLUMN_0); List activeTolerated = new ArrayList<>(tree.getGenome().getPlantTypes()); List inactiveTolerated = Collections.emptyList(); @@ -190,16 +190,16 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.newLine(); } if (activeTolerated.size() > i) { - drawLine(StringUtil.localize("gui." + activeTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_1, tree, EnumTreeChromosome.PLANT, false); + drawLine(Translator.translateToLocal("for.gui." + activeTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_1, tree, EnumTreeChromosome.PLANT, false); } if (inactiveTolerated.size() > i) { - drawLine(StringUtil.localize("gui." + inactiveTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_2, tree, EnumTreeChromosome.PLANT, true); + drawLine(Translator.translateToLocal("for.gui." + inactiveTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_2, tree, EnumTreeChromosome.PLANT, true); } } textLayout.newLine(); // FRUITS - textLayout.drawLine(StringUtil.localize("gui.supports"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.supports"), COLUMN_0); List families0 = new ArrayList<>(tree.getGenome().getPrimary().getSuitableFruit()); List families1 = new ArrayList<>(tree.getGenome().getSecondary().getSuitableFruit()); @@ -224,24 +224,24 @@ public class GuiTreealyzer extends GuiAlyzer { int fruitDominance0 = getColorCoding(tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS).isDominant()); int fruitDominance1 = getColorCoding(tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS).isDominant()); - textLayout.drawLine(StringUtil.localize("gui.fruits"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.fruits"), COLUMN_0); String strike = ""; IAllele fruit0 = tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS); if (!tree.canBearFruit() && fruit0 != AlleleFruit.fruitNone) { strike = EnumChatFormatting.STRIKETHROUGH.toString(); } - textLayout.drawLine(strike + StringUtil.localize(tree.getGenome().getFruitProvider().getDescription()), COLUMN_1, fruitDominance0); + textLayout.drawLine(strike + tree.getGenome().getFruitProvider().getDescription(), COLUMN_1, fruitDominance0); strike = ""; - IAllele fruit1 = tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS); + IAlleleFruit fruit1 = (IAlleleFruit) tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS); if (!tree.getGenome().getSecondary().getSuitableFruit().contains(((IAlleleFruit) fruit1).getProvider().getFamily()) && fruit1 != AlleleFruit.fruitNone) { strike = EnumChatFormatting.STRIKETHROUGH.toString(); } - textLayout.drawLine(strike + StringUtil.localize(((IAlleleFruit) fruit1).getProvider().getDescription()), COLUMN_2, fruitDominance1); + textLayout.drawLine(strike + fruit1.getProvider().getDescription(), COLUMN_2, fruitDominance1); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.family"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.family"), COLUMN_0); IFruitFamily primary = tree.getGenome().getFruitProvider().getFamily(); IFruitFamily secondary = ((IAlleleFruit) tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS)).getProvider().getFamily(); @@ -259,7 +259,7 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - textLayout.drawLine(StringUtil.localize("gui.beealyzer.produce") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.produce") + ":", COLUMN_0); textLayout.newLine(); int x = COLUMN_0; @@ -277,7 +277,7 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.newLine(); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.beealyzer.specialty") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.specialty") + ":", COLUMN_0); textLayout.newLine(); x = COLUMN_0; diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index 44d074090..cca53b63d 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -46,7 +47,7 @@ import forestry.core.network.packets.PacketFXSignal; import forestry.core.proxy.Proxies; import forestry.core.utils.BlockUtil; import forestry.core.utils.GeneticsUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class ItemGermlingGE extends ItemGE implements IVariableFermentable { @@ -83,11 +84,12 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { } IAlleleSpecies species = getSpecies(itemstack); - String customTreeKey = "trees.custom." + type.getName() + "." + species.getUnlocalizedName().replace("trees.species.", ""); - if (StringUtil.canTranslate(customTreeKey)) { - return StringUtil.localize(customTreeKey); + String customTreeKey = "for.trees.custom." + type.getName() + "." + species.getUnlocalizedName().replace("trees.species.", ""); + if (Translator.canTranslateToLocal(customTreeKey)) { + return Translator.translateToLocal(customTreeKey); } - return StringUtil.localize("trees.grammar." + type.getName()).replaceAll("%SPECIES", species.getName()).replaceAll("%TYPE", StringUtil.localize("trees.grammar." + type.getName() + ".type")); + 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); } @Override diff --git a/src/main/java/forestry/core/PluginFluids.java b/src/main/java/forestry/core/PluginFluids.java index ee3dae168..f615d5272 100644 --- a/src/main/java/forestry/core/PluginFluids.java +++ b/src/main/java/forestry/core/PluginFluids.java @@ -34,7 +34,6 @@ import forestry.core.items.ItemLiquidContainer; import forestry.core.items.ItemRegistryFluids; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; -import forestry.core.utils.StringUtil; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; @@ -67,8 +66,9 @@ public class PluginFluids extends BlankForestryPlugin { if (fluidBlock == null) { fluidBlock = forestryFluid.makeBlock(); if (fluidBlock != null) { - fluidBlock.setUnlocalizedName("forestry.fluid." + forestryFluid.getTag()); - GameRegistry.registerBlock(fluidBlock, ItemBlock.class, StringUtil.cleanBlockName(fluidBlock)); + String name = "fluid." + forestryFluid.getTag(); + fluidBlock.setUnlocalizedName("forestry." + name); + GameRegistry.registerBlock(fluidBlock, ItemBlock.class, name); Proxies.render.registerFluidStateMapper(fluidBlock, forestryFluid); if (forestryFluid.getOtherContainers().isEmpty()) { FluidRegistry.addBucketForFluid(fluid); diff --git a/src/main/java/forestry/core/access/EnumAccess.java b/src/main/java/forestry/core/access/EnumAccess.java index c2c0608c9..b828c3245 100644 --- a/src/main/java/forestry/core/access/EnumAccess.java +++ b/src/main/java/forestry/core/access/EnumAccess.java @@ -16,19 +16,19 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public enum EnumAccess { - SHARED("gui.rule.shared"), VIEWABLE("gui.rule.restricted"), PRIVATE("gui.rule.private"); + SHARED("for.gui.rule.shared"), VIEWABLE("for.gui.rule.restricted"), PRIVATE("for.gui.rule.private"); - private final String name; + private final String unlocalizedName; @SideOnly(Side.CLIENT) private TextureAtlasSprite icon; - EnumAccess(String name) { - this.name = name; + EnumAccess(String unlocalizedName) { + this.unlocalizedName = unlocalizedName; } - public String getName() { - return this.name; + public String getUnlocalizedName() { + return this.unlocalizedName; } } diff --git a/src/main/java/forestry/core/blocks/BlockRegistry.java b/src/main/java/forestry/core/blocks/BlockRegistry.java index cac760814..0fdd71ab7 100644 --- a/src/main/java/forestry/core/blocks/BlockRegistry.java +++ b/src/main/java/forestry/core/blocks/BlockRegistry.java @@ -20,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import forestry.core.utils.StringUtil; import forestry.plugins.PluginManager; public abstract class BlockRegistry { @@ -46,7 +45,7 @@ public abstract class BlockRegistry { throw new RuntimeException("Tried to register Block outside of REGISTER"); } block.setUnlocalizedName("for." + name); - GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs); + GameRegistry.registerBlock(block, itemClass, name, itemCtorArgs); allBlocks.add(block); return block; } diff --git a/src/main/java/forestry/core/blocks/MachineProperties.java b/src/main/java/forestry/core/blocks/MachineProperties.java index 79ba1c996..2adf8c56c 100644 --- a/src/main/java/forestry/core/blocks/MachineProperties.java +++ b/src/main/java/forestry/core/blocks/MachineProperties.java @@ -18,13 +18,13 @@ import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.core.IModelManager; import forestry.core.tiles.TileForestry; import forestry.core.tiles.TileUtil; import forestry.core.utils.BlockUtil; -import forestry.core.utils.StringUtil; public class MachineProperties implements IMachineProperties { @@ -105,7 +105,8 @@ public class MachineProperties implements IMachineProper @Override public void registerModel(@Nonnull Item item, @Nonnull IModelManager manager) { - String identifier = StringUtil.cleanItemName(item) + "_" + name; + FMLControlledNamespacedRegistry itemRegistry = (FMLControlledNamespacedRegistry) Item.itemRegistry; + String identifier = itemRegistry.getNameForObject(item).getResourcePath() + "_" + name; manager.registerItemModel(item, meta, identifier); } diff --git a/src/main/java/forestry/core/circuits/Circuit.java b/src/main/java/forestry/core/circuits/Circuit.java index 67721a09f..d0a3061b4 100755 --- a/src/main/java/forestry/core/circuits/Circuit.java +++ b/src/main/java/forestry/core/circuits/Circuit.java @@ -14,7 +14,7 @@ import java.util.List; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public abstract class Circuit implements ICircuit { @@ -49,18 +49,18 @@ public abstract class Circuit implements ICircuit { } @Override - public String getName() { - return "circuit." + this.uid; + public String getUnlocalizedName() { + return "for.circuit." + this.uid; } @Override public void addTooltip(List list) { - list.add(StringUtil.localize(getName())); + list.add(Translator.translateToLocal(getUnlocalizedName())); int i = 1; while (true) { - String unlocalizedDescription = getName() + ".description." + i; - String description = StringUtil.localize(unlocalizedDescription); + String unlocalizedDescription = getUnlocalizedName() + ".description." + i; + String description = Translator.translateToLocal(unlocalizedDescription); if (description.endsWith(unlocalizedDescription)) { break; } diff --git a/src/main/java/forestry/core/circuits/CircuitBoard.java b/src/main/java/forestry/core/circuits/CircuitBoard.java index 229e945ae..0c55835a7 100755 --- a/src/main/java/forestry/core/circuits/CircuitBoard.java +++ b/src/main/java/forestry/core/circuits/CircuitBoard.java @@ -23,7 +23,7 @@ import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitSocketType; import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class CircuitBoard implements ICircuitBoard { @@ -92,7 +92,7 @@ public class CircuitBoard implements ICircuitBoard { if (Proxies.common.isShiftDown() || extendedTooltip.size() <= 4) { list.addAll(extendedTooltip); } else { - list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tmi") + ">"); + list.add(EnumChatFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">"); } } diff --git a/src/main/java/forestry/core/circuits/CircuitLayout.java b/src/main/java/forestry/core/circuits/CircuitLayout.java index c41a6c94a..b90604979 100755 --- a/src/main/java/forestry/core/circuits/CircuitLayout.java +++ b/src/main/java/forestry/core/circuits/CircuitLayout.java @@ -14,7 +14,7 @@ import javax.annotation.Nonnull; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitSocketType; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class CircuitLayout implements ICircuitLayout { @@ -37,13 +37,13 @@ public class CircuitLayout implements ICircuitLayout { @Nonnull @Override public String getName() { - return StringUtil.localize("circuit.layout." + this.uid + ".name"); + return Translator.translateToLocal("for.circuit.layout." + this.uid + ".name"); } @Nonnull @Override public String getUsage() { - return StringUtil.localize("circuit.layout." + this.uid + ".usage"); + return Translator.translateToLocal("for.circuit.layout." + this.uid + ".usage"); } @Nonnull diff --git a/src/main/java/forestry/core/circuits/GuiSolderingIron.java b/src/main/java/forestry/core/circuits/GuiSolderingIron.java index 9d68bb607..0a3713a73 100755 --- a/src/main/java/forestry/core/circuits/GuiSolderingIron.java +++ b/src/main/java/forestry/core/circuits/GuiSolderingIron.java @@ -24,7 +24,7 @@ import forestry.api.farming.FarmDirection; import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.inventory.ItemInventorySolderingIron; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class GuiSolderingIron extends GuiForestry { @@ -48,9 +48,9 @@ public class GuiSolderingIron extends GuiForestry @@ -85,12 +85,12 @@ public class CommandHelpers { } public static void throwWrongUsage(ICommandSender sender, IForestryCommand command) throws WrongUsageException { - throw new WrongUsageException(StringUtil.localizeAndFormat("chat.help", command.getCommandUsage(sender))); + throw new WrongUsageException(Translator.translateToLocalFormatted("for.chat.help", command.getCommandUsage(sender))); } public static void processChildCommand(ICommandSender sender, SubCommand child, String[] args) throws CommandException { if (!sender.canCommandSenderUseCommand(child.getPermissionLevel(), child.getFullCommandString())) { - throw new WrongUsageException(StringUtil.localize("chat.command.noperms")); + throw new WrongUsageException(Translator.translateToLocal("for.chat.command.noperms")); } String[] newargs = new String[args.length - 1]; System.arraycopy(args, 1, newargs, 0, newargs.length); diff --git a/src/main/java/forestry/core/commands/CommandPlugins.java b/src/main/java/forestry/core/commands/CommandPlugins.java index d0c1c6398..75c00aed5 100644 --- a/src/main/java/forestry/core/commands/CommandPlugins.java +++ b/src/main/java/forestry/core/commands/CommandPlugins.java @@ -14,9 +14,8 @@ import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.plugins.ForestryPlugin; import forestry.plugins.IForestryPlugin; import forestry.plugins.PluginManager; @@ -99,7 +98,7 @@ public class CommandPlugins extends SubCommand { } if (found == null) { - throw new CommandException(StringUtil.localizeAndFormat("chat.plugins.error", pluginUid)); + throw new CommandException(Translator.translateToLocalFormatted("for.chat.plugins.error", pluginUid)); } EnumChatFormatting formatting = found.isAvailable() ? EnumChatFormatting.GREEN : EnumChatFormatting.RED; @@ -117,7 +116,7 @@ public class CommandPlugins extends SubCommand { CommandHelpers.sendChatMessage(sender, EnumChatFormatting.BLUE + "URL: " + info.url()); } if (!info.unlocalizedDescription().isEmpty()) { - CommandHelpers.sendChatMessage(sender, StatCollector.translateToLocal(info.unlocalizedDescription())); + CommandHelpers.sendChatMessage(sender, Translator.translateToLocal(info.unlocalizedDescription())); } } diff --git a/src/main/java/forestry/core/commands/CommandSaveStats.java b/src/main/java/forestry/core/commands/CommandSaveStats.java index dc38ce994..348b9ba6b 100644 --- a/src/main/java/forestry/core/commands/CommandSaveStats.java +++ b/src/main/java/forestry/core/commands/CommandSaveStats.java @@ -25,7 +25,6 @@ import net.minecraft.command.ICommandSender; import net.minecraft.command.PlayerNotFoundException; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.BlockPos; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import forestry.api.genetics.AlleleManager; @@ -35,6 +34,7 @@ import forestry.core.config.Constants; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public final class CommandSaveStats extends SubCommand { @@ -43,9 +43,9 @@ public final class CommandSaveStats extends SubCommand { private static final String notCountedSymbol; static { - discoveredSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.discovered.symbol"); - blacklistedSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.blacklisted.symbol"); - notCountedSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.notCounted.symbol"); + discoveredSymbol = Translator.translateToLocal("for.chat.command.forestry.stats.save.key.discovered.symbol"); + blacklistedSymbol = Translator.translateToLocal("for.chat.command.forestry.stats.save.key.blacklisted.symbol"); + notCountedSymbol = Translator.translateToLocal("for.chat.command.forestry.stats.save.key.notCounted.symbol"); } private final IStatsSaveHelper saveHelper; @@ -82,27 +82,27 @@ public final class CommandSaveStats extends SubCommand { Collection statistics = new ArrayList<>(); String date = DateFormat.getInstance().format(new Date()); - statistics.add(StatCollector.translateToLocalFormatted(saveHelper.getUnlocalizedSaveStatsString(), player.getDisplayName(), date)); + statistics.add(Translator.translateToLocalFormatted(saveHelper.getUnlocalizedSaveStatsString(), player.getDisplayName(), date)); statistics.add(""); - statistics.add(StatCollector.translateToLocalFormatted("for.chat.command.forestry.stats.save.mode", modeHelper.getModeName(world))); + statistics.add(Translator.translateToLocalFormatted("for.chat.command.forestry.stats.save.mode", modeHelper.getModeName(world))); statistics.add(""); IBreedingTracker tracker = saveHelper.getBreedingTracker(world, player.getGameProfile()); if (tracker == null) { - statistics.add(StatCollector.translateToLocal("for.chat.command.forestry.stats.save.error4")); + statistics.add(Translator.translateToLocal("for.chat.command.forestry.stats.save.error4")); } else { saveHelper.addExtraInfo(statistics, tracker); Collection species = saveHelper.getSpecies(); - String speciesCount = StatCollector.translateToLocal("for.gui.speciescount"); + String speciesCount = Translator.translateToLocal("for.gui.speciescount"); String speciesCountLine = String.format("%s (%s):", speciesCount, species.size()); statistics.add(speciesCountLine); statistics.add(StringUtil.line(speciesCountLine.length())); - statistics.add(discoveredSymbol + ": " + StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.discovered")); - statistics.add(blacklistedSymbol + ": " + StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.blacklisted")); - statistics.add(notCountedSymbol + ": " + StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.notCounted")); + statistics.add(discoveredSymbol + ": " + Translator.translateToLocal("for.chat.command.forestry.stats.save.key.discovered")); + statistics.add(blacklistedSymbol + ": " + Translator.translateToLocal("for.chat.command.forestry.stats.save.key.blacklisted")); + statistics.add(notCountedSymbol + ": " + Translator.translateToLocal("for.chat.command.forestry.stats.save.key.notCounted")); statistics.add(""); String header = generateSpeciesListHeader(); @@ -150,7 +150,7 @@ public final class CommandSaveStats extends SubCommand { } catch (IOException ex) { CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.stats.save.error3"); - Log.error(StringUtil.localize("for.chat.command.forestry.stats.save.error3"), ex); + Log.error(Translator.translateToLocal("for.for.chat.command.forestry.stats.save.error3"), ex); return; } @@ -158,8 +158,8 @@ public final class CommandSaveStats extends SubCommand { } private static String generateSpeciesListHeader() { - String authority = StatCollector.translateToLocal("for.gui.alyzer.authority"); - String species = StatCollector.translateToLocal("for.gui.species"); + String authority = Translator.translateToLocal("for.gui.alyzer.authority"); + String species = Translator.translateToLocal("for.gui.species"); return speciesListEntry(discoveredSymbol, blacklistedSymbol, notCountedSymbol, "UID", species, authority); } diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index 5ad4d0efc..016905970 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -24,14 +24,12 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; -import net.minecraft.util.StatCollector; - import net.minecraftforge.common.config.Property; import forestry.Forestry; import forestry.core.fluids.Fluids; import forestry.core.utils.Log; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.mail.gui.GuiMailboxInfo; public class Config { @@ -151,7 +149,7 @@ public class Config { if (recreate) { Log.info("Recreating all gamemode definitions from the defaults. This may be caused by an upgrade"); - String recreateDefinitionsComment = StringUtil.localize("config.difficulty.recreate.definitions.comment"); + String recreateDefinitionsComment = Translator.translateToLocal("for.config.difficulty.recreate.definitions.comment"); Property property = configCommon.get("difficulty", "recreate.definitions", true, recreateDefinitionsComment); property.set(false); @@ -250,17 +248,17 @@ public class Config { configFluid = new LocalizedConfiguration(configFile, "1.0.0"); for (Fluids fluid : Fluids.FORESTRY_FLUIDs) { - String fluidName = StatCollector.translateToLocal("fluid." + fluid.getTag()); + String fluidName = Translator.translateToLocal("fluid." + fluid.getTag()); boolean enabledFluid = !Config.disabledFluids.contains(fluid.getTag()); - String enableFluidComment = StringUtil.localizeAndFormatRaw("for.config.fluids.enable.format", fluidName); + String enableFluidComment = Translator.translateToLocalFormatted("for.config.fluids.enable.format", fluidName); enabledFluid = configFluid.getBoolean("enableFluid", fluid.getTag(), enabledFluid, enableFluidComment); if (!enabledFluid) { Config.disabledFluids.add(fluid.getTag()); } boolean enabledFluidBlock = !Config.disabledBlocks.contains(fluid.getTag()); - String enableFluidBlockComment = StringUtil.localizeAndFormatRaw("for.config.fluid.blocks.enable.format", fluidName); + String enableFluidBlockComment = Translator.translateToLocalFormatted("for.config.fluid.blocks.enable.format", fluidName); enabledFluidBlock = configFluid.getBoolean("enableFluidBlock", fluid.getTag(), enabledFluidBlock, enableFluidBlockComment); if (!enabledFluidBlock) { Config.disabledBlocks.add(fluid.getTag()); diff --git a/src/main/java/forestry/core/config/LocalizedConfiguration.java b/src/main/java/forestry/core/config/LocalizedConfiguration.java index a22d65857..7aa57fc11 100644 --- a/src/main/java/forestry/core/config/LocalizedConfiguration.java +++ b/src/main/java/forestry/core/config/LocalizedConfiguration.java @@ -13,11 +13,11 @@ package forestry.core.config; import java.io.File; import java.util.Arrays; -import net.minecraft.util.StatCollector; - import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import forestry.core.utils.Translator; + public class LocalizedConfiguration extends Configuration { public LocalizedConfiguration(File file, String configVersion) { @@ -40,8 +40,8 @@ public class LocalizedConfiguration extends Configuration { String langKey = "for.config." + category + '.' + name; String commentKey = langKey + '.' + "comment"; String comment = ""; - if (StatCollector.canTranslate(commentKey)) { - comment = StatCollector.translateToLocal(commentKey); + if (Translator.canTranslateToLocal(commentKey)) { + comment = Translator.translateToLocal(commentKey); } return getBoolean(name, category, defaultValue, comment, langKey); } @@ -50,8 +50,8 @@ public class LocalizedConfiguration extends Configuration { String langKey = "for.config." + category + '.' + name; String commentKey = langKey + '.' + "comment"; String comment = ""; - if (StatCollector.canTranslate(commentKey)) { - comment = StatCollector.translateToLocal(commentKey); + if (Translator.canTranslateToLocal(commentKey)) { + comment = Translator.translateToLocal(commentKey); } return getString(name, category, defaultValue, comment, langKey); } @@ -60,8 +60,8 @@ public class LocalizedConfiguration extends Configuration { String langKey = "for.config." + category + '.' + name; String commentKey = langKey + '.' + "comment"; String comment = ""; - if (StatCollector.canTranslate(commentKey)) { - comment = StatCollector.translateToLocal(commentKey); + if (Translator.canTranslateToLocal(commentKey)) { + comment = Translator.translateToLocal(commentKey); } Property prop = this.get(category, name, defaultValue); @@ -75,8 +75,8 @@ public class LocalizedConfiguration extends Configuration { String langKey = "for.config." + category + '.' + name; String commentKey = langKey + '.' + "comment"; String comment = ""; - if (StatCollector.canTranslate(commentKey)) { - comment = StatCollector.translateToLocal(commentKey); + if (Translator.canTranslateToLocal(commentKey)) { + comment = Translator.translateToLocal(commentKey); } Property prop = this.get(category, name, defaultValue.name()); @@ -106,8 +106,8 @@ public class LocalizedConfiguration extends Configuration { String langKey = "for.config." + category + '.' + name; String commentKey = langKey + '.' + "comment"; String comment = ""; - if (StatCollector.canTranslate(commentKey)) { - comment = StatCollector.translateToLocal(commentKey); + if (Translator.canTranslateToLocal(commentKey)) { + comment = Translator.translateToLocal(commentKey); } return super.getStringList(name, category, defaultValue, comment); } @@ -116,8 +116,8 @@ public class LocalizedConfiguration extends Configuration { String langKey = "for.config." + category + '.' + name; String commentKey = langKey + '.' + "comment"; String comment = ""; - if (StatCollector.canTranslate(commentKey)) { - comment = StatCollector.translateToLocal(commentKey); + if (Translator.canTranslateToLocal(commentKey)) { + comment = Translator.translateToLocal(commentKey); } Property prop = this.get(category, name, defaultValue); @@ -131,8 +131,8 @@ public class LocalizedConfiguration extends Configuration { String langKey = "for.config." + category + '.' + name; String commentKey = langKey + '.' + "comment"; String comment = ""; - if (StatCollector.canTranslate(commentKey)) { - comment = StatCollector.translateToLocal(commentKey); + if (Translator.canTranslateToLocal(commentKey)) { + comment = Translator.translateToLocal(commentKey); } return getFloat(name, category, defaultValue, minValue, maxValue, comment, langKey); } @@ -141,8 +141,8 @@ public class LocalizedConfiguration extends Configuration { String langKey = "for.config." + category + '.' + name; String commentKey = langKey + '.' + "comment"; String comment = ""; - if (StatCollector.canTranslate(commentKey)) { - comment = StatCollector.translateToLocal(commentKey); + if (Translator.canTranslateToLocal(commentKey)) { + comment = Translator.translateToLocal(commentKey); } return getInt(name, category, defaultValue, minValue, maxValue, comment, langKey); } diff --git a/src/main/java/forestry/core/entities/EntityMinecartForestry.java b/src/main/java/forestry/core/entities/EntityMinecartForestry.java index 8f39fb938..45dc72c5b 100644 --- a/src/main/java/forestry/core/entities/EntityMinecartForestry.java +++ b/src/main/java/forestry/core/entities/EntityMinecartForestry.java @@ -17,7 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -33,6 +32,7 @@ import forestry.core.gui.GuiHandler; import forestry.core.gui.IGuiHandlerEntity; import forestry.core.gui.IHintSource; import forestry.core.tiles.ITitled; +import forestry.core.utils.Translator; public abstract class EntityMinecartForestry extends EntityMinecart implements ITitled, IRestrictedAccess, IHintSource, IGuiHandlerEntity { private final AccessHandler accessHandler = new AccessHandler(this); @@ -115,7 +115,7 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I @Override public String getName() { - return StatCollector.translateToLocal(getUnlocalizedTitle()); + return Translator.translateToLocal(getUnlocalizedTitle()); } /* ITitled */ diff --git a/src/main/java/forestry/core/errors/EnumErrorCode.java b/src/main/java/forestry/core/errors/EnumErrorCode.java index 768285feb..2b7d40c7c 100644 --- a/src/main/java/forestry/core/errors/EnumErrorCode.java +++ b/src/main/java/forestry/core/errors/EnumErrorCode.java @@ -99,13 +99,13 @@ public enum EnumErrorCode implements IErrorState { } @Override - public String getDescription() { - return "errors." + name + ".desc"; + public String getUnlocalizedDescription() { + return "for.errors." + name + ".desc"; } @Override - public String getHelp() { - return "errors." + name + ".help"; + public String getUnlocalizedHelp() { + return "for.errors." + name + ".help"; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java index df68f27ae..a0bb680c2 100644 --- a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java +++ b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java @@ -24,7 +24,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; import forestry.core.utils.Translator; /** @@ -93,7 +92,7 @@ public class FilteredTank extends StandardTank { toolTip.add(fluidFilter.getLocalizedName(filterFluidStack), rarity.rarityColor); } } else { - toolTip.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tmi") + ">"); + toolTip.add(EnumChatFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">"); } String liquidAmount = Translator.translateToLocalFormatted("for.gui.tooltip.liquid.amount", getFluidAmount(), getCapacity()); diff --git a/src/main/java/forestry/core/genetics/Classification.java b/src/main/java/forestry/core/genetics/Classification.java index 8a5420cb4..8b6cc029f 100755 --- a/src/main/java/forestry/core/genetics/Classification.java +++ b/src/main/java/forestry/core/genetics/Classification.java @@ -16,7 +16,7 @@ import java.util.Locale; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class Classification implements IClassification { @@ -63,12 +63,12 @@ public class Classification implements IClassification { @Override public String getName() { - return StringUtil.localize(uid); + return Translator.translateToLocal("for." + uid); } @Override public String getDescription() { - return StringUtil.localize(uid + ".description"); + return Translator.translateToLocal("for." + uid + ".description"); } @Override diff --git a/src/main/java/forestry/core/genetics/GenericRatings.java b/src/main/java/forestry/core/genetics/GenericRatings.java index b77d1508e..1df6d84d4 100755 --- a/src/main/java/forestry/core/genetics/GenericRatings.java +++ b/src/main/java/forestry/core/genetics/GenericRatings.java @@ -10,34 +10,33 @@ ******************************************************************************/ package forestry.core.genetics; -import net.minecraft.util.StatCollector; - import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class GenericRatings { public static String rateMetabolism(int metabolism) { if (metabolism >= 19) { - return StatCollector.translateToLocal("Forestry.allele.highest"); + return Translator.translateToLocal("Forestry.allele.highest"); } else if (metabolism >= 16) { - return StatCollector.translateToLocal("Forestry.allele.higher"); + return Translator.translateToLocal("Forestry.allele.higher"); } else if (metabolism >= 13) { - return StatCollector.translateToLocal("Forestry.allele.high"); + return Translator.translateToLocal("Forestry.allele.high"); } else if (metabolism >= 10) { - return StatCollector.translateToLocal("Forestry.allele.average"); + return Translator.translateToLocal("Forestry.allele.average"); } else if (metabolism >= 7) { - return StatCollector.translateToLocal("Forestry.allele.slow"); + return Translator.translateToLocal("Forestry.allele.slow"); } else if (metabolism >= 4) { - return StatCollector.translateToLocal("Forestry.allele.slower"); + return Translator.translateToLocal("Forestry.allele.slower"); } else { - return StatCollector.translateToLocal("Forestry.allele.slowest"); + return Translator.translateToLocal("Forestry.allele.slowest"); } } public static String rateActivityTime(boolean neverSleeps, boolean naturalNocturnal) { - String active = naturalNocturnal ? StringUtil.localize("gui.nocturnal") : StringUtil.localize("gui.diurnal"); + String active = naturalNocturnal ? Translator.translateToLocal("for.gui.nocturnal") : Translator.translateToLocal("for.gui.diurnal"); if (neverSleeps) { - active = StringUtil.append(", ", active, naturalNocturnal ? StringUtil.localize("gui.diurnal") : StringUtil.localize("gui.nocturnal")); + active = StringUtil.append(", ", active, naturalNocturnal ? Translator.translateToLocal("for.gui.diurnal") : Translator.translateToLocal("for.gui.nocturnal")); } return active; diff --git a/src/main/java/forestry/core/genetics/ItemGE.java b/src/main/java/forestry/core/genetics/ItemGE.java index 082e636ca..767bc8177 100755 --- a/src/main/java/forestry/core/genetics/ItemGE.java +++ b/src/main/java/forestry/core/genetics/ItemGE.java @@ -24,7 +24,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.core.items.ItemForestry; import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public abstract class ItemGE extends ItemForestry { protected ItemGE(CreativeTabs creativeTab) { @@ -69,10 +69,10 @@ public abstract class ItemGE extends ItemForestry { if (Proxies.common.isShiftDown()) { individual.addTooltip(list); } else { - list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tmi") + ">"); + list.add(EnumChatFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">"); } } else { - list.add("<" + StringUtil.localize("gui.unknown") + ">"); + list.add("<" + Translator.translateToLocal("for.gui.unknown") + ">"); } } diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java index 3a351612c..2510c05c3 100755 --- a/src/main/java/forestry/core/genetics/ItemResearchNote.java +++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java @@ -34,7 +34,7 @@ import forestry.core.genetics.mutations.EnumMutateChance; import forestry.core.items.ItemForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.PlayerUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class ItemResearchNote extends ItemForestry { @@ -90,15 +90,15 @@ public class ItemResearchNote extends ItemForestry { String species1 = encoded.getAllele0().getName(); String species2 = encoded.getAllele1().getName(); String mutationChanceKey = EnumMutateChance.rateChance(encoded.getBaseChance()).toString().toLowerCase(Locale.ENGLISH); - String mutationChance = StringUtil.localize("researchNote.chance." + mutationChanceKey); + String mutationChance = Translator.translateToLocal("for.researchNote.chance." + mutationChanceKey); String speciesResult = encoded.getTemplate()[root.getKaryotypeKey().ordinal()].getName(); - tooltips.add(StringUtil.localize("researchNote.discovery.0")); - tooltips.add(StringUtil.localize("researchNote.discovery.1").replace("%SPEC1", species1).replace("%SPEC2", species2)); - tooltips.add(StringUtil.localizeAndFormat("researchNote.discovery.2", mutationChance)); - tooltips.add(StringUtil.localizeAndFormat("researchNote.discovery.3", speciesResult)); + tooltips.add(Translator.translateToLocal("for.researchNote.discovery.0")); + tooltips.add(Translator.translateToLocal("for.researchNote.discovery.1").replace("%SPEC1", species1).replace("%SPEC2", species2)); + tooltips.add(Translator.translateToLocalFormatted("for.researchNote.discovery.2", mutationChance)); + tooltips.add(Translator.translateToLocalFormatted("for.researchNote.discovery.3", speciesResult)); - if (encoded.getSpecialConditions() != null && encoded.getSpecialConditions().size() > 0) { + if (encoded.getSpecialConditions() != null && !encoded.getSpecialConditions().isEmpty()) { for (String line : encoded.getSpecialConditions()) { tooltips.add(EnumChatFormatting.GOLD + line); } @@ -114,7 +114,7 @@ public class ItemResearchNote extends ItemForestry { } tooltips.add("researchNote.discovered.0"); - tooltips.add(StringUtil.localizeAndFormat("researchNote.discovered.1", allele0.getName(), allele0.getBinomial())); + tooltips.add(Translator.translateToLocalFormatted("for.researchNote.discovered.1", allele0.getName(), allele0.getBinomial())); } return tooltips; @@ -242,8 +242,8 @@ public class ItemResearchNote extends ItemForestry { public void addTooltip(List list) { ArrayList tooltips = type.getTooltip(inner); if (tooltips.size() <= 0) { - list.add(EnumChatFormatting.ITALIC + EnumChatFormatting.RED.toString() + StringUtil.localize("researchNote.error.0")); - list.add(StringUtil.localize("researchNote.error.1")); + list.add(EnumChatFormatting.ITALIC + EnumChatFormatting.RED.toString() + Translator.translateToLocal("for.researchNote.error.0")); + list.add(Translator.translateToLocal("for.researchNote.error.1")); return; } @@ -269,7 +269,7 @@ public class ItemResearchNote extends ItemForestry { } else { researcherName = note.researcher.getName(); } - return StringUtil.localizeAndFormatRaw(getUnlocalizedName(itemstack) + ".name", researcherName); + return Translator.translateToLocalFormatted(getUnlocalizedName(itemstack) + ".name", researcherName); } @Override diff --git a/src/main/java/forestry/core/genetics/alleles/Allele.java b/src/main/java/forestry/core/genetics/alleles/Allele.java index 6c4833080..feb91b521 100644 --- a/src/main/java/forestry/core/genetics/alleles/Allele.java +++ b/src/main/java/forestry/core/genetics/alleles/Allele.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.core.genetics.alleles; -import net.minecraft.util.StatCollector; - import forestry.api.genetics.IAllele; +import forestry.core.utils.Translator; public abstract class Allele implements IAllele { @@ -38,7 +37,7 @@ public abstract class Allele implements IAllele { @Override public String getName() { - return StatCollector.translateToLocal(getUnlocalizedName()); + return Translator.translateToLocal(getUnlocalizedName()); } @Override diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java b/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java index ca896f5c2..66ab34a77 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java @@ -2,7 +2,7 @@ package forestry.core.genetics.alleles; import org.apache.commons.lang3.text.WordUtils; -import net.minecraft.util.StatCollector; +import forestry.core.utils.Translator; /** * Alleles that have a category with several values inherit from this class. @@ -24,7 +24,7 @@ public abstract class AlleleCategorized extends Allele { private static String getUnlocalizedName(String modId, String category, String valueName) { String customName = modId + '.' + "allele." + category + '.' + valueName; - if (StatCollector.canTranslate(customName)) { + if (Translator.canTranslateToLocal(customName)) { return customName; } else { return modId + '.' + "allele." + valueName; diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java index 7ceeb7869..bce63b92e 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java @@ -16,7 +16,6 @@ import java.util.Map; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -33,6 +32,7 @@ import forestry.apiculture.PluginApiculture; import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.Translator; public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuilder, IAlleleSpecies { private final String binomial; @@ -57,7 +57,7 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuil this.branch = branch; this.binomial = binomial; - this.description = StatCollector.translateToLocal(unlocalizedDescription); + this.description = Translator.translateToLocal(unlocalizedDescription); this.authority = authority; } diff --git a/src/main/java/forestry/core/genetics/alleles/EnumAllele.java b/src/main/java/forestry/core/genetics/alleles/EnumAllele.java index 709f22483..138e16e53 100644 --- a/src/main/java/forestry/core/genetics/alleles/EnumAllele.java +++ b/src/main/java/forestry/core/genetics/alleles/EnumAllele.java @@ -118,7 +118,7 @@ public class EnumAllele { Flowers(String flowerType, boolean dominant) { String lowercaseName = toString().toLowerCase(Locale.ENGLISH); - this.value = new FlowerProvider(flowerType, "flowers." + lowercaseName); + this.value = new FlowerProvider(flowerType, "for.flowers." + lowercaseName); this.dominant = dominant; } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java index 03bfa94b2..0787e95a1 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java @@ -23,7 +23,7 @@ import net.minecraftforge.common.BiomeDictionary; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class MutationConditionBiome implements IMutationCondition { @@ -49,10 +49,10 @@ public class MutationConditionBiome implements IMutationCondition { public String getDescription() { if (validBiomeTypes.size() > 1) { String biomeTypes = Arrays.toString(validBiomeTypes.toArray()).toLowerCase(Locale.ENGLISH); - return StringUtil.localizeAndFormat("mutation.condition.biome.multiple", biomeTypes); + return Translator.translateToLocalFormatted("for.mutation.condition.biome.multiple", biomeTypes); } else { String biomeType = validBiomeTypes.get(0).toString().toLowerCase(Locale.ENGLISH); - return StringUtil.localizeAndFormat("mutation.condition.biome.single", biomeType); + return Translator.translateToLocalFormatted("for.mutation.condition.biome.single", biomeType); } } } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java index 39b273994..0198dadde 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class MutationConditionDaytime implements IMutationCondition { @@ -37,9 +37,9 @@ public class MutationConditionDaytime implements IMutationCondition { @Override public String getDescription() { if (daytime) { - return StringUtil.localize("mutation.condition.daytime.day"); + return Translator.translateToLocal("for.mutation.condition.daytime.day"); } else { - return StringUtil.localize("mutation.condition.daytime.night"); + return Translator.translateToLocal("for.mutation.condition.daytime.night"); } } } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java index f727ef434..21bcc64b3 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java @@ -20,7 +20,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class MutationConditionHumidity implements IMutationCondition { private final EnumHumidity minHumidity; @@ -48,9 +48,9 @@ public class MutationConditionHumidity implements IMutationCondition { if (minHumidity != maxHumidity) { String maxHumidityString = AlleleManager.climateHelper.toDisplay(maxHumidity); - return StringUtil.localize("mutation.condition.humidity.range").replace("%LOW", minHumidityString).replace("%HIGH", maxHumidityString); + return Translator.translateToLocal("for.mutation.condition.humidity.range").replace("%LOW", minHumidityString).replace("%HIGH", maxHumidityString); } else { - return StringUtil.localizeAndFormat("mutation.condition.humidity.single", minHumidityString); + return Translator.translateToLocalFormatted("for.mutation.condition.humidity.single", minHumidityString); } } } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java index 8b7977bcb..1c636d90e 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java @@ -21,7 +21,7 @@ import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class MutationConditionRequiresResource implements IMutationCondition { @@ -48,6 +48,6 @@ public class MutationConditionRequiresResource implements IMutationCondition { @Override public String getDescription() { - return StringUtil.localizeAndFormat("mutation.condition.resource", blockRequired.getDisplayName()); + return Translator.translateToLocalFormatted("for.mutation.condition.resource", blockRequired.getDisplayName()); } } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java index 9789d2bb1..f0e4cf8a0 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java @@ -24,7 +24,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.BlockUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class MutationConditionRequiresResourceOreDict implements IMutationCondition { @@ -65,6 +65,6 @@ public class MutationConditionRequiresResourceOreDict implements IMutationCondit @Override public String getDescription() { - return StringUtil.localizeAndFormat("mutation.condition.resource", displayName); + return Translator.translateToLocalFormatted("for.mutation.condition.resource", displayName); } } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java index a462f5d51..46c9ba488 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java @@ -19,7 +19,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class MutationConditionTemperature implements IMutationCondition { @@ -48,9 +48,9 @@ public class MutationConditionTemperature implements IMutationCondition { if (minTemperature != maxTemperature) { String maxString = AlleleManager.climateHelper.toDisplay(maxTemperature); - return StringUtil.localize("mutation.condition.temperature.range").replace("%LOW", minString).replace("%HIGH", maxString); + return Translator.translateToLocal("for.mutation.condition.temperature.range").replace("%LOW", minString).replace("%HIGH", maxString); } else { - return StringUtil.localizeAndFormat("mutation.condition.temperature.single", minString); + return Translator.translateToLocalFormatted("for.mutation.condition.temperature.single", minString); } } } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java index faded25b6..8bd8c74fd 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java @@ -19,7 +19,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.DayMonth; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class MutationConditionTimeLimited implements IMutationCondition { @@ -56,6 +56,6 @@ public class MutationConditionTimeLimited implements IMutationCondition { @Override public String getDescription() { - return StringUtil.localize("mutation.condition.date").replace("%START", start.toString()).replace("%END", end.toString()); + return Translator.translateToLocal("for.mutation.condition.date").replace("%START", start.toString()).replace("%END", end.toString()); } } diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index fa2685439..b74fb8438 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -40,7 +40,7 @@ import forestry.core.config.Constants; import forestry.core.genetics.mutations.EnumMutateChance; import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public abstract class GuiAlyzer extends GuiForestry { @@ -51,17 +51,17 @@ public abstract class GuiAlyzer extends GuiForestry private final ISpeciesRoot speciesRoot; private final IBreedingTracker breedingTracker; - private final String guiName; + private final String unlocalizedName; protected final Map iconStacks = new HashMap<>(); - protected GuiAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ContainerAlyzer container, IInventory inventory, String guiName) { + protected GuiAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ContainerAlyzer container, IInventory inventory, String unlocalizedName) { super(Constants.TEXTURE_PATH_GUI + "/beealyzer2.png", container, inventory); this.xSize = 246; this.ySize = 238; - this.guiName = guiName; + this.unlocalizedName = unlocalizedName; this.speciesRoot = speciesRoot; this.breedingTracker = this.speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); @@ -124,8 +124,8 @@ public abstract class GuiAlyzer extends GuiForestry } protected static String checkCustomName(String key) { - if (StringUtil.canTranslate(key)) { - return StringUtil.localize(key); + if (Translator.canTranslateToLocal(key)) { + return Translator.translateToLocal(key); } else { return null; } @@ -142,24 +142,24 @@ public abstract class GuiAlyzer extends GuiForestry textLayout.startPage(); textLayout.newLine(); - String title = StringUtil.localize(guiName).toUpperCase(); + String title = Translator.translateToLocal(unlocalizedName).toUpperCase(); textLayout.drawCenteredLine(title, 8, 208, fontColor.get("gui.screen")); textLayout.newLine(); - fontRendererObj.drawSplitString(StringUtil.localize(guiName + ".help"), guiLeft + COLUMN_0 + 4, guiTop + 42, 200, fontColor.get("gui.screen")); + fontRendererObj.drawSplitString(Translator.translateToLocal(unlocalizedName + ".help"), guiLeft + COLUMN_0 + 4, guiTop + 42, 200, fontColor.get("gui.screen")); textLayout.newLine(); textLayout.newLine(); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.alyzer.overview") + ":", COLUMN_0 + 4); + textLayout.drawLine(Translator.translateToLocal("for.gui.alyzer.overview") + ":", COLUMN_0 + 4); textLayout.newLine(); - textLayout.drawLine("I : " + StringUtil.localize("gui.general"), COLUMN_0 + 4); + textLayout.drawLine("I : " + Translator.translateToLocal("for.gui.general"), COLUMN_0 + 4); textLayout.newLine(); - textLayout.drawLine("II : " + StringUtil.localize("gui.environment"), COLUMN_0 + 4); + textLayout.drawLine("II : " + Translator.translateToLocal("for.gui.environment"), COLUMN_0 + 4); textLayout.newLine(); - textLayout.drawLine("III: " + StringUtil.localize("gui.produce"), COLUMN_0 + 4); + textLayout.drawLine("III: " + Translator.translateToLocal("for.gui.produce"), COLUMN_0 + 4); textLayout.newLine(); - textLayout.drawLine("IV : " + StringUtil.localize("gui.evolution"), COLUMN_0 + 4); + textLayout.drawLine("IV : " + Translator.translateToLocal("for.gui.evolution"), COLUMN_0 + 4); textLayout.endPage(); } @@ -168,7 +168,7 @@ public abstract class GuiAlyzer extends GuiForestry textLayout.startPage(); - textLayout.drawLine(StringUtil.localize("gui.alyzer.classification") + ":", 12); + textLayout.drawLine(Translator.translateToLocal("for.gui.alyzer.classification") + ":", 12); textLayout.newLine(); Stack hierarchy = new Stack<>(); @@ -208,9 +208,9 @@ public abstract class GuiAlyzer extends GuiForestry textLayout.drawLine("SPECIES", 170, 0xebae85); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.alyzer.authority") + ": " + individual.getGenome().getPrimary().getAuthority(), 12); + textLayout.drawLine(Translator.translateToLocal("for.gui.alyzer.authority") + ": " + individual.getGenome().getPrimary().getAuthority(), 12); if (AlleleManager.alleleRegistry.isBlacklisted(individual.getIdent())) { - String extinct = ">> " + StringUtil.localize("gui.alyzer.extinct").toUpperCase() + " <<"; + String extinct = ">> " + Translator.translateToLocal("for.gui.alyzer.extinct").toUpperCase() + " <<"; fontRendererObj.drawStringWithShadow(extinct, guiLeft + 200 - fontRendererObj.getStringWidth(extinct), guiTop + textLayout.getLineY(), fontColor.get("gui.beealyzer.dominant")); } @@ -218,7 +218,7 @@ public abstract class GuiAlyzer extends GuiForestry textLayout.newLine(); String description = individual.getGenome().getPrimary().getDescription(); if (StringUtils.isBlank(description) || description.startsWith("for.description.")) { - textLayout.drawSplitLine(StringUtil.localize("gui.alyzer.nodescription"), 12, 200, 0x666666); + textLayout.drawSplitLine(Translator.translateToLocal("for.gui.alyzer.nodescription"), 12, 200, 0x666666); } else { String tokens[] = description.split("\\|"); textLayout.drawSplitLine(tokens[0], 12, 200, 0x666666); @@ -234,7 +234,7 @@ public abstract class GuiAlyzer extends GuiForestry protected void drawAnalyticsPageMutations(IIndividual individual) { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - textLayout.drawLine(StringUtil.localize("gui.beealyzer.mutations") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.mutations") + ":", COLUMN_0); textLayout.newLine(); RenderHelper.enableGUIStandardItemLighting(); diff --git a/src/main/java/forestry/core/gui/GuiEscritoire.java b/src/main/java/forestry/core/gui/GuiEscritoire.java index 7acfd619b..c9c5d28f6 100755 --- a/src/main/java/forestry/core/gui/GuiEscritoire.java +++ b/src/main/java/forestry/core/gui/GuiEscritoire.java @@ -23,7 +23,7 @@ import forestry.core.gui.widgets.Widget; import forestry.core.tiles.EscritoireGame; import forestry.core.tiles.EscritoireTextSource; import forestry.core.tiles.TileEscritoire; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class GuiEscritoire extends GuiForestry { private final ItemStack LEVEL_ITEM = new ItemStack(Items.paper); @@ -93,7 +93,7 @@ public class GuiEscritoire extends GuiForestry extends GuiForestry { @@ -26,7 +26,7 @@ public abstract class GuiForestryTitled { @Nonnull @@ -64,7 +64,7 @@ public class GuiNaturalistInventory extends GuiForestry itemRegistry = (FMLControlledNamespacedRegistry) Item.itemRegistry; + String itemName = itemRegistry.getNameForObject(item).getResourcePath(); + ModelResourceLocation modelLocation = new ModelResourceLocation("forestry:crate-filled", itemName); ModelLoader.setCustomModelResourceLocation(item, 0, modelLocation); ModelBakery.registerItemVariants(item, modelLocation); } diff --git a/src/main/java/forestry/core/items/ItemElectronTube.java b/src/main/java/forestry/core/items/ItemElectronTube.java index 63523abe8..001b00d11 100644 --- a/src/main/java/forestry/core/items/ItemElectronTube.java +++ b/src/main/java/forestry/core/items/ItemElectronTube.java @@ -29,7 +29,7 @@ import forestry.core.CreativeTabForestry; import forestry.core.circuits.SolderManager; import forestry.core.config.Config; import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class ItemElectronTube extends ItemOverlay { @@ -50,10 +50,10 @@ public class ItemElectronTube extends ItemOverlay { } } } else { - list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tmi") + ">"); + list.add(EnumChatFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">"); } } else { - list.add("<" + StringUtil.localize("gui.noeffect") + ">"); + list.add("<" + Translator.translateToLocal("for.gui.noeffect") + ">"); } } diff --git a/src/main/java/forestry/core/items/ItemForestry.java b/src/main/java/forestry/core/items/ItemForestry.java index 4b91a6c41..0f9cfc0c5 100755 --- a/src/main/java/forestry/core/items/ItemForestry.java +++ b/src/main/java/forestry/core/items/ItemForestry.java @@ -34,7 +34,7 @@ public class ItemForestry extends Item implements IItemModelRegister { @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - manager.registerItemModel(item, 0, true); + manager.registerItemModel(item, 0); } public ItemStack getItemStack() { diff --git a/src/main/java/forestry/core/items/ItemForestryFood.java b/src/main/java/forestry/core/items/ItemForestryFood.java index 414e7c10a..9c5509a40 100755 --- a/src/main/java/forestry/core/items/ItemForestryFood.java +++ b/src/main/java/forestry/core/items/ItemForestryFood.java @@ -52,7 +52,7 @@ public class ItemForestryFood extends ItemFood implements IItemModelRegister { @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - manager.registerItemModel(item, 0, true); + manager.registerItemModel(item, 0); } } diff --git a/src/main/java/forestry/core/items/ItemOverlay.java b/src/main/java/forestry/core/items/ItemOverlay.java index ba6bdc1a5..39bff47dc 100755 --- a/src/main/java/forestry/core/items/ItemOverlay.java +++ b/src/main/java/forestry/core/items/ItemOverlay.java @@ -67,7 +67,7 @@ public class ItemOverlay extends ItemForestry { @Override public void registerModel(Item item, IModelManager manager) { for (int i = 0; i < overlays.length; i++) { - manager.registerItemModel(item, i, false); + manager.registerItemModel(item, i); } } diff --git a/src/main/java/forestry/core/items/ItemRegistry.java b/src/main/java/forestry/core/items/ItemRegistry.java index 23ca0a01e..e1b694def 100644 --- a/src/main/java/forestry/core/items/ItemRegistry.java +++ b/src/main/java/forestry/core/items/ItemRegistry.java @@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import forestry.core.utils.StringUtil; import forestry.plugins.PluginManager; public abstract class ItemRegistry { @@ -25,7 +24,7 @@ public abstract class ItemRegistry { throw new RuntimeException("Tried to register Item outside of REGISTER"); } item.setUnlocalizedName("for." + name); - GameRegistry.registerItem(item, StringUtil.cleanItemName(item)); + GameRegistry.registerItem(item, name); return item; } diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java index bffefc79c..fafecce68 100644 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -15,6 +15,7 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; +import javax.vecmath.Vector3f; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; @@ -23,12 +24,10 @@ import java.io.StringReader; import java.util.IdentityHashMap; import java.util.Map; -import javax.vecmath.Vector3f; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ModelBlock; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.block.model.ModelBlock; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.IResource; @@ -50,12 +49,12 @@ import net.minecraftforge.client.model.MultiModel; import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.items.ItemCrated; import forestry.core.utils.Log; -import forestry.core.utils.StringUtil; import forestry.storage.PluginStorage; import gnu.trove.map.hash.TIntObjectHashMap; @@ -219,7 +218,8 @@ public class ModelCrate extends BlankItemModel { @Override public IBakedModel handleItemState(ItemStack stack) { ItemCrated crated = (ItemCrated) stack.getItem(); - String crateUID = StringUtil.cleanItemName(crated); + FMLControlledNamespacedRegistry itemRegistry = (FMLControlledNamespacedRegistry) Item.itemRegistry; + String crateUID = itemRegistry.getNameForObject(crated).getResourcePath(); if (crates.get(crateUID) == null) { IFlexibleBakedModel baseBaked = getModel(new ItemStack(PluginStorage.items.crate, 1, 1)); //Set the crate color index to 100 @@ -230,9 +230,9 @@ public class ModelCrate extends BlankItemModel { } return crates.get(crateUID); } - - public IModelState getTransformations(){ - TRSRTransformation thirdperson = TRSRTransformation.blockCenterToCorner(new TRSRTransformation( + + public static IModelState getTransformations() { + TRSRTransformation thirdperson = TRSRTransformation.blockCenterToCorner(new TRSRTransformation( new Vector3f(0, 1f / 16, -3f / 16), TRSRTransformation.quatFromYXZDegrees(new Vector3f(-90, 0, 0)), new Vector3f(0.55f, 0.55f, 0.55f), diff --git a/src/main/java/forestry/core/models/ModelManager.java b/src/main/java/forestry/core/models/ModelManager.java index d8a9ba487..e75ff6381 100644 --- a/src/main/java/forestry/core/models/ModelManager.java +++ b/src/main/java/forestry/core/models/ModelManager.java @@ -19,12 +19,12 @@ import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IRegistry; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; import net.minecraftforge.fml.common.registry.GameData; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -34,7 +34,6 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.core.config.Constants; -import forestry.core.utils.StringUtil; @SideOnly(Side.CLIENT) public class ModelManager implements IModelManager { @@ -63,12 +62,8 @@ public class ModelManager implements IModelManager { } @Override - public void registerItemModel(Item item, int meta, boolean withMeta) { - if (withMeta) { - ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(item, meta)); - } else { - ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(item)); - } + public void registerItemModel(Item item, int meta) { + ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(item)); } @Override @@ -81,19 +76,11 @@ public class ModelManager implements IModelManager { ModelBakery.registerItemVariants(item, resources); } - @Override - public ModelResourceLocation getModelLocation(Item item, int meta) { - return getModelLocation(StringUtil.cleanItemName(new ItemStack(item, 1, meta))); - } - - @Override - public ModelResourceLocation getModelLocation(Item item, int meta, String identifier) { - return getModelLocation(StringUtil.cleanTags(item.getUnlocalizedName(new ItemStack(item, 1, meta))) + identifier); - } - @Override public ModelResourceLocation getModelLocation(Item item) { - return getModelLocation(StringUtil.cleanItemName(item)); + FMLControlledNamespacedRegistry itemRegistry = (FMLControlledNamespacedRegistry) Item.itemRegistry; + String itemName = itemRegistry.getNameForObject(item).getResourcePath(); + return getModelLocation(itemName); } @Override diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index e2164c329..56a9c8000 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -38,6 +38,7 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.client.model.animation.ITimeValue; import net.minecraftforge.common.model.animation.IAnimationStateMachine; +import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; import forestry.apiculture.entities.EntityFXBee; import forestry.apiculture.render.ParticleRenderer; @@ -64,7 +65,6 @@ import forestry.core.tiles.TileBase; import forestry.core.tiles.TileEscritoire; import forestry.core.tiles.TileMill; import forestry.core.tiles.TileNaturalistChest; -import forestry.core.utils.StringUtil; public class ProxyRenderClient extends ProxyRender { @@ -140,7 +140,9 @@ public class ProxyRenderClient extends ProxyRender { @Override public void registerModelCrate(ItemCrated crate) { - ModelResourceLocation modelLocation = new ModelResourceLocation("forestry:crate-filled", StringUtil.cleanItemName(crate)); + FMLControlledNamespacedRegistry itemRegistry = (FMLControlledNamespacedRegistry) Item.itemRegistry; + String cleanItemName = itemRegistry.getNameForObject(crate).getResourcePath(); + ModelResourceLocation modelLocation = new ModelResourceLocation("forestry:crate-filled", cleanItemName); registerModel(new ModelIndex(modelLocation, new ModelCrate())); } diff --git a/src/main/java/forestry/core/recipes/jei/ForestryTooltipCallback.java b/src/main/java/forestry/core/recipes/jei/ForestryTooltipCallback.java index 4ea379620..71dbf329d 100644 --- a/src/main/java/forestry/core/recipes/jei/ForestryTooltipCallback.java +++ b/src/main/java/forestry/core/recipes/jei/ForestryTooltipCallback.java @@ -8,6 +8,8 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import forestry.core.utils.Translator; + import mezz.jei.api.gui.ITooltipCallback; public class ForestryTooltipCallback implements ITooltipCallback { @@ -36,13 +38,13 @@ public class ForestryTooltipCallback implements ITooltipCallback { public void addChanceTooltip(int index, float chance) { if (chance <= 0.0F) { - tooltips.get(index).add(EnumChatFormatting.GRAY + String.format(JEIUtils.translate("chance"), JEIUtils.translate("chance.never"))); + tooltips.get(index).add(EnumChatFormatting.GRAY + String.format(Translator.translateToLocal("forestry.jei.chance"), Translator.translateToLocal("forestry.jei.chance.never"))); } else if (chance < 0.01F) { - tooltips.get(index).add(EnumChatFormatting.GRAY + String.format(JEIUtils.translate("chance"), JEIUtils.translate("chance.lessThan1"))); + tooltips.get(index).add(EnumChatFormatting.GRAY + String.format(Translator.translateToLocal("forestry.jei.chance"), Translator.translateToLocal("forestry.jei.chance.lessThan1"))); } else if (chance != 1.0F) { NumberFormat percentFormat = NumberFormat.getPercentInstance(); percentFormat.setMaximumFractionDigits(2); - tooltips.get(index).add(EnumChatFormatting.GRAY + String.format(JEIUtils.translate("chance"), String.valueOf(percentFormat.format(chance)))); + tooltips.get(index).add(EnumChatFormatting.GRAY + String.format(Translator.translateToLocal("forestry.jei.chance"), String.valueOf(percentFormat.format(chance)))); } } diff --git a/src/main/java/forestry/core/recipes/jei/JEIUtils.java b/src/main/java/forestry/core/recipes/jei/JEIUtils.java index 2a0550d5b..d84992bbc 100644 --- a/src/main/java/forestry/core/recipes/jei/JEIUtils.java +++ b/src/main/java/forestry/core/recipes/jei/JEIUtils.java @@ -17,7 +17,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -27,10 +26,6 @@ import net.minecraftforge.fluids.IFluidContainerItem; public class JEIUtils { - public static String translate(String unlocalized) { - return StatCollector.translateToLocal("forestry.jei." + unlocalized); - } - public static List getItemVariations(ItemStack base) { List variations = new ArrayList<>(); base.getItem().getSubItems(base.getItem(), null, variations); diff --git a/src/main/java/forestry/core/tiles/EscritoireGameToken.java b/src/main/java/forestry/core/tiles/EscritoireGameToken.java index bbeebcf07..0356c2a11 100644 --- a/src/main/java/forestry/core/tiles/EscritoireGameToken.java +++ b/src/main/java/forestry/core/tiles/EscritoireGameToken.java @@ -24,7 +24,7 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.utils.ColourUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class EscritoireGameToken implements INbtWritable, IStreamable { @@ -124,7 +124,7 @@ public class EscritoireGameToken implements INbtWritable, IStreamable { @Nonnull public String getTooltip() { - return tokenStack != null ? tokenStack.getDisplayName() : StringUtil.localize("gui.unknown"); + return tokenStack != null ? tokenStack.getDisplayName() : Translator.translateToLocal("for.gui.unknown"); } public String[] getOverlayIcons() { diff --git a/src/main/java/forestry/core/triggers/Trigger.java b/src/main/java/forestry/core/triggers/Trigger.java index b701b2ec2..eb0ef4715 100755 --- a/src/main/java/forestry/core/triggers/Trigger.java +++ b/src/main/java/forestry/core/triggers/Trigger.java @@ -16,7 +16,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; @@ -26,7 +26,7 @@ import buildcraft.api.statements.StatementManager; public abstract class Trigger implements ITriggerExternal { private final String uid; - private final String unlocalized; + private final String localization; protected Trigger(String uid) { this(uid, uid); @@ -34,7 +34,7 @@ public abstract class Trigger implements ITriggerExternal { protected Trigger(String uid, String localization) { this.uid = "forestry:" + uid; - unlocalized = "trigger." + localization; + this.localization = localization; StatementManager.registerStatement(this); } @@ -45,7 +45,7 @@ public abstract class Trigger implements ITriggerExternal { @Override public String getDescription() { - return StringUtil.localize(unlocalized); + return Translator.translateToLocal("for.trigger." + localization); } @Override @@ -68,7 +68,7 @@ public abstract class Trigger implements ITriggerExternal { @SideOnly(Side.CLIENT) public void registerSprites() { - icon = TextureManager.registerSprite("triggers/" + unlocalized.replace("trigger.", "")); + icon = TextureManager.registerSprite("triggers/" + localization); } @Override diff --git a/src/main/java/forestry/core/utils/ClimateUtil.java b/src/main/java/forestry/core/utils/ClimateUtil.java index 835110d44..256e606a1 100644 --- a/src/main/java/forestry/core/utils/ClimateUtil.java +++ b/src/main/java/forestry/core/utils/ClimateUtil.java @@ -196,11 +196,11 @@ public class ClimateUtil implements IClimateHelper { @Override public String toDisplay(EnumTemperature temperature) { - return StringUtil.localize("gui." + temperature.toString().toLowerCase(Locale.ENGLISH)); + return Translator.translateToLocal("for.gui." + temperature.toString().toLowerCase(Locale.ENGLISH)); } @Override public String toDisplay(EnumHumidity humidity) { - return StringUtil.localize("gui." + humidity.toString().toLowerCase(Locale.ENGLISH)); + return Translator.translateToLocal("for.gui." + humidity.toString().toLowerCase(Locale.ENGLISH)); } } diff --git a/src/main/java/forestry/core/utils/PlayerUtil.java b/src/main/java/forestry/core/utils/PlayerUtil.java index f0d9e29ce..25a1265e4 100644 --- a/src/main/java/forestry/core/utils/PlayerUtil.java +++ b/src/main/java/forestry/core/utils/PlayerUtil.java @@ -49,7 +49,7 @@ public abstract class PlayerUtil { public static String getOwnerName(IOwnable ownable) { GameProfile profile = ownable.getOwner(); if (profile == null) { - return StringUtil.localize("gui.derelict"); + return Translator.translateToLocal("for.gui.derelict"); } else { return profile.getName(); } diff --git a/src/main/java/forestry/core/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java index 5470dcbab..61985faaa 100755 --- a/src/main/java/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -10,68 +10,13 @@ ******************************************************************************/ package forestry.core.utils; -import java.util.IllegalFormatException; - -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import forestry.core.proxy.Proxies; public class StringUtil { - public static boolean canTranslate(String key) { - return StatCollector.canTranslate("for." + key); - } - - public static boolean canTranslateTile(String key) { - return StatCollector.canTranslate("tile.for." + key); - } - - public static String localize(String key) { - return StatCollector.translateToLocal("for." + key).replace("\\n", "\n").replace("@", "%").replace("\\%", "@"); - } - - public static String localizeTile(String key) { - return StatCollector.translateToLocal("tile.for." + key).replace("\\n", "\n").replace("@", "%").replace("\\%", "@"); - } - - public static String localizeAndFormat(String key, Object... args) { - return localizeAndFormatRaw("for." + key, args); - } - - /** - * Same as localizeAndFormat, only without the "for." prefix. Used for specific items. - */ - public static String localizeAndFormatRaw(String key, Object... args) { - String text = StatCollector.translateToLocal(key).replace("\\n", "\n").replace("@", "%").replace("\\%", "@"); - - try { - return String.format(text, args); - } catch (IllegalFormatException ex) { - return "Format error: " + text; - } - } - - public static String cleanTags(String tag) { - return tag.replaceAll("[Ff]orestry\\p{Punct}", "").replaceAll("\\.[Ff]or\\p{Punct}", ".").replaceFirst("^tile\\.", "").replaceFirst("^item\\.", ""); - } - - public static String cleanItemName(ItemStack stack) { - return cleanTags(stack.getUnlocalizedName()); - } - - public static String cleanItemName(Item item) { - return cleanTags(item.getUnlocalizedName()); - } - - public static String cleanBlockName(Block block) { - return cleanTags(block.getUnlocalizedName()); - } - public static String append(String delim, String source, String appendix) { if (source.length() <= 0) { return appendix; diff --git a/src/main/java/forestry/energy/gui/GuiEngine.java b/src/main/java/forestry/energy/gui/GuiEngine.java index b02d01768..f42ffb0b8 100755 --- a/src/main/java/forestry/energy/gui/GuiEngine.java +++ b/src/main/java/forestry/energy/gui/GuiEngine.java @@ -16,7 +16,7 @@ import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.ledgers.Ledger; import forestry.core.render.TextureManager; import forestry.core.tiles.TileEngine; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public abstract class GuiEngine extends GuiForestryTitled { @@ -50,15 +50,15 @@ public abstract class GuiEngine exten return; } - drawHeader(StringUtil.localize("gui.energy"), x + 22, y + 8); + drawHeader(Translator.translateToLocal("for.gui.energy"), x + 22, y + 8); - drawSubheader(StringUtil.localize("gui.currentOutput") + ':', x + 22, y + 20); + drawSubheader(Translator.translateToLocal("for.gui.currentOutput") + ':', x + 22, y + 20); drawText(inventory.getCurrentOutput() + " RF/t", x + 22, y + 32); - drawSubheader(StringUtil.localize("gui.stored") + ':', x + 22, y + 44); + drawSubheader(Translator.translateToLocal("for.gui.stored") + ':', x + 22, y + 44); drawText(inventory.getEnergyManager().getEnergyStored(inventory.getOrientation()) + " RF", x + 22, y + 56); - drawSubheader(StringUtil.localize("gui.heat") + ':', x + 22, y + 68); + drawSubheader(Translator.translateToLocal("for.gui.heat") + ':', x + 22, y + 68); drawText((double) inventory.getHeat() / (double) 10 + 20.0 + " C", x + 22, y + 80); } diff --git a/src/main/java/forestry/energy/gui/widgets/BiogasSlot.java b/src/main/java/forestry/energy/gui/widgets/BiogasSlot.java index c3def307c..bf44715ff 100644 --- a/src/main/java/forestry/energy/gui/widgets/BiogasSlot.java +++ b/src/main/java/forestry/energy/gui/widgets/BiogasSlot.java @@ -16,7 +16,7 @@ import net.minecraftforge.fluids.IFluidTank; import forestry.core.gui.tooltips.ToolTip; import forestry.core.gui.widgets.ReservoirWidget; import forestry.core.gui.widgets.WidgetManager; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class BiogasSlot extends ReservoirWidget { public BiogasSlot(WidgetManager manager, int xPos, int yPos, int slot) { @@ -29,7 +29,7 @@ public class BiogasSlot extends ReservoirWidget { ToolTip toolTip = new ToolTip(); FluidStack fluid = tank.getFluid(); if (fluid == null) { - toolTip.add(StringUtil.localize("gui.empty")); + toolTip.add(Translator.translateToLocal("for.gui.empty")); } else { toolTip.add(fluid.getLocalizedName()); } diff --git a/src/main/java/forestry/factory/triggers/TriggerLowFuel.java b/src/main/java/forestry/factory/triggers/TriggerLowFuel.java index 43e37ada5..8ab539005 100644 --- a/src/main/java/forestry/factory/triggers/TriggerLowFuel.java +++ b/src/main/java/forestry/factory/triggers/TriggerLowFuel.java @@ -24,8 +24,8 @@ public class TriggerLowFuel extends Trigger { private float threshold = 0.25F; - public TriggerLowFuel(String tag, float threshold) { - super(tag, "lowFuel"); + public TriggerLowFuel(String uid, float threshold) { + super(uid, "lowFuel"); this.threshold = threshold; } diff --git a/src/main/java/forestry/farming/gui/FarmLedger.java b/src/main/java/forestry/farming/gui/FarmLedger.java index 254adb27f..4605af9d8 100644 --- a/src/main/java/forestry/farming/gui/FarmLedger.java +++ b/src/main/java/forestry/farming/gui/FarmLedger.java @@ -19,6 +19,7 @@ import forestry.core.gui.ledgers.Ledger; import forestry.core.gui.ledgers.LedgerManager; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class FarmLedger extends Ledger { private final IFarmLedgerDelegate delegate; @@ -52,25 +53,25 @@ public class FarmLedger extends Ledger { return; } - y += drawHeader(StringUtil.localize("gui.hydration"), xHeader, y); + y += drawHeader(Translator.translateToLocal("for.gui.hydration"), xHeader, y); y += 4; - y += drawSubheader(StringUtil.localize("gui.hydr.heat") + ':', xBody, y); + y += drawSubheader(Translator.translateToLocal("for.gui.hydr.heat") + ':', xBody, y); y += 3; y += drawText(StringUtil.floatAsPercent(delegate.getHydrationTempModifier()), xBody, y); y += 3; - y += drawSubheader(StringUtil.localize("gui.hydr.humid") + ':', xBody, y); + y += drawSubheader(Translator.translateToLocal("for.gui.hydr.humid") + ':', xBody, y); y += 3; y += drawText(StringUtil.floatAsPercent(delegate.getHydrationHumidModifier()), xBody, y); y += 3; - y += drawSubheader(StringUtil.localize("gui.hydr.rainfall") + ':', xBody, y); + y += drawSubheader(Translator.translateToLocal("for.gui.hydr.rainfall") + ':', xBody, y); y += 3; y += drawText(StringUtil.floatAsPercent(delegate.getHydrationRainfallModifier()) + " (" + delegate.getDrought() + " d)", xBody, y); y += 3; - y += drawSubheader(StringUtil.localize("gui.hydr.overall") + ':', xBody, y); + y += drawSubheader(Translator.translateToLocal("for.gui.hydr.overall") + ':', xBody, y); y += 3; drawText(StringUtil.floatAsPercent(delegate.getHydrationModifier()), xBody, y); } @@ -78,6 +79,6 @@ public class FarmLedger extends Ledger { @Override public String getTooltip() { float hydrationModifier = delegate.getHydrationModifier(); - return StringUtil.floatAsPercent(hydrationModifier) + ' ' + StringUtil.localize("gui.hydration"); + return StringUtil.floatAsPercent(hydrationModifier) + ' ' + Translator.translateToLocal("for.gui.hydration"); } } \ No newline at end of file diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 203aa1190..293ca5031 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -69,6 +68,7 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.tiles.ILiquidTankTile; import forestry.core.utils.PlayerUtil; +import forestry.core.utils.Translator; import forestry.core.utils.vect.Vect; import forestry.core.utils.vect.VectUtil; import forestry.farming.FarmHelper; @@ -219,7 +219,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen } if (!hasGearbox) { - throw new MultiblockValidationException(StatCollector.translateToLocal("for.multiblock.farm.error.needGearbox")); + throw new MultiblockValidationException(Translator.translateToLocal("for.multiblock.farm.error.needGearbox")); } } @@ -232,14 +232,14 @@ public class FarmController extends RectangularMultiblockControllerBase implemen @Override public void isGoodForExteriorLevel(IMultiblockComponent part, int level) throws MultiblockValidationException { if (level == 2 && !(part instanceof TileFarmPlain)) { - throw new MultiblockValidationException(StatCollector.translateToLocal("for.multiblock.farm.error.needPlainBand")); + throw new MultiblockValidationException(Translator.translateToLocal("for.multiblock.farm.error.needPlainBand")); } } @Override public void isGoodForInterior(IMultiblockComponent part) throws MultiblockValidationException { if (!(part instanceof TileFarmPlain)) { - throw new MultiblockValidationException(StatCollector.translateToLocal("for.multiblock.farm.error.needPlainInterior")); + throw new MultiblockValidationException(Translator.translateToLocal("for.multiblock.farm.error.needPlainInterior")); } } diff --git a/src/main/java/forestry/food/BeverageEffect.java b/src/main/java/forestry/food/BeverageEffect.java index 7709c4240..24f9abdc5 100755 --- a/src/main/java/forestry/food/BeverageEffect.java +++ b/src/main/java/forestry/food/BeverageEffect.java @@ -20,14 +20,15 @@ import net.minecraft.nbt.NBTTagList; import forestry.api.food.BeverageManager; import forestry.api.food.IBeverageEffect; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public abstract class BeverageEffect implements IBeverageEffect { private final int id; - protected String description; + private final String unlocalizedDescription; - protected BeverageEffect(int id) { + protected BeverageEffect(int id, String unlocalizedDescription) { this.id = id; + this.unlocalizedDescription = unlocalizedDescription; if (BeverageManager.effectList[id] != null) { throw new RuntimeException("Beverage effect slot " + id + " was already occupied by " + BeverageManager.effectList[id] + " when trying to add " + this); @@ -48,9 +49,9 @@ public abstract class BeverageEffect implements IBeverageEffect { @Override public String getDescription() { if (getLevel() != null) { - return StringUtil.localize(description) + " " + getLevel(); + return Translator.translateToLocal(unlocalizedDescription) + " " + getLevel(); } else { - return StringUtil.localize(description); + return Translator.translateToLocal(unlocalizedDescription); } } diff --git a/src/main/java/forestry/food/BeverageEffectAntidote.java b/src/main/java/forestry/food/BeverageEffectAntidote.java index 8f1dd870b..0476fa923 100755 --- a/src/main/java/forestry/food/BeverageEffectAntidote.java +++ b/src/main/java/forestry/food/BeverageEffectAntidote.java @@ -19,9 +19,8 @@ public class BeverageEffectAntidote extends BeverageEffect { private float chance = 0.2f; public BeverageEffectAntidote(int id, float chance) { - super(id); + super(id, "for.beverage.effect.antidote"); this.chance = chance; - this.description = "beverage.effect.antidote"; } @Override diff --git a/src/main/java/forestry/food/BeverageEffectDrunk.java b/src/main/java/forestry/food/BeverageEffectDrunk.java index f491a81e0..80bdfcfb7 100755 --- a/src/main/java/forestry/food/BeverageEffectDrunk.java +++ b/src/main/java/forestry/food/BeverageEffectDrunk.java @@ -21,9 +21,8 @@ public class BeverageEffectDrunk extends BeverageEffect { private final float chance; public BeverageEffectDrunk(int id, float chance) { - super(id); + super(id, "for.beverage.effect.alcoholic"); this.chance = chance; - this.description = "beverage.effect.alcoholic"; this.drunkEffect = new PotionEffect(Potion.confusion.id, 25 * 20, 0); } diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java index 2d1dfd9dd..0619bcb6a 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java @@ -34,7 +34,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -42,6 +41,7 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.utils.Translator; public class BlockGreenhouseDoor extends BlockGreenhouse implements IStateMapperRegister { //The door propertys @@ -58,7 +58,7 @@ public class BlockGreenhouseDoor extends BlockGreenhouse implements IStateMappe @Override public String getLocalizedName(){ - return StatCollector.translateToLocal((this.getUnlocalizedName() + ".name").replaceAll("tile", "item")); + return Translator.translateToLocal((this.getUnlocalizedName() + ".name").replaceAll("tile", "item")); } @Override diff --git a/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java b/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java index 42a26c0ef..5b72be164 100644 --- a/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java +++ b/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java @@ -12,14 +12,6 @@ package forestry.greenhouse.gui.widgets; import java.util.Locale; -import forestry.api.core.EnumCamouflageType; -import forestry.api.core.ICamouflageHandler; -import forestry.api.greenhouse.GreenhouseManager; -import forestry.api.multiblock.IMultiblockController; -import forestry.core.gui.tooltips.ToolTip; -import forestry.core.gui.widgets.Widget; -import forestry.core.gui.widgets.WidgetManager; -import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -28,7 +20,16 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; + +import forestry.api.core.EnumCamouflageType; +import forestry.api.core.ICamouflageHandler; +import forestry.api.greenhouse.GreenhouseManager; +import forestry.api.multiblock.IMultiblockController; +import forestry.core.gui.tooltips.ToolTip; +import forestry.core.gui.widgets.Widget; +import forestry.core.gui.widgets.WidgetManager; +import forestry.core.proxy.Proxies; +import forestry.core.utils.Translator; public class WidgetCamouflageSlot extends Widget { @@ -87,14 +88,14 @@ public class WidgetCamouflageSlot extends Widget { toolTip.clear(); String typeName = type.name().toLowerCase(Locale.ENGLISH); if(camouflageHandler instanceof IMultiblockController){ - toolTip.add(StatCollector.translateToLocal("for.gui.empty.slot.camouflage.multiblock." + typeName) + ": "); + toolTip.add(Translator.translateToLocal("for.gui.empty.slot.camouflage.multiblock." + typeName) + ": "); }else{ - toolTip.add(StatCollector.translateToLocal("for.gui.empty.slot.camouflage") + ": "); + toolTip.add(Translator.translateToLocal("for.gui.empty.slot.camouflage") + ": "); } ItemStack camouflageBlock = camouflageHandler.getCamouflageBlock(type); if (camouflageHandler == null || camouflageBlock == null) { - toolTip.add(EnumChatFormatting.ITALIC.toString() + StatCollector.translateToLocal("for.gui.empty")); + toolTip.add(EnumChatFormatting.ITALIC.toString() + Translator.translateToLocal("for.gui.empty")); }else{ toolTip.add(EnumChatFormatting.ITALIC.toString() + camouflageBlock.getTooltip(Proxies.common.getClientInstance().thePlayer, false)); } diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index 1d7c1794d..31db0c082 100644 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -10,25 +10,25 @@ ******************************************************************************/ package forestry.lepidopterology; -import javax.annotation.Nonnull; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import javax.annotation.Nonnull; import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.Map.Entry; +import java.util.Random; import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; + import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; @@ -55,7 +55,7 @@ import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.EntityUtil; import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.lepidopterology.blocks.BlockRegistryLepidopterology; import forestry.lepidopterology.blocks.BlockTypeLepidopterologyTesr; import forestry.lepidopterology.commands.CommandButterfly; @@ -208,7 +208,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { String[] defaultRaritys = butterflyRarity.toArray(new String[butterflyRarity.size()]); Property rarityConf = config.get("butterfly.alleles", "rarity", defaultRaritys); - rarityConf.comment = StringUtil.localize("config.butterfly.alleles.rarity"); + rarityConf.comment = Translator.translateToLocal("for.config.butterfly.alleles.rarity"); String[] configRaritys = rarityConf.getStringList(); for(String rarity : configRaritys){ @@ -247,7 +247,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { String[] defaultLoot = lootList.toArray(new String[lootList.size()]); Property lootConf = config.get("butterfly.cocoons.alleles.loot", cocoon.getUID(), defaultLoot); - lootConf.comment = StringUtil.localize("config.butterfly.alleles.loot"); + lootConf.comment = Translator.translateToLocal("for.config.butterfly.alleles.loot"); String[] configLoot = lootConf.getStringList(); for(String loot : configLoot){ diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index b92ae72d0..ec8b00a6d 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -50,7 +50,7 @@ import forestry.api.lepidopterology.IEntityButterfly; import forestry.core.genetics.Chromosome; import forestry.core.genetics.GenericRatings; import forestry.core.genetics.IndividualLiving; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.lepidopterology.PluginLepidopterology; public class Butterfly extends IndividualLiving implements IButterfly { @@ -87,15 +87,15 @@ public class Butterfly extends IndividualLiving implements IButterfly { IAlleleButterflySpecies primary = genome.getPrimary(); IAlleleButterflySpecies secondary = genome.getSecondary(); if (!isPureBred(EnumButterflyChromosome.SPECIES)) { - list.add(EnumChatFormatting.BLUE + StringUtil.localize("butterflies.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName())); + list.add(EnumChatFormatting.BLUE + Translator.translateToLocal("for.butterflies.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName())); } if (getMate() != null) { - list.add(EnumChatFormatting.RED + StringUtil.localize("gui.fecundated").toUpperCase(Locale.ENGLISH)); + list.add(EnumChatFormatting.RED + Translator.translateToLocal("for.gui.fecundated").toUpperCase(Locale.ENGLISH)); } list.add(EnumChatFormatting.YELLOW + genome.getActiveAllele(EnumButterflyChromosome.SIZE).getName()); list.add(EnumChatFormatting.DARK_GREEN + genome.getActiveAllele(EnumButterflyChromosome.SPEED).getName()); - list.add(genome.getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName() + ' ' + StringUtil.localize("gui.life")); + list.add(genome.getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName() + ' ' + Translator.translateToLocal("for.gui.life")); IAlleleTolerance tempTolerance = (IAlleleTolerance) getGenome().getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE); list.add(EnumChatFormatting.GREEN + "T: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + tempTolerance.getName()); @@ -106,7 +106,7 @@ public class Butterfly extends IndividualLiving implements IButterfly { list.add(EnumChatFormatting.RED + GenericRatings.rateActivityTime(genome.getNocturnal(), genome.getPrimary().isNocturnal())); if (genome.getTolerantFlyer()) { - list.add(EnumChatFormatting.WHITE + StringUtil.localize("gui.flyer.tooltip")); + list.add(EnumChatFormatting.WHITE + Translator.translateToLocal("for.gui.flyer.tooltip")); } } diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java index b92bae60b..92f105e86 100755 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -29,6 +29,7 @@ import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.genetics.ButterflyGenome; import forestry.lepidopterology.inventory.ItemInventoryFlutterlyzer; @@ -36,7 +37,7 @@ import forestry.lepidopterology.inventory.ItemInventoryFlutterlyzer; public class GuiFlutterlyzer extends GuiAlyzer { public GuiFlutterlyzer(EntityPlayer player, ItemInventoryFlutterlyzer inventory) { - super(ButterflyManager.butterflyRoot, player, new ContainerAlyzer(inventory, player), inventory, "gui.flutterlyzer"); + super(ButterflyManager.butterflyRoot, player, new ContainerAlyzer(inventory, player), inventory, "for.gui.flutterlyzer"); ArrayList butterflyList = new ArrayList<>(); PluginLepidopterology.items.butterflyGE.addCreativeItems(butterflyList, false); @@ -96,33 +97,33 @@ public class GuiFlutterlyzer extends GuiAlyzer { private void drawAnalyticsPage1(IButterfly butterfly) { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - textLayout.drawLine(StringUtil.localize("gui.active"), COLUMN_1); - textLayout.drawLine(StringUtil.localize("gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); textLayout.newLine(); textLayout.newLine(); - drawSpeciesRow(StringUtil.localize("gui.species"), butterfly, EnumButterflyChromosome.SPECIES, null, null); + drawSpeciesRow(Translator.translateToLocal("for.gui.species"), butterfly, EnumButterflyChromosome.SPECIES, null, null); textLayout.newLine(); - drawRow(StringUtil.localize("gui.size"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SIZE).getName(), + drawRow(Translator.translateToLocal("for.gui.size"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SIZE).getName(), butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.SIZE).getName(), butterfly, EnumButterflyChromosome.SPEED); textLayout.newLine(); - drawRow(StringUtil.localize("gui.lifespan"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName(), + drawRow(Translator.translateToLocal("for.gui.lifespan"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName(), butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.LIFESPAN).getName(), butterfly, EnumButterflyChromosome.LIFESPAN); textLayout.newLine(); - drawRow(StringUtil.localize("gui.speed"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SPEED).getName(), + drawRow(Translator.translateToLocal("for.gui.speed"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SPEED).getName(), butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.SPEED).getName(), butterfly, EnumButterflyChromosome.SPEED); textLayout.newLine(); - drawRow(StringUtil.localize("gui.metabolism"), GenericRatings.rateMetabolism(butterfly.getGenome().getMetabolism()), + drawRow(Translator.translateToLocal("for.gui.metabolism"), GenericRatings.rateMetabolism(butterfly.getGenome().getMetabolism()), GenericRatings.rateMetabolism(((IAlleleInteger) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.METABOLISM)).getValue()), butterfly, EnumButterflyChromosome.METABOLISM); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.fertility"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.fertility"), COLUMN_0); drawFertilityInfo(butterfly.getGenome().getFertility(), COLUMN_1, getColorCoding(butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.FERTILITY) .isDominant()), 8); drawFertilityInfo(((IAlleleInteger) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FERTILITY)).getValue(), COLUMN_2, getColorCoding(butterfly @@ -130,12 +131,12 @@ public class GuiFlutterlyzer extends GuiAlyzer { textLayout.newLine(); - drawRow(StringUtil.localize("gui.flowers"), butterfly.getGenome().getFlowerProvider().getDescription(), + drawRow(Translator.translateToLocal("for.gui.flowers"), butterfly.getGenome().getFlowerProvider().getDescription(), ((IAlleleFlowers) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FLOWER_PROVIDER)).getProvider() .getDescription(), butterfly, EnumButterflyChromosome.FLOWER_PROVIDER); textLayout.newLine(); - drawRow(StringUtil.localize("gui.effect"), butterfly.getGenome().getEffect().getName(), + drawRow(Translator.translateToLocal("for.gui.effect"), butterfly.getGenome().getEffect().getName(), butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.EFFECT).getName(), butterfly, EnumButterflyChromosome.EFFECT); @@ -147,39 +148,39 @@ public class GuiFlutterlyzer extends GuiAlyzer { private void drawAnalyticsPage2(IButterfly butterfly) { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - textLayout.drawLine(StringUtil.localize("gui.active"), COLUMN_1); - textLayout.drawLine(StringUtil.localize("gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); textLayout.newLine(); textLayout.newLine(); - drawRow(StringUtil.localize("gui.climate"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), + drawRow(Translator.translateToLocal("for.gui.climate"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), butterfly, EnumButterflyChromosome.SPECIES); textLayout.newLine(); IAlleleTolerance tempToleranceActive = (IAlleleTolerance) butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE); IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE); - textLayout.drawLine(" " + StringUtil.localize("gui.tolerance"), COLUMN_0); + textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), COLUMN_0); drawToleranceInfo(tempToleranceActive, COLUMN_1); drawToleranceInfo(tempToleranceInactive, COLUMN_2); textLayout.newLine(); - drawRow(StringUtil.localize("gui.humidity"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), + drawRow(Translator.translateToLocal("for.gui.humidity"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), butterfly, EnumButterflyChromosome.SPECIES); textLayout.newLine(); IAlleleTolerance humidToleranceActive = (IAlleleTolerance) butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE); IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE); - textLayout.drawLine(" " + StringUtil.localize("gui.tolerance"), COLUMN_0); + textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), COLUMN_0); drawToleranceInfo(humidToleranceActive, COLUMN_1); drawToleranceInfo(humidToleranceInactive, COLUMN_2); textLayout.newLine(); textLayout.newLine(); - String yes = StringUtil.localize("yes"); - String no = StringUtil.localize("no"); + String yes = Translator.translateToLocal("for.yes"); + String no = Translator.translateToLocal("for.no"); String diurnal0, diurnal1, nocturnal0, nocturnal1; if (butterfly.getGenome().getNocturnal()) { @@ -195,12 +196,12 @@ public class GuiFlutterlyzer extends GuiAlyzer { diurnal1 = !butterfly.getGenome().getSecondary().isNocturnal() ? yes : no; } - textLayout.drawLine(StringUtil.localize("gui.diurnal"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.diurnal"), COLUMN_0); textLayout.drawLine(diurnal0, COLUMN_1, getColorCoding(false)); textLayout.drawLine(diurnal1, COLUMN_2, getColorCoding(false)); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.nocturnal"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.nocturnal"), COLUMN_0); textLayout.drawLine(nocturnal0, COLUMN_1, getColorCoding(false)); textLayout.drawLine(nocturnal1, COLUMN_2, getColorCoding(false)); textLayout.newLine(); @@ -209,14 +210,14 @@ public class GuiFlutterlyzer extends GuiAlyzer { String secondary = StringUtil.readableBoolean(((AlleleBoolean) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.TOLERANT_FLYER)).getValue(), yes, no); - drawRow(StringUtil.localize("gui.flyer"), primary, secondary, butterfly, EnumButterflyChromosome.TOLERANT_FLYER); + drawRow(Translator.translateToLocal("for.gui.flyer"), primary, secondary, butterfly, EnumButterflyChromosome.TOLERANT_FLYER); textLayout.newLine(); primary = StringUtil.readableBoolean(butterfly.getGenome().getFireResist(), yes, no); secondary = StringUtil.readableBoolean(((AlleleBoolean) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FIRE_RESIST)).getValue(), yes, no); - drawRow(StringUtil.localize("gui.fireresist"), primary, secondary, butterfly, EnumButterflyChromosome.FIRE_RESIST); + drawRow(Translator.translateToLocal("for.gui.fireresist"), primary, secondary, butterfly, EnumButterflyChromosome.FIRE_RESIST); textLayout.endPage(); } @@ -225,7 +226,7 @@ public class GuiFlutterlyzer extends GuiAlyzer { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - textLayout.drawLine(StringUtil.localize("gui.loot.butterfly") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.loot.butterfly") + ":", COLUMN_0); textLayout.newLine(); int x = COLUMN_0; @@ -241,7 +242,7 @@ public class GuiFlutterlyzer extends GuiAlyzer { textLayout.newLine(); textLayout.newLine(); - textLayout.drawLine(StringUtil.localize("gui.loot.caterpillar") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.loot.caterpillar") + ":", COLUMN_0); textLayout.newLine(); x = COLUMN_0; diff --git a/src/main/java/forestry/mail/Letter.java b/src/main/java/forestry/mail/Letter.java index 1d627bc65..d2992942a 100755 --- a/src/main/java/forestry/mail/Letter.java +++ b/src/main/java/forestry/mail/Letter.java @@ -25,7 +25,7 @@ import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.InventoryUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class Letter implements ILetter { public static final short SLOT_ATTACHMENT_1 = 0; @@ -241,10 +241,10 @@ public class Letter implements ILetter { @Override public void addTooltip(List list) { if (this.sender != null && StringUtils.isNotBlank(this.sender.getName())) { - list.add(StringUtil.localize("gui.mail.from") + ": " + this.sender.getName()); + list.add(Translator.translateToLocal("for.gui.mail.from") + ": " + this.sender.getName()); } if (this.recipient != null && this.recipient.length > 0) { - list.add(StringUtil.localize("gui.mail.to") + ": " + this.getRecipientString()); + list.add(Translator.translateToLocal("for.gui.mail.to") + ": " + this.getRecipientString()); } } diff --git a/src/main/java/forestry/mail/PostalCarrier.java b/src/main/java/forestry/mail/PostalCarrier.java index 67023797f..08b330458 100755 --- a/src/main/java/forestry/mail/PostalCarrier.java +++ b/src/main/java/forestry/mail/PostalCarrier.java @@ -29,7 +29,7 @@ import forestry.api.mail.PostManager; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; import forestry.core.utils.PlayerUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.mail.network.packets.PacketPOBoxInfoUpdate; public class PostalCarrier implements IPostalCarrier { @@ -49,7 +49,7 @@ public class PostalCarrier implements IPostalCarrier { @Override public String getName() { - return StringUtil.localize("gui.addressee." + type); + return Translator.translateToLocal("for.gui.addressee." + type); } @Override diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index 9ada6ba70..c64f0bd75 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -36,7 +36,7 @@ import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.InventoryUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.PlayerUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.mail.inventory.InventoryTradeStation; import forestry.mail.items.EnumStampDefinition; @@ -210,7 +210,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve // Prepare the letter ILetter mail = new Letter(this.address, letter.getSender()); - mail.setText(StringUtil.localize("gui.mail.order.attached")); + mail.setText(Translator.translateToLocal("for.gui.mail.order.attached")); for (int i = 0; i < ordersToFillCount; i++) { mail.addAttachment(inventory.getStackInSlot(SLOT_TRADEGOOD).copy()); } @@ -272,9 +272,9 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve String orderFilledMessage; if (ordersToFillCount == 1) { - orderFilledMessage = StringUtil.localize("gui.mail.order.filled.one"); + orderFilledMessage = Translator.translateToLocal("for.gui.mail.order.filled.one"); } else { - orderFilledMessage = StringUtil.localize("gui.mail.order.filled.multiple"); + orderFilledMessage = Translator.translateToLocal("for.gui.mail.order.filled.multiple"); orderFilledMessage = orderFilledMessage.replace("%COUNT", Integer.toString(ordersToFillCount)); } diff --git a/src/main/java/forestry/mail/gui/GuiCatalogue.java b/src/main/java/forestry/mail/gui/GuiCatalogue.java index ef09ab118..4ad9cafab 100755 --- a/src/main/java/forestry/mail/gui/GuiCatalogue.java +++ b/src/main/java/forestry/mail/gui/GuiCatalogue.java @@ -28,7 +28,7 @@ import forestry.core.config.SessionVars; import forestry.core.gui.GuiForestry; import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.gui.widgets.Widget; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class GuiCatalogue extends GuiForestry { @@ -55,10 +55,10 @@ public class GuiCatalogue extends GuiForestry { buttonList.add(new GuiButton(2, width / 2 + 44, guiTop + 150, 12, 20, ">")); buttonList.add(new GuiButton(3, width / 2 - 58, guiTop + 150, 12, 20, "<")); - buttonFilter = new GuiButton(4, width / 2 - 44, guiTop + 150, 42, 20, StringUtil.localize("gui.mail.filter.all")); + buttonFilter = new GuiButton(4, width / 2 - 44, guiTop + 150, 42, 20, Translator.translateToLocal("for.gui.mail.filter.all")); buttonList.add(buttonFilter); - buttonUse = new GuiButton(5, width / 2, guiTop + 150, 42, 20, StringUtil.localize("gui.mail.address.copy")); + buttonUse = new GuiButton(5, width / 2, guiTop + 150, 42, 20, Translator.translateToLocal("for.gui.mail.address.copy")); buttonList.add(buttonUse); } @@ -86,22 +86,22 @@ public class GuiCatalogue extends GuiForestry { buttonUse.enabled = false; } - buttonFilter.displayString = StringUtil.localize("gui.mail.filter." + container.getFilterIdent()); + buttonFilter.displayString = Translator.translateToLocal("for.gui.mail.filter." + container.getFilterIdent()); } private void drawNoTrade(int x, int y) { - fontRendererObj.drawSplitString(StringUtil.localize("gui.mail.notrades"), x, y + 18, 119, fontColor.get("gui.book")); + fontRendererObj.drawSplitString(Translator.translateToLocal("for.gui.mail.notrades"), x, y + 18, 119, fontColor.get("gui.book")); } private void drawTradePreview(TradeStationInfo tradeInfo, int x, int y) { fontRendererObj.drawString(boldUnderline + tradeInfo.address.getName(), x, y, fontColor.get("gui.book")); - fontRendererObj.drawString(String.format(StringUtil.localize("gui.mail.willtrade"), tradeInfo.owner.getName()), x, y + 18, fontColor.get("gui.book")); + fontRendererObj.drawString(String.format(Translator.translateToLocal("for.gui.mail.willtrade"), tradeInfo.owner.getName()), x, y + 18, fontColor.get("gui.book")); addTradeInfoWidget(new ItemStackWidget(widgetManager, x - guiLeft, y - guiTop + 28, tradeInfo.tradegood)); - fontRendererObj.drawString(StringUtil.localize("gui.mail.tradefor"), x, y + 46, fontColor.get("gui.book")); + fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.tradefor"), x, y + 46, fontColor.get("gui.book")); for (int i = 0; i < tradeInfo.required.length; i++) { ItemStack itemStack = tradeInfo.required[i]; @@ -109,9 +109,9 @@ public class GuiCatalogue extends GuiForestry { } if (tradeInfo.state.isOk()) { - fontRendererObj.drawSplitString(EnumChatFormatting.DARK_GREEN + StringUtil.localize("chat.mail." + tradeInfo.state.getIdentifier()), x, y + 82, 119, fontColor.get("gui.book")); + fontRendererObj.drawSplitString(EnumChatFormatting.DARK_GREEN + Translator.translateToLocal("for.chat.mail." + tradeInfo.state.getIdentifier()), x, y + 82, 119, fontColor.get("gui.book")); } else { - fontRendererObj.drawSplitString(EnumChatFormatting.DARK_RED + StringUtil.localize("chat.mail." + tradeInfo.state.getIdentifier()), x, y + 82, 119, fontColor.get("gui.book")); + fontRendererObj.drawSplitString(EnumChatFormatting.DARK_RED + Translator.translateToLocal("for.chat.mail." + tradeInfo.state.getIdentifier()), x, y + 82, 119, fontColor.get("gui.book")); } } diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index 4f5864e8f..247d13b09 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -29,7 +29,7 @@ import forestry.core.gui.GuiTextBox; import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.gui.widgets.Widget; import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.mail.gui.widgets.AddresseeSlot; import forestry.mail.inventory.ItemInventoryLetter; import forestry.mail.network.packets.PacketLetterInfoRequest; @@ -163,23 +163,23 @@ public class GuiLetter extends GuiForestry String infoString = null; if (container.getTradeInfo() == null) { - infoString = "gui.mail.notrader"; + infoString = "for.gui.mail.notrader"; } else if (container.getTradeInfo().tradegood == null) { - infoString = "gui.mail.nothingtotrade"; + infoString = "for.gui.mail.nothingtotrade"; } else if (!container.getTradeInfo().state.isOk()) { - infoString = "chat.mail." + container.getTradeInfo().state.getIdentifier(); + infoString = "for.chat.mail." + container.getTradeInfo().state.getIdentifier(); } if (infoString != null) { - fontRendererObj.drawSplitString(StringUtil.localize(infoString), guiLeft + x, guiTop + y, 119, fontColor.get("gui.mail.lettertext")); + fontRendererObj.drawSplitString(Translator.translateToLocal(infoString), guiLeft + x, guiTop + y, 119, fontColor.get("gui.mail.lettertext")); return; } - fontRendererObj.drawString(StringUtil.localize("gui.mail.pleasesend"), guiLeft + x, guiTop + y, fontColor.get("gui.mail.lettertext")); + fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.pleasesend"), guiLeft + x, guiTop + y, fontColor.get("gui.mail.lettertext")); addTradeInfoWidget(new ItemStackWidget(widgetManager, x, y + 10, container.getTradeInfo().tradegood)); - fontRendererObj.drawString(StringUtil.localize("gui.mail.foreveryattached"), guiLeft + x, guiTop + y + 28, fontColor.get("gui.mail.lettertext")); + fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.foreveryattached"), guiLeft + x, guiTop + y + 28, fontColor.get("gui.mail.lettertext")); for (int i = 0; i < container.getTradeInfo().required.length; i++) { addTradeInfoWidget(new ItemStackWidget(widgetManager, x + i * 18, y + 38, container.getTradeInfo().required[i])); diff --git a/src/main/java/forestry/mail/gui/GuiTradeName.java b/src/main/java/forestry/mail/gui/GuiTradeName.java index 97cbcd756..3b535c2a9 100755 --- a/src/main/java/forestry/mail/gui/GuiTradeName.java +++ b/src/main/java/forestry/mail/gui/GuiTradeName.java @@ -21,7 +21,7 @@ import org.lwjgl.input.Keyboard; import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.mail.network.packets.PacketTraderAddressRequest; import forestry.mail.tiles.TileTrader; @@ -72,7 +72,7 @@ public class GuiTradeName extends GuiForestry { protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { super.drawGuiContainerBackgroundLayer(var1, var2, var3); - String prompt = StringUtil.localize("gui.mail.nametrader"); + String prompt = Translator.translateToLocal("for.gui.mail.nametrader"); textLayout.startPage(); textLayout.newLine(); textLayout.drawCenteredLine(prompt, 0, fontColor.get("gui.mail.text")); diff --git a/src/main/java/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java index 6b06598a0..fa4da2a33 100755 --- a/src/main/java/forestry/mail/gui/GuiTrader.java +++ b/src/main/java/forestry/mail/gui/GuiTrader.java @@ -11,11 +11,10 @@ package forestry.mail.gui; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.StatCollector; import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.mail.tiles.TileTrader; public class GuiTrader extends GuiForestry { @@ -28,13 +27,13 @@ public class GuiTrader extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - String name = StatCollector.translateToLocal(inventory.getUnlocalizedTitle()); + String name = Translator.translateToLocal(inventory.getUnlocalizedTitle()); this.fontRendererObj.drawString(name, textLayout.getCenteredOffset(name), 6, fontColor.get("gui.mail.text")); - String receive = StringUtil.localize("gui.mail.receive"); + String receive = Translator.translateToLocal("for.gui.mail.receive"); this.fontRendererObj.drawString(receive, textLayout.getCenteredOffset(receive, 70) + 51, 45, fontColor.get("gui.mail.text")); - String send = StringUtil.localize("gui.mail.send"); + String send = Translator.translateToLocal("for.gui.mail.send"); this.fontRendererObj.drawString(send, textLayout.getCenteredOffset(send, 70) + 51, 99, fontColor.get("gui.mail.text")); super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java b/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java index 261b49644..60e0c7978 100644 --- a/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java +++ b/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java @@ -19,7 +19,7 @@ import forestry.core.gui.tooltips.ToolTip; import forestry.core.gui.widgets.Widget; import forestry.core.gui.widgets.WidgetManager; import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.mail.gui.ContainerLetter; public class AddresseeSlot extends Widget { @@ -45,7 +45,7 @@ public class AddresseeSlot extends Widget { @Override public ToolTip getToolTip(int mouseX, int mouseY) { - String tooltipString = StringUtil.localize("gui.addressee." + containerLetter.getCarrierType()); + String tooltipString = Translator.translateToLocal("for.gui.addressee." + containerLetter.getCarrierType()); ToolTip tooltip = new ToolTip(); tooltip.add(tooltipString); return tooltip; diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index dc09f1d89..8e5004434 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; import forestry.api.mail.ILetter; import forestry.core.items.ItemWithGui; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.mail.Letter; import forestry.mail.LetterProperties; import forestry.mail.gui.ContainerLetter; @@ -67,7 +67,7 @@ public class ItemLetter extends ItemWithGui { public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { NBTTagCompound nbttagcompound = itemstack.getTagCompound(); if (nbttagcompound == null) { - list.add('<' + StringUtil.localize("gui.blank") + '>'); + list.add('<' + Translator.translateToLocal("for.gui.blank") + '>'); return; } diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 1a235a66a..3e565ed03 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -29,7 +29,6 @@ import net.minecraft.command.CommandHandler; import net.minecraft.command.ICommand; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -49,6 +48,7 @@ import forestry.core.ISaveEventHandler; import forestry.core.PluginCore; import forestry.core.network.IPacketRegistry; import forestry.core.utils.Log; +import forestry.core.utils.Translator; public class PluginManager { @@ -309,7 +309,7 @@ public class PluginManager { private static boolean isEnabled(Configuration config, IForestryPlugin plugin) { ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); - String comment = StatCollector.translateToLocal(info.unlocalizedDescription()); + String comment = Translator.translateToLocal(info.unlocalizedDescription()); Property prop = config.get(CATEGORY_PLUGINS, info.pluginID(), true, comment); boolean enabled = prop.getBoolean(); diff --git a/src/main/java/forestry/storage/BackpackDefinition.java b/src/main/java/forestry/storage/BackpackDefinition.java index 78f475e52..224cb5d5f 100755 --- a/src/main/java/forestry/storage/BackpackDefinition.java +++ b/src/main/java/forestry/storage/BackpackDefinition.java @@ -20,7 +20,6 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; @@ -28,6 +27,7 @@ import forestry.api.apiculture.BeeManager; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.storage.IBackpackDefinition; import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.Translator; public class BackpackDefinition implements IBackpackDefinition { @@ -51,7 +51,7 @@ public class BackpackDefinition implements IBackpackDefinition { @Override public String getName(ItemStack backpack) { Item item = backpack.getItem(); - String display = StatCollector.translateToLocal(item.getUnlocalizedNameInefficiently(backpack) + ".name").trim(); + String display = Translator.translateToLocal(item.getUnlocalizedNameInefficiently(backpack) + ".name").trim(); if (backpack.hasTagCompound() && backpack.getTagCompound().hasKey("display", 10)) { NBTTagCompound nbt = backpack.getTagCompound().getCompoundTag("display"); diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java index d99abea83..fc8511eb9 100644 --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -20,7 +20,6 @@ import forestry.api.storage.ICrateRegistry; import forestry.core.items.ItemCrated; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; -import forestry.core.utils.StringUtil; public class CrateRegistry implements ICrateRegistry { @@ -37,7 +36,7 @@ public class CrateRegistry implements ICrateRegistry { ItemCrated crate = new ItemCrated(stack, useOreDict); crate.setUnlocalizedName(uid); - GameRegistry.registerItem(crate, StringUtil.cleanItemName(crate)); + GameRegistry.registerItem(crate, uid); Proxies.render.registerModelCrate(crate); PluginStorage.registerCrate(crate); } diff --git a/src/main/java/forestry/storage/PluginStorage.java b/src/main/java/forestry/storage/PluginStorage.java index 178a38d0f..a73cf9d0f 100644 --- a/src/main/java/forestry/storage/PluginStorage.java +++ b/src/main/java/forestry/storage/PluginStorage.java @@ -73,7 +73,7 @@ import forestry.core.recipes.RecipeUtil; import forestry.core.utils.IMCUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.blocks.BlockRegistryLepidopterology; import forestry.lepidopterology.blocks.BlockTypeLepidopterologyTesr; @@ -375,7 +375,7 @@ public class PluginStorage extends BlankForestryPlugin { String[] defaultValidItems = validItems.toArray(new String[validItems.size()]); Property backpackConf = config.get("backpacks." + backpackName, "item.stacks", defaultValidItems); - backpackConf.comment = StringUtil.localizeAndFormat("config.backpacks.item.stacks.format", backpackName); + backpackConf.comment = Translator.translateToLocalFormatted("for.config.backpacks.item.stacks.format", backpackName); String[] backpackItemList = backpackConf.getStringList(); backpackItems = ItemStackUtil.parseItemStackStrings(backpackItemList, OreDictionary.WILDCARD_VALUE); @@ -395,7 +395,7 @@ public class PluginStorage extends BlankForestryPlugin { defaultOreNames = defaultOreNamesList.toArray(new String[defaultOreNamesList.size()]); Property backpackConf = config.get("backpacks." + backpackName, "ore.dict", defaultOreNames); - backpackConf.comment = StringUtil.localizeAndFormat("config.backpacks.ore.dict.format", backpackName); + backpackConf.comment = Translator.translateToLocalFormatted("for.config.backpacks.ore.dict.format", backpackName); String[] oreDictNameList = backpackConf.getStringList(); Collections.addAll(backpackOreDict, oreDictNameList); diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index 8efe11753..83df40424 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -29,6 +29,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IModelManager; import forestry.api.storage.BackpackStowEvent; import forestry.api.storage.EnumBackpackType; @@ -42,7 +43,7 @@ import forestry.core.inventory.iterators.InventoryIterator; import forestry.core.items.ItemWithGui; import forestry.core.tiles.TileUtil; import forestry.core.utils.InventoryUtil; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; import forestry.storage.BackpackMode; import forestry.storage.gui.ContainerBackpack; import forestry.storage.gui.GuiBackpack; @@ -212,13 +213,13 @@ public class ItemBackpack extends ItemWithGui { BackpackMode mode = getMode(itemstack); if (mode == BackpackMode.LOCKED) { - list.add(StringUtil.localize("storage.backpack.mode.locked")); + list.add(Translator.translateToLocal("for.storage.backpack.mode.locked")); } else if (mode == BackpackMode.RECEIVE) { - list.add(StringUtil.localize("storage.backpack.mode.receiving")); + list.add(Translator.translateToLocal("for.storage.backpack.mode.receiving")); } else if (mode == BackpackMode.RESUPPLY) { - list.add(StringUtil.localize("storage.backpack.mode.resupply")); + list.add(Translator.translateToLocal("for.storage.backpack.mode.resupply")); } - list.add(StringUtil.localize("gui.slots").replaceAll("%USED", String.valueOf(occupied)).replaceAll("%SIZE", String.valueOf(getBackpackSize()))); + list.add(Translator.translateToLocal("for.gui.slots").replaceAll("%USED", String.valueOf(occupied)).replaceAll("%SIZE", String.valueOf(getBackpackSize()))); }