diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index e957459f..9e48cee4 100644 --- a/src/main/java/binnie/Binnie.java +++ b/src/main/java/binnie/Binnie.java @@ -5,7 +5,6 @@ import java.util.List; import binnie.core.ManagerBase; import binnie.core.genetics.ManagerGenetics; -import binnie.core.language.ManagerLanguage; import binnie.core.liquid.ManagerLiquid; import binnie.core.machines.ManagerMachine; import binnie.core.mod.config.ManagerConfig; @@ -13,7 +12,6 @@ import binnie.core.resource.ManagerResource; public final class Binnie { public static final List MANAGERS = new ArrayList<>(); - public static final ManagerLanguage LANGUAGE = new ManagerLanguage(); public static final ManagerGenetics GENETICS = new ManagerGenetics(); public static final ManagerConfig CONFIGURATION = new ManagerConfig(); public static final ManagerLiquid LIQUID = new ManagerLiquid(); diff --git a/src/main/java/binnie/botany/CreativeTabBotany.java b/src/main/java/binnie/botany/CreativeTabBotany.java index 092497aa..37cca468 100644 --- a/src/main/java/binnie/botany/CreativeTabBotany.java +++ b/src/main/java/binnie/botany/CreativeTabBotany.java @@ -7,6 +7,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import binnie.core.util.I18N; + public class CreativeTabBotany extends CreativeTabs { public static CreativeTabs instance = new CreativeTabBotany(); @@ -28,7 +30,7 @@ public class CreativeTabBotany extends CreativeTabs { @Override @SideOnly(Side.CLIENT) public String getTabLabel() { - return Botany.proxy.localise("tab.botany"); + return I18N.localise("botany.tab.botany"); } @Override diff --git a/src/main/java/binnie/botany/api/EnumAcidity.java b/src/main/java/binnie/botany/api/EnumAcidity.java index 14c67a85..80147bbb 100644 --- a/src/main/java/binnie/botany/api/EnumAcidity.java +++ b/src/main/java/binnie/botany/api/EnumAcidity.java @@ -12,7 +12,7 @@ public enum EnumAcidity implements IStringSerializable { ALKALINE(TextFormatting.AQUA); @Nullable - final TextFormatting color; + TextFormatting color; EnumAcidity(@Nullable TextFormatting color) { this.color = color; @@ -23,7 +23,11 @@ public enum EnumAcidity implements IStringSerializable { return this.name().toLowerCase(); } - public String getTranslated(boolean withColor) { - return (withColor && color != null ? color : "") + I18n.translateToLocal("botany.ph." + getName()); + public String getLocalisedName(boolean withColor) { + String localisedName = I18n.translateToLocal("botany.ph." + getName()); + if(withColor && color != null){ + localisedName +=color; + } + return localisedName; } } diff --git a/src/main/java/binnie/botany/api/EnumMoisture.java b/src/main/java/binnie/botany/api/EnumMoisture.java index 649d1082..1b52c576 100644 --- a/src/main/java/binnie/botany/api/EnumMoisture.java +++ b/src/main/java/binnie/botany/api/EnumMoisture.java @@ -23,7 +23,11 @@ public enum EnumMoisture implements IStringSerializable { return name().toLowerCase(); } - public String getTranslated(boolean withColor) { - return (withColor && color != null ? color : "") + I18n.translateToLocal("botany.moisture." + getName()); + public String getLocalisedName(boolean withColor) { + String localisedName = I18n.translateToLocal("botany.moisture." + getName()); + if(withColor && color != null){ + localisedName +=color; + } + return localisedName; } } diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index d4ed7b5a..e8b01c00 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -34,12 +34,12 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.blocks.IColoredBlock; -import binnie.Binnie; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; public class BlockStainedGlass extends Block implements IBlockMetadata, IColoredBlock, IItemModelRegister { public BlockStainedGlass() { @@ -79,10 +79,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); Block block = iblockstate.getBlock(); - if (block != this) { - return true; - } - return false; + return block != this; } @Override @@ -141,7 +138,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored @Override public String getDisplayName(final ItemStack itemStack) { final int meta = TileEntityMetadata.getItemDamage(itemStack); - return EnumFlowerColor.get(meta).getFlowerColorAllele().getColourName() + " " + Binnie.LANGUAGE.localise("tile.botany.pigmented.glass.name"); + return EnumFlowerColor.get(meta).getFlowerColorAllele().getColourName() + " " + I18N.localise("tile.botany.pigmented.glass.name"); } @Override diff --git a/src/main/java/binnie/botany/core/ModuleCore.java b/src/main/java/binnie/botany/core/ModuleCore.java index b1f740e5..8377db43 100644 --- a/src/main/java/binnie/botany/core/ModuleCore.java +++ b/src/main/java/binnie/botany/core/ModuleCore.java @@ -1,25 +1,10 @@ package binnie.botany.core; -import binnie.Binnie; -import binnie.botany.Botany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; import binnie.core.IInitializable; public class ModuleCore implements IInitializable { @Override public void preInit() { - - for (final EnumAcidity pH : EnumAcidity.values()) { - Binnie.LANGUAGE.addObjectName(pH, Binnie.LANGUAGE.unlocalised(Botany.instance, "ph." + pH.getName())); - } - for (final EnumMoisture pH2 : EnumMoisture.values()) { - Binnie.LANGUAGE.addObjectName(pH2, Binnie.LANGUAGE.unlocalised(Botany.instance, "moisture." + pH2.getName())); - } - for (final EnumSoilType pH3 : EnumSoilType.values()) { - Binnie.LANGUAGE.addObjectName(pH3, Binnie.LANGUAGE.unlocalised(Botany.instance, "soil." + pH3.getName())); - } } @Override diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index 019a5bef..ef051029 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -64,10 +64,10 @@ public class PageSpeciesFlowerGenome extends PageSpecies { new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFTt); y += th; new ControlText(contents, new Area(0, y, w2, th), "Moist. : ", TextJustification.MiddleRight); - new ControlText(contents, new Area(w2, y, w3, th), Binnie.LANGUAGE.localise(treeSpecies.getMoisture()), TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getMoisture().getLocalisedName(false), TextJustification.MIDDLE_LEFTt); y += th; new ControlText(contents, new Area(0, y, w2, th), "pH. : ", TextJustification.MiddleRight); - new ControlText(contents, new Area(w2, y, w3, th), Binnie.LANGUAGE.localise(treeSpecies.getPH()), TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPH().getLocalisedName(false), TextJustification.MIDDLE_LEFTt); y += th; new ControlText(contents, new Area(0, y, w2, th), "Fertility : ", TextJustification.MiddleRight); new ControlText(contents, new Area(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFTt); diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index 6e016340..4b3f3e0d 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -28,6 +28,7 @@ import binnie.core.craftgui.database.PageSpeciesResultant; import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.minecraft.Window; +import binnie.core.util.I18N; public class WindowBotanistDatabase extends WindowAbstractDatabase { ControlListBox selectionBoxColors; @@ -71,7 +72,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { @Override public String getName() { - return Botany.proxy.localise("gui.database.mode." + this.name().toLowerCase()); + return I18N.localise("botany.gui.database.mode." + this.name().toLowerCase()); } } diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index cc663cee..f48d2fec 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -12,10 +12,10 @@ import forestry.api.circuits.ICircuitLayout; import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmHousing; -import binnie.Binnie; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.core.circuits.BinnieCircuit; +import binnie.core.util.I18N; public class CircuitGarden extends BinnieCircuit { private boolean isManual; @@ -24,24 +24,24 @@ public class CircuitGarden extends BinnieCircuit { public CircuitGarden(EnumMoisture moisture, @Nullable EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, ItemStack icon) { super(getName(moisture, ph, manual, fertilised), 4, getLayout(manual), recipe); this.isManual = manual; - this.logic = new GardenLogic(moisture, ph, this.isManual, fertilised, icon, Binnie.LANGUAGE.localise(this.getUnlocalizedName())); + this.logic = new GardenLogic(moisture, ph, this.isManual, fertilised, icon, I18N.localise(this.getUnlocalizedName())); StringBuilder info = new StringBuilder("Flowers (") .append(TextFormatting.GRAY.toString()) - .append(Binnie.LANGUAGE.localise("botany.moisture")) + .append(I18N.localise("botany.moisture")) .append(": ") - .append(moisture.getTranslated(true)); + .append(moisture.getLocalisedName(true)); if (ph != null) { info.append(TextFormatting.GRAY.toString()) .append(", ") - .append(Binnie.LANGUAGE.localise("botany.ph")) + .append(I18N.localise("botany.ph")) .append(": ") - .append(ph.getTranslated(true)); + .append(ph.getLocalisedName(true)); } String fertilizedKey = fertilised ? "for.binnie.circuit.garden.fertilized" : "for.binnie.circuit.garden.unfertilized"; info.append(TextFormatting.RESET.toString()) .append(" ") - .append(Binnie.LANGUAGE.localise(fertilizedKey)) + .append(I18N.localise(fertilizedKey)) .append(")"); this.addTooltipString(info.toString()); } diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 9704fccc..9a81c41e 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -48,6 +48,7 @@ import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; import binnie.botany.genetics.Flower; +import binnie.core.util.I18N; public class ItemBotany extends Item implements IColoredItem, IItemModelRegister { private EnumFlowerStage type; @@ -94,7 +95,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister } IFlower individual = (IFlower) this.getIndividual(itemStack); if (individual == null) { - list.add(TextFormatting.DARK_RED + Binnie.LANGUAGE.localise("botany.flower.destroy")); + list.add(TextFormatting.DARK_RED + I18N.localise("botany.flower.destroy")); return; } IFlowerGenome genome = individual.getGenome(); @@ -104,9 +105,9 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister String stemColor = genome.getStemColor().getColourName(); String colorInfo; if (!primaryColor.equals(secondaryColor)) { - colorInfo = Binnie.LANGUAGE.localise("botany.grammar.flower.secondary"); + colorInfo = I18N.localise("botany.grammar.flower.secondary"); } else { - colorInfo = Binnie.LANGUAGE.localise("botany.grammar.flower"); + colorInfo = I18N.localise("botany.grammar.flower"); } list.add(TextFormatting.YELLOW + colorInfo.replaceAll("%PRIMARY", primaryColor).replaceAll("%SECONDARY", secondaryColor).replaceAll("%STEM", stemColor)); @@ -114,10 +115,10 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister if (GuiScreen.isShiftKeyDown()) { individual.addTooltip(list); } else { - list.add(TextFormatting.ITALIC + "<" + Binnie.LANGUAGE.localise("for.gui.tooltip.tmi") + ">"); + list.add(TextFormatting.ITALIC + "<" + I18N.localise("for.gui.tooltip.tmi") + ">"); } } else { - list.add("<" + Binnie.LANGUAGE.localise("for.gui.unknown") + ">"); + list.add("<" + I18N.localise("for.gui.unknown") + ">"); } } @@ -141,13 +142,13 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister @Override public String getItemStackDisplayName(final ItemStack itemstack) { if (!itemstack.hasTagCompound()) { - return Binnie.LANGUAGE.localise("item.botany.flower.corrupted.name"); + return I18N.localise("item.botany.flower.corrupted.name"); } IIndividual individual = this.getIndividual(itemstack); if (individual != null) { - return individual.getDisplayName() + (!tag.isEmpty() ? " " + Binnie.LANGUAGE.localise("item.botany." + tag + ".name") : ""); + return individual.getDisplayName() + (!tag.isEmpty() ? " " + I18N.localise("item.botany." + tag + ".name") : ""); } - return Binnie.LANGUAGE.localise("item.botany.flower.corrupted.name"); + return I18N.localise("item.botany.flower.corrupted.name"); } @Override diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index 675be944..b42a249f 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -29,7 +29,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; -import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; @@ -37,6 +36,7 @@ import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; import binnie.botany.api.IBlockSoil; import binnie.botany.core.BotanyCore; +import binnie.core.util.I18N; public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { public static final PropertyEnum MOISTURE = PropertyEnum.create("moisture", EnumMoisture.class); @@ -69,7 +69,7 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { return ""; } } - return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(withColor); + return TextFormatting.GRAY + I18N.localise("botany.ph") + ": " + ph.getLocalisedName(withColor); } public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) { @@ -79,7 +79,7 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { return ""; } } - return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); + return TextFormatting.GRAY + I18N.localise("botany.moisture") + ": " + moisure.getLocalisedName(withColor); } @Override diff --git a/src/main/java/binnie/botany/gardening/ItemSoil.java b/src/main/java/binnie/botany/gardening/ItemSoil.java index 3ca82a32..2a619c54 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoil.java +++ b/src/main/java/binnie/botany/gardening/ItemSoil.java @@ -10,8 +10,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; import binnie.botany.api.EnumSoilType; +import binnie.core.util.I18N; public class ItemSoil extends ItemBlock { private final EnumSoilType type; @@ -37,7 +37,7 @@ public class ItemSoil extends ItemBlock { tooltip.add(info); } if (this.noWeed) { - tooltip.add(TextFormatting.GREEN + Binnie.LANGUAGE.localise("botany.soil.weedkiller")); + tooltip.add(TextFormatting.GREEN + I18N.localise("botany.soil.weedkiller")); } } diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index eb067926..c6224226 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -19,7 +19,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; -import binnie.Binnie; import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; @@ -27,6 +26,7 @@ import binnie.botany.api.IBlockSoil; import binnie.botany.api.IGardeningManager; import binnie.botany.core.BotanyCore; import binnie.core.BinnieCore; +import binnie.core.util.I18N; public class ItemSoilMeter extends Item implements IItemModelRegister { public ItemSoilMeter() { @@ -43,7 +43,7 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { return ""; } } - return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(withColor); + return TextFormatting.GRAY + I18N.localise("botany.ph") + ": " + ph.getLocalisedName(withColor); } public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) { @@ -53,7 +53,7 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { return ""; } } - return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); + return TextFormatting.GRAY + I18N.localise("botany.moisture") + ": " + moisure.getLocalisedName(withColor); } @SideOnly(Side.CLIENT) @@ -76,12 +76,12 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { } if (gardening.isSoil(block) && !BinnieCore.getBinnieProxy().isSimulating(worldIn)) { IBlockSoil soil = (IBlockSoil) block; - String info = Binnie.LANGUAGE.localise("botany.soil.type") + ": "; + String info = I18N.localise("botany.soil.type") + ": "; info = info + soil.getType(worldIn, pos).getTranslated(true); - info += ", " + TextFormatting.WHITE + Binnie.LANGUAGE.localise("botany.moisture") + ": "; - info = info + soil.getMoisture(worldIn, pos).getTranslated(true); - info += ", " + TextFormatting.WHITE + Binnie.LANGUAGE.localise("botany.ph") + ": "; - info = info + soil.getPH(worldIn, pos).getTranslated(true); + info += ", " + TextFormatting.WHITE + I18N.localise("botany.moisture") + ": "; + info = info + soil.getMoisture(worldIn, pos).getLocalisedName(true); + info += ", " + TextFormatting.WHITE + I18N.localise("botany.ph") + ": "; + info = info + soil.getPH(worldIn, pos).getLocalisedName(true); ITextComponent chat = new TextComponentString(info); player.sendStatusMessage(chat, false); } diff --git a/src/main/java/binnie/botany/gardening/ItemWeed.java b/src/main/java/binnie/botany/gardening/ItemWeed.java index ae18e362..4bd73ea5 100644 --- a/src/main/java/binnie/botany/gardening/ItemWeed.java +++ b/src/main/java/binnie/botany/gardening/ItemWeed.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import binnie.Binnie; +import binnie.core.util.I18N; public class ItemWeed extends ItemBlock { public ItemWeed(Block block) { @@ -15,7 +15,7 @@ public class ItemWeed extends ItemBlock { @Override public String getItemStackDisplayName(final ItemStack stack) { - return Binnie.LANGUAGE.localise("botany.plant." + BlockPlant.Type.values()[stack.getItemDamage()].getName()); + return I18N.localise("botany.plant." + BlockPlant.Type.values()[stack.getItemDamage()].getName()); } @Override diff --git a/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java b/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java index 7059931a..c28c715a 100644 --- a/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java +++ b/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java @@ -18,13 +18,13 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlyzerPlugin; -import binnie.Binnie; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.FlowerManager; import binnie.botany.api.IFlower; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.util.I18N; // TODO write flower alyzer plugin public class FlowerAlyzerPlugin implements IAlyzerPlugin { @@ -73,8 +73,8 @@ public class FlowerAlyzerPlugin implements IAlyzerPlugin { public void drawChromosom(GuiScreen gui, EnumFlowerChromosome chromosome, IFlower flower){ drawLine(gui, COLUMN_0, StringUtils.capitalize(chromosome.getName()), 0xEEEEEE); - drawLine(gui, COLUMN_1, Binnie.LANGUAGE.localise(flower.getGenome().getActiveAllele(chromosome).getUnlocalizedName()), 0xEEEEEE); - drawLine(gui, COLUMN_2, Binnie.LANGUAGE.localise(flower.getGenome().getInactiveAllele(chromosome).getUnlocalizedName()), 0xEEEEEE); + drawLine(gui, COLUMN_1, I18N.localise(flower.getGenome().getActiveAllele(chromosome).getUnlocalizedName()), 0xEEEEEE); + drawLine(gui, COLUMN_2, I18N.localise(flower.getGenome().getInactiveAllele(chromosome).getUnlocalizedName()), 0xEEEEEE); lastTopOffset += rowSize; } diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index ad50a6b8..c406c8ba 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -19,10 +19,10 @@ import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IBotanistTracker; import binnie.botany.core.BotanyCore; -import binnie.core.BinnieCore; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; import binnie.core.genetics.Tolerance; +import binnie.core.util.I18N; public class FlowerBreedingSystem extends BreedingSystem { public FlowerBreedingSystem() { @@ -54,16 +54,16 @@ public class FlowerBreedingSystem extends BreedingSystem { public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { if (chromosome == EnumFlowerChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.low"); + return I18N.localise("binniecore.allele.fertility.low"); } if (allele.getUID().contains("Normal")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.normal"); + return I18N.localise("binniecore.allele.fertility.normal"); } if (allele.getUID().contains("High")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.high"); + return I18N.localise("binniecore.allele.fertility.high"); } if (allele.getUID().contains("Maximum")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.maximum"); + return I18N.localise("binniecore.allele.fertility.maximum"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/botany/genetics/FlowerColorAllele.java b/src/main/java/binnie/botany/genetics/FlowerColorAllele.java index 1cefc212..5a82d1be 100644 --- a/src/main/java/binnie/botany/genetics/FlowerColorAllele.java +++ b/src/main/java/binnie/botany/genetics/FlowerColorAllele.java @@ -2,8 +2,8 @@ package binnie.botany.genetics; import forestry.api.genetics.IAlleleInteger; -import binnie.botany.Botany; import binnie.botany.api.IFlowerColour; +import binnie.core.util.I18N; /** * Created by Marcin on 03.06.2017. @@ -69,6 +69,6 @@ public class FlowerColorAllele implements IFlowerColour, IAlleleInteger { @Override public String getColourName() { - return Botany.proxy.localise("colour." + getName()); + return I18N.localise("botany.colour." + getName()); } } \ No newline at end of file diff --git a/src/main/java/binnie/botany/network/PacketID.java b/src/main/java/binnie/botany/network/PacketID.java index 93f52ba6..ebfaf6e6 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/src/main/java/binnie/botany/network/PacketID.java @@ -9,13 +9,13 @@ import net.minecraftforge.fml.relauncher.Side; import forestry.api.genetics.AlleleManager; -import binnie.Binnie; import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.BinnieCore; import binnie.core.network.IPacketID; import binnie.core.network.packet.MessageBinnie; import binnie.core.network.packet.MessageNBT; +import binnie.core.util.I18N; public enum PacketID implements IPacketID { FIELDKIT; @@ -32,7 +32,7 @@ public enum PacketID implements IPacketID { EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); String info = ""; if (data == null || data.hasNoTags()) { - info += Binnie.LANGUAGE.localise("botany.flowers.species.not.discover"); + info += I18N.localise("botany.flowers.species.not.discover"); } else { IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species")); IAlleleFlowerSpecies secondary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2")); @@ -42,15 +42,15 @@ public enum PacketID implements IPacketID { if (primary == null || secondary == null) { return; } - info += Binnie.LANGUAGE.localise("botany.flowers.fielkit.a"); + info += I18N.localise("botany.flowers.fielkit.a"); if (age == 0.0f) { info += ""; } else if (age < 0.25f) { - info += " " + Binnie.LANGUAGE.localise("botany.flowers.fielkit.young"); + info += " " + I18N.localise("botany.flowers.fielkit.young"); } else if (age < 0.75f) { - info += " " + Binnie.LANGUAGE.localise("botany.flowers.fielkit.mature"); + info += " " + I18N.localise("botany.flowers.fielkit.mature"); } else { - info += " " + Binnie.LANGUAGE.localise("botany.flowers.fielkit.old"); + info += " " + I18N.localise("botany.flowers.fielkit.old"); } if (color1 == color2) { info = info + " " + color1.getName(); @@ -60,13 +60,13 @@ public enum PacketID implements IPacketID { if (primary == secondary) { info = info + " " + primary.getName(); } else { - info = info + " " + primary.getName() + "-" + secondary.getName() + " " + Binnie.LANGUAGE.localise("botany.flowers.species.hybrid"); + info = info + " " + primary.getName() + "-" + secondary.getName() + " " + I18N.localise("botany.flowers.species.hybrid"); } if (age == 0.0f) { - info += " " + Binnie.LANGUAGE.localise("botany.flowers.species.germling"); + info += " " + I18N.localise("botany.flowers.species.germling"); } if (data.getBoolean("Wilting")) { - info += ". " + Binnie.LANGUAGE.localise("botany.flowers.species.wilting"); + info += ". " + I18N.localise("botany.flowers.species.wilting"); } } player.sendStatusMessage(new TextComponentString(info), false); diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index fdf5afc1..c2608b27 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -42,6 +42,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.resource.StyleSheetPunnett; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; import binnie.genetics.gui.ControlChromosome; import binnie.genetics.machine.analyser.Analyser; @@ -189,8 +190,8 @@ public class WindowFieldKit extends Window { final IAllele allele = ind.getGenome().getActiveAllele(type); final List infos = new ArrayList<>(); int i = 0; - for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; Binnie.LANGUAGE.canLocalise(pref + i); ++i) { - infos.add(Binnie.LANGUAGE.localise(pref + i)); + for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; I18N.canLocalise(pref + i); ++i) { + infos.add(I18N.localise(pref + i)); } String text = Binnie.GENETICS.getSystem(root).getAlleleName(type, allele); if (!infos.isEmpty()) { diff --git a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java index cb0b6ae5..6b984532 100644 --- a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java +++ b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java @@ -1,9 +1,9 @@ package binnie.core.craftgui.database; -import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.ITooltipHelp; import binnie.core.craftgui.Tooltip; +import binnie.core.util.I18N; public class DatabaseTab implements ITooltipHelp { private AbstractMod mod; @@ -18,11 +18,11 @@ public class DatabaseTab implements ITooltipHelp { @Override public String toString() { - return Binnie.LANGUAGE.localise(this.mod, "gui.database.tab." + this.unloc); + return I18N.localise(this.mod.getModID() + ".gui.database.tab." + this.unloc); } @Override public void getHelpTooltip(final Tooltip tooltip) { - tooltip.add(Binnie.LANGUAGE.localiseOrBlank(this.mod, "gui.database.tab." + this.unloc + ".help")); + tooltip.add(I18N.localiseOrBlank(this.mod.getModID() + ".gui.database.tab." + this.unloc + ".help")); } } diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java index b03c4482..f1b696d3 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java @@ -11,11 +11,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IClassification; -import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class PageBranchOverview extends PageBranch { @@ -34,16 +34,16 @@ public class PageBranchOverview extends PageBranch { @Override public void onValueChanged(final IClassification branch) { - this.pageBranchOverview_branchName.setValue(TextFormatting.UNDERLINE + branch.getName() + Binnie.LANGUAGE.localise("binniecore.gui.database.branch.branch")); - this.pageBranchOverview_branchScientific.setValue(TextFormatting.ITALIC + Binnie.LANGUAGE.localise("binniecore.gui.database.branch.apidae") + " " + branch.getScientific()); - this.pageBranchOverview_branchAuthority.setValue(Binnie.LANGUAGE.localise("binniecore.gui.database.discovered") + " " + TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority()); + this.pageBranchOverview_branchName.setValue(TextFormatting.UNDERLINE + branch.getName() + I18N.localise("binniecore.gui.database.branch.branch")); + this.pageBranchOverview_branchScientific.setValue(TextFormatting.ITALIC + I18N.localise("binniecore.gui.database.branch.apidae") + " " + branch.getScientific()); + this.pageBranchOverview_branchAuthority.setValue(I18N.localise("binniecore.gui.database.discovered") + " " + TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority()); for (final IWidget widget : this.pageBranchOverview_branchDescription) { this.deleteChild(widget); } this.pageBranchOverview_branchDescription.clear(); String desc = branch.getDescription(); if (desc == null || Objects.equals(desc, "")) { - desc = Binnie.LANGUAGE.localise("binniecore.gui.database.no.description"); + desc = I18N.localise("binniecore.gui.database.no.description"); } StringBuilder line = new StringBuilder(); final List descLines = new ArrayList<>(); diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java index ee77cff5..b93058b9 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java @@ -6,11 +6,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class PageBranchSpecies extends PageBranch { @@ -23,7 +23,7 @@ public class PageBranchSpecies extends PageBranch { public PageBranchSpecies(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.pageBranchSpecies_title = new ControlTextCentered(this, 8, Binnie.LANGUAGE.localise("binniecore.gui.database.species")); + this.pageBranchSpecies_title = new ControlTextCentered(this, 8, I18N.localise("binniecore.gui.database.species")); this.addEventHandler(new EventValueChanged.Handler() { @Override public void onEvent(final EventValueChanged event) { diff --git a/src/main/java/binnie/core/craftgui/database/PageBreeder.java b/src/main/java/binnie/core/craftgui/database/PageBreeder.java index 6318ccad..6d247d57 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreeder.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreeder.java @@ -4,12 +4,12 @@ import net.minecraft.util.text.TextFormatting; import com.mojang.authlib.GameProfile; -import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.page.ControlPage; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; +import binnie.core.util.I18N; public class PageBreeder extends ControlPage { private GameProfile player; @@ -26,13 +26,13 @@ public class PageBreeder extends ControlPage { } final BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem(); final String descriptor = system.getDescriptor(); - new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + system.getDescriptor() + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.profile")); - new ControlTextCentered(this, 75, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.species")); + new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + system.getDescriptor() + " " + I18N.localise("binniecore.gui.database.breeder.profile")); + new ControlTextCentered(this, 75, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + I18N.localise("binniecore.gui.database.species")); new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage); - new ControlTextCentered(this, 115, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.branches")); + new ControlTextCentered(this, 115, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + I18N.localise("binniecore.gui.database.breeder.branches")); new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage); if (system.discoveredSecretCount > 0) { - new ControlTextCentered(this, 155, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.species.secret")); + new ControlTextCentered(this, 155, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + I18N.localise("binniecore.gui.database.breeder.species.secret")); } new ControlTextCentered(this, 32, this.player.getName()); new ControlTextCentered(this, 44, TextFormatting.ITALIC + system.getEpitome()); diff --git a/src/main/java/binnie/core/craftgui/database/PageBreederStats.java b/src/main/java/binnie/core/craftgui/database/PageBreederStats.java index 2b298310..f2c23a3f 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreederStats.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreederStats.java @@ -2,12 +2,12 @@ package binnie.core.craftgui.database; import net.minecraft.util.text.TextFormatting; -import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.core.Control; import binnie.core.genetics.BreedingSystem; +import binnie.core.util.I18N; public class PageBreederStats extends Control { String player; @@ -15,7 +15,7 @@ public class PageBreederStats extends Control { public PageBreederStats(final IWidget parent, final int w, final int h, final String player) { super(parent, 0, 0, w, h); this.player = player; - final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.stats")); + final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + I18N.localise("binniecore.gui.database.breeder.stats")); final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); } } diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java index 3a7beafa..3610ebc8 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java @@ -2,10 +2,10 @@ package binnie.core.craftgui.database; import forestry.api.genetics.IAlleleSpecies; -import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.util.I18N; public class PageSpeciesMutations extends PageSpecies { private ControlText pageSpeciesFurther_Title; @@ -13,7 +13,7 @@ public class PageSpeciesMutations extends PageSpecies { public PageSpeciesMutations(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8, Binnie.LANGUAGE.localise("binniecore.gui.database.mutations.further")); + this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8, I18N.localise("binniecore.gui.database.mutations.further")); this.pageSpeciesFurther_List = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Further); } diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java index c721e97e..9c1560ac 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java @@ -9,7 +9,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; -import binnie.Binnie; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -17,6 +16,7 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class PageSpeciesOverview extends PageSpecies { @@ -49,13 +49,13 @@ public class PageSpeciesOverview extends PageSpecies { final String branchName = species.getBranch().getName(); this.controlName.setValue(TextFormatting.UNDERLINE + species.getName()); this.controlScientific.setValue(TextFormatting.ITALIC + branchBinomial + " " + species.getBinomial()); - this.controlAuthority.setValue(Binnie.LANGUAGE.localise("binniecore.gui.database.discovered") + ": " + TextFormatting.BOLD + species.getAuthority()); - this.controlComplexity.setValue(Binnie.LANGUAGE.localise("binniecore.gui.database.overview.complexity") + ": " + species.getComplexity()); + this.controlAuthority.setValue(I18N.localise("binniecore.gui.database.discovered") + ": " + TextFormatting.BOLD + species.getAuthority()); + this.controlComplexity.setValue(I18N.localise("binniecore.gui.database.overview.complexity") + ": " + species.getComplexity()); final String desc = species.getDescription(); StringBuilder descBody = new StringBuilder(TextFormatting.ITALIC.toString()); String descSig = ""; if (desc == null || Objects.equals(desc, "")) { - descBody.append(Binnie.LANGUAGE.localise("binniecore.gui.database.no.description")); + descBody.append(I18N.localise("binniecore.gui.database.no.description")); } else { final String[] descStrings = desc.split("\\|"); descBody.append(descStrings[0]); diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java index 0c9873f4..0b74eb54 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java @@ -2,10 +2,10 @@ package binnie.core.craftgui.database; import forestry.api.genetics.IAlleleSpecies; -import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.util.I18N; public class PageSpeciesResultant extends PageSpecies { private ControlText pageSpeciesResultant_Title; @@ -13,7 +13,7 @@ public class PageSpeciesResultant extends PageSpecies { public PageSpeciesResultant(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.pageSpeciesResultant_Title = new ControlTextCentered(this, 8, Binnie.LANGUAGE.localise("binniecore.gui.database.mutations.resultant")); + this.pageSpeciesResultant_Title = new ControlTextCentered(this, 8, I18N.localise("binniecore.gui.database.mutations.resultant")); this.pageSpeciesResultant_List = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Resultant); } diff --git a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java index dfed1a55..4c304584 100644 --- a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java @@ -17,7 +17,6 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IClassification; -import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextEdit; import binnie.core.craftgui.controls.listbox.ControlListBox; @@ -38,6 +37,7 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlHelp; import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; +import binnie.core.util.I18N; public abstract class WindowAbstractDatabase extends Window { private final int infoBoxWidth = 144; @@ -201,7 +201,7 @@ public abstract class WindowAbstractDatabase extends Window { @Override public String getName() { - return BinnieCore.getBinnieProxy().localise("gui.database.mode." + this.name().toLowerCase()); + return I18N.localise("binniecore.gui.database.mode." + this.name().toLowerCase()); } } diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index a196ab2b..63e320ea 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -21,7 +21,7 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; import binnie.Binnie; -import binnie.core.BinnieCore; +import binnie.core.util.I18N; class BeeBreedingSystem extends BreedingSystem { @@ -61,16 +61,16 @@ class BeeBreedingSystem extends BreedingSystem { public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { if (chromosome == EnumBeeChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.low"); + return I18N.localise("binniecore.allele.fertility.low"); } if (allele.getUID().contains("Normal")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.normal"); + return I18N.localise("binniecore.allele.fertility.normal"); } if (allele.getUID().contains("High")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.high"); + return I18N.localise("binniecore.allele.fertility.high"); } if (allele.getUID().contains("Maximum")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.maximum"); + return I18N.localise("binniecore.allele.fertility.maximum"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index 40446542..8508586e 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -39,8 +39,8 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.resource.BinnieSprite; +import binnie.core.util.I18N; public abstract class BreedingSystem implements IItemStackRepresentitive { public float discoveredSpeciesPercentage; @@ -79,11 +79,11 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public String getChromosomeName(final IChromosomeType chromo) { - return BinnieCore.getBinnieProxy().localise(this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName()); + return I18N.localise("binniecore." + this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName()); } public String getChromosomeShortName(final IChromosomeType chromo) { - return BinnieCore.getBinnieProxy().localise(this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short"); + return I18N.localise("binniecore." + this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short"); } public final String getEpitome(final float discoveredPercentage) { @@ -103,7 +103,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } else if (discoveredPercentage < 1.0f) { i = 5; } - return BinnieCore.getBinnieProxy().localise(this.getSpeciesRoot().getUID() + ".epitome." + i); + return I18N.localise("binniecore." + this.getSpeciesRoot().getUID() + ".epitome." + i); } public abstract ISpeciesRoot getSpeciesRoot(); @@ -409,7 +409,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public final String getDescriptor() { - return BinnieCore.getBinnieProxy().localise(this.getSpeciesRoot().getUID() + ".descriptor"); + return I18N.localise("binniecore." + this.getSpeciesRoot().getUID() + ".descriptor"); } public final String getIdent() { @@ -430,16 +430,16 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { if (allele instanceof IAlleleBoolean) { - return ((IAlleleBoolean) allele).getValue() ? Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.true") : Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.false"); + return ((IAlleleBoolean) allele).getValue() ? I18N.localise("binniecore.allele.true") : I18N.localise("binniecore.allele.false"); } if (Objects.equals(allele.getName(), "for.gui.maximum")) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.fertility.maximum"); + return I18N.localise("binniecore.allele.fertility.maximum"); } return allele.getName(); } public String getName() { - return BinnieCore.getBinnieProxy().localise(this.getSpeciesRoot().getUID() + ".shortName"); + return I18N.localise("binniecore." + this.getSpeciesRoot().getUID() + ".shortName"); } @Override diff --git a/src/main/java/binnie/core/genetics/IBreedingMessage.java b/src/main/java/binnie/core/genetics/IBreedingMessage.java index 2e47d55c..294a30ad 100644 --- a/src/main/java/binnie/core/genetics/IBreedingMessage.java +++ b/src/main/java/binnie/core/genetics/IBreedingMessage.java @@ -8,8 +8,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; -import binnie.core.BinnieCore; +import binnie.core.util.I18N; interface IBreedingMessage { String getTitle(); @@ -37,7 +36,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.breedingmessage.species"); + return I18N.localise("binniecore.gui.breedingmessage.species"); } @Override @@ -72,7 +71,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.breedingmessage.branch"); + return I18N.localise("binniecore.gui.breedingmessage.branch"); } @Override @@ -97,7 +96,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.breedingmessage.epithet"); + return I18N.localise("binniecore.gui.breedingmessage.epithet"); } @Override diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index d48eec6d..0c2aceb8 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -18,7 +18,7 @@ import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.ILepidopteristTracker; import binnie.Binnie; -import binnie.core.BinnieCore; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; class MothBreedingSystem extends BreedingSystem { @@ -52,24 +52,24 @@ class MothBreedingSystem extends BreedingSystem { if (chromosome == EnumButterflyChromosome.METABOLISM) { final int metabolism = ((IAlleleInteger) allele).getValue(); if (metabolism >= 19) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.highest"); + return I18N.localise("binniecore.allele.metabolism.highest"); } if (metabolism >= 16) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.higher"); + return I18N.localise("binniecore.allele.metabolism.higher"); } if (metabolism >= 13) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.high"); + return I18N.localise("binniecore.allele.metabolism.high"); } if (metabolism >= 10) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.normal"); + return I18N.localise("binniecore.allele.metabolism.normal"); } if (metabolism >= 7) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.slow"); + return I18N.localise("binniecore.allele.metabolism.slow"); } if (metabolism >= 4) { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.slower"); + return I18N.localise("binniecore.allele.metabolism.slower"); } - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.metabolism.slowest"); + return I18N.localise("binniecore.allele.metabolism.slowest"); } else { if (chromosome == EnumButterflyChromosome.FERTILITY) { final int metabolism = ((IAlleleInteger) allele).getValue(); diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 60b9c15a..c79a1f53 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -35,7 +35,7 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; import binnie.Binnie; -import binnie.core.BinnieCore; +import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.lumbermill.LumbermillRecipes; @@ -87,7 +87,7 @@ public class TreeBreedingSystem extends BreedingSystem { } if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) { final IFruitProvider provider = ((IAlleleFruit) allele).getProvider(); - return (provider.getProducts().size() == 0) ? Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "allele.none") : provider.getProducts().keySet().iterator().next().getDisplayName(); + return (provider.getProducts().size() == 0) ? I18N.localise("binniecore.allele.none") : provider.getProducts().keySet().iterator().next().getDisplayName(); } return super.getAlleleName(chromosome, allele); } diff --git a/src/main/java/binnie/core/language/ManagerLanguage.java b/src/main/java/binnie/core/language/ManagerLanguage.java deleted file mode 100644 index 30595a44..00000000 --- a/src/main/java/binnie/core/language/ManagerLanguage.java +++ /dev/null @@ -1,55 +0,0 @@ -package binnie.core.language; - -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.util.text.translation.I18n; - -import binnie.core.AbstractMod; -import binnie.core.ManagerBase; - -public class ManagerLanguage extends ManagerBase { - private Map objNames; - - public ManagerLanguage() { - this.objNames = new HashMap<>(); - } - - public void addObjectName(final Object obj, final String name) { - this.objNames.put(obj, name); - } - - public String unlocalised(final AbstractMod mod, final String id) { - return mod.getModID() + "." + id; - } - - public String localise(final Object key) { - final String loc = I18n.translateToLocal(key.toString()); - if (loc.equals(key.toString())) { - return this.objNames.containsKey(key) ? this.localise(this.objNames.get(key)) : key.toString(); - } - return loc; - } - - public String localise(final AbstractMod mod, final String id) { - return this.localise(this.unlocalised(mod, id)); - } - - public String localiseOrBlank(final AbstractMod mod, final String id) { - return this.localiseOrBlank(this.unlocalised(mod, id)); - } - - public String localise(final AbstractMod mod, final String id, final Object... objs) { - return String.format(this.localise(mod, id), objs); - } - - public String localiseOrBlank(final Object key) { - final String trans = this.localise(key); - return trans.equals(key) ? "" : trans; - } - - public boolean canLocalise(final Object key) { - final String trans = this.localise(key); - return !trans.equals(key); - } -} diff --git a/src/main/java/binnie/core/language/package-info.java b/src/main/java/binnie/core/language/package-info.java deleted file mode 100644 index f2228565..00000000 --- a/src/main/java/binnie/core/language/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.language; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/liquid/FluidContainerType.java b/src/main/java/binnie/core/liquid/FluidContainerType.java index 7572b9b3..c4044b16 100644 --- a/src/main/java/binnie/core/liquid/FluidContainerType.java +++ b/src/main/java/binnie/core/liquid/FluidContainerType.java @@ -9,8 +9,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; -import binnie.core.BinnieCore; import binnie.core.Mods; +import binnie.core.util.I18N; public enum FluidContainerType { CAPSULE, @@ -35,7 +35,7 @@ public enum FluidContainerType { } public String getDisplayName() { - return BinnieCore.getBinnieProxy().localise("item.container." + this.name().toLowerCase()); + return I18N.localise("binniecore.item.container." + this.name().toLowerCase()); } @Nullable diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index f65d96b7..0e9bacd4 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; +import binnie.core.util.I18N; public abstract class MachinePackage { boolean powered; @@ -36,7 +36,7 @@ public abstract class MachinePackage { public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage);//, final RenderBlocks p5); public final String getDisplayName() { - return Binnie.LANGUAGE.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID()); + return I18N.localise(this.group.getMod().getModID() + '.' + "machine." + this.group.getShortUID() + "." + this.getUID()); } public final Integer getMetadata() { @@ -64,6 +64,6 @@ public abstract class MachinePackage { } public final String getInformation() { - return Binnie.LANGUAGE.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID() + ".info"); + return I18N.localise(this.group.getMod().getModID() + '.' + "machine." + this.group.getShortUID() + "." + this.getUID() + ".info"); } } diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index cca80664..4885c03f 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -5,8 +5,7 @@ import javax.annotation.Nullable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import binnie.Binnie; -import binnie.core.BinnieCore; +import binnie.core.util.I18N; public class InventorySlot extends BaseSlot { private ItemStack itemStack; @@ -101,11 +100,11 @@ public class InventorySlot extends BaseSlot { @Override public String getName() { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.slot." + this.unlocName); + return I18N.localise("binniecore.gui.slot." + this.unlocName); } public enum Type { Standard, - Recipe; + Recipe } } diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index 8851fd2a..db939e92 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -6,8 +6,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidTank; -import binnie.Binnie; -import binnie.core.BinnieCore; +import binnie.core.util.I18N; public class TankSlot extends BaseSlot { public static final String NameJuice = "Juice Tank"; @@ -50,6 +49,6 @@ public class TankSlot extends BaseSlot { @Override public String getName() { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.slot." + this.unlocName); + return I18N.localise("binniecore.gui.slot." + this.unlocName); } } diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java index d8a90d34..d6ca93c3 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java @@ -4,10 +4,10 @@ import javax.annotation.Nullable; import net.minecraft.nbt.NBTTagCompound; -import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.network.INetwork; +import binnie.core.util.I18N; public abstract class ComponentProcessIndefinate extends MachineComponent implements IProcess, INetwork.TilePacketSync { int clientEnergyPerSecond; @@ -81,7 +81,7 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem if (this.actionCancelTask == 0.0f) { return null; } else { - return new ErrorState(BinnieCore.getBinnieProxy().localise("machine.errors.task.cancelled.desc"), BinnieCore.getBinnieProxy().localise("machine.errors.task.cancelled.info")); + return new ErrorState(I18N.localise("binniecore.machine.errors.task.cancelled.desc"), I18N.localise("binniecore.machine.errors.task.cancelled.info")); } } @@ -89,7 +89,7 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem @Nullable public ErrorState canProgress() { if (this.actionPauseProcess != 0.0f) { - return new ErrorState(BinnieCore.getBinnieProxy().localise("machine.errors.task.process.paused.desc"), BinnieCore.getBinnieProxy().localise("machine.errors.task.process.paused.info")); + return new ErrorState(I18N.localise("binniecore.machine.errors.task.process.paused.desc"), I18N.localise("binniecore.machine.errors.task.process.paused.info")); } else if (this.getPower().getInterface().getEnergy(PowerSystem.RF) < this.getEnergyPerTick()) { return new ErrorState.InsufficientPower(); } else { @@ -115,7 +115,7 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem @Override public String getTooltip() { - return BinnieCore.getBinnieProxy().localise("machine.tooltips.processing"); + return I18N.localise("binniecore.machine.tooltips.processing"); } @Override diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index 7cd4f2e4..d9279f4b 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -18,7 +18,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.core.models.BlockModelEntry; import forestry.core.models.ModelEntry; -import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; @@ -123,13 +122,4 @@ public class BinnieModProxy implements IBinnieModProxy { @Override public void postInit() { } - - @Override - public String localise(final String string) { - return Binnie.LANGUAGE.localise(this.getMod(), string); - } - - public String localiseOrBlank(final String string) { - return Binnie.LANGUAGE.localiseOrBlank(this.getMod(), string); - } } diff --git a/src/main/java/binnie/core/proxy/IBinnieModProxy.java b/src/main/java/binnie/core/proxy/IBinnieModProxy.java index af5dc124..f97bddd3 100644 --- a/src/main/java/binnie/core/proxy/IBinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieModProxy.java @@ -15,7 +15,5 @@ public interface IBinnieModProxy extends IProxyCore { void sendToServer(final MessageBase p0); - String localise(final String string); - //IIcon getIcon(final IIconRegister p0, final String p1); } diff --git a/src/main/java/binnie/core/util/I18N.java b/src/main/java/binnie/core/util/I18N.java new file mode 100644 index 00000000..5a5ef040 --- /dev/null +++ b/src/main/java/binnie/core/util/I18N.java @@ -0,0 +1,40 @@ +package binnie.core.util; + +import java.util.IllegalFormatException; + +import net.minecraft.util.text.translation.I18n; + +import forestry.core.utils.Log; + +public class I18N { + + public static String localiseOrBlank(String key) { + String trans = localise(key); + return trans.equals(key) ? "" : trans; + } + + @SuppressWarnings("deprecation") + public static String localise(String key) { + if (I18n.canTranslate(key)) { + return I18n.translateToLocal(key); + } else { + return I18n.translateToFallback(key); + } + } + + @SuppressWarnings("deprecation") + public static boolean canLocalise(String key) { + return I18n.canTranslate(key); + } + + public static String localise(String key, Object... format) { + String s = localise(key); + try { + return String.format(s, format); + } catch (IllegalFormatException e) { + String errorMessage = "Format error: " + s; + Log.error(errorMessage, e); + return errorMessage; + } + } +} diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java index 3904b571..d212b377 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java @@ -9,7 +9,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import binnie.extrabees.ExtraBees; +import binnie.core.util.I18N; public enum ExtraBeesBranch implements IClassification { @@ -244,7 +244,7 @@ public enum ExtraBeesBranch implements IClassification { @Override public String getName() { - return ExtraBees.proxy.localise("branch." + this.toString().toLowerCase() + ".name"); + return I18N.localise("extrabees.branch." + this.toString().toLowerCase() + ".name"); } @Override @@ -254,7 +254,7 @@ public enum ExtraBeesBranch implements IClassification { @Override public String getDescription() { - return ExtraBees.proxy.localise("branch." + this.toString().toLowerCase() + ".desc"); + return I18N.localise("extrabees.branch." + this.toString().toLowerCase() + ".desc"); } public void register() { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index f4ffe501..b16860e4 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -25,7 +25,7 @@ import forestry.api.genetics.IFruitBearer; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import binnie.extrabees.ExtraBees; +import binnie.core.util.I18N; import binnie.extrabees.utils.Utils; public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeType { @@ -70,7 +70,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo @Override public String getDescription() { - return ExtraBees.proxy.localise("flowers." + this.name().toLowerCase() + ".name"); + return I18N.localise("extrabees.flowers." + this.name().toLowerCase() + ".name"); } public void register() { diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java b/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java index cd1ad34a..8026a488 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java @@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import binnie.core.Mods; -import binnie.extrabees.ExtraBees; +import binnie.core.util.I18N; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IItemHudInfo; @@ -55,10 +55,10 @@ public class ItemHoneyCrystal extends Item implements IElectricItem, IItemHudInf double charge = ElectricItem.manager.getCharge(stack); double maxCharge = ElectricItem.manager.getMaxCharge(stack); if (charge <= 0.0F) { - return ExtraBees.proxy.localise("item.honeycrystal.empty"); + return I18N.localise("extrabees.item.honeycrystal.empty"); } } - return ExtraBees.proxy.localise("item.honeycrystal"); + return I18N.localise("extrabees.item.honeycrystal"); } @Override @@ -93,7 +93,7 @@ public class ItemHoneyCrystal extends Item implements IElectricItem, IItemHudInf boolean transferred = false; for(int i = 0; i < 9; ++i) { - ItemStack target = (ItemStack)player.inventory.mainInventory.get(i); + ItemStack target = player.inventory.mainInventory.get(i); if(target != null && target != stack && ElectricItem.manager.discharge(target, 1.0D / 0.0, 2147483647, true, true, true) <= 0.0D) { double transfer = ElectricItem.manager.discharge(stack, 2.0D * this.transferLimit, 2147483647, true, true, true); if(transfer > 0.0D) { diff --git a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java index ab965896..72cd4167 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java @@ -20,7 +20,7 @@ import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IHiveFrame; import forestry.apiculture.PluginApiculture; -import binnie.extrabees.ExtraBees; +import binnie.core.util.I18N; import binnie.extrabees.items.ItemHiveFrame; import binnie.extrabees.utils.BeeModifierLogic; import binnie.extrabees.utils.EnumBeeBooleanModifier; @@ -136,7 +136,7 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { } public String getName() { - return ExtraBees.proxy.localise("item.frame." + this.toString().toLowerCase()); + return I18N.localise("extrabees.item.frame." + this.toString().toLowerCase()); } @Override diff --git a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java index df7fdcea..d3bec725 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java @@ -14,6 +14,7 @@ import net.minecraftforge.oredict.OreDictionary; import forestry.api.recipes.RecipeManagers; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; public enum EnumHoneyComb implements IEBEnumItem { @@ -148,7 +149,7 @@ public enum EnumHoneyComb implements IEBEnumItem { @Override public String getName(final ItemStack stack) { - return ExtraBees.proxy.localise("item.comb." + this.name().toLowerCase()); + return I18N.localise("extrabees.item.comb." + this.name().toLowerCase()); } public boolean addProduct(@Nullable Item item, final Float chance) { diff --git a/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java index 3beab507..7e8415eb 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java @@ -7,6 +7,7 @@ import net.minecraftforge.fluids.FluidStack; import forestry.api.recipes.RecipeManagers; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.extrabees.utils.Utils; @@ -87,7 +88,7 @@ public enum EnumHoneyDrop implements IEBEnumItem { @Override public String getName(final ItemStack stack) { - return ExtraBees.proxy.localise("item.honeydrop." + this.name().toLowerCase()); + return I18N.localise("extrabees.item.honeydrop." + this.name().toLowerCase()); } public int[] getColour() { diff --git a/src/main/java/binnie/extrabees/items/types/EnumPropolis.java b/src/main/java/binnie/extrabees/items/types/EnumPropolis.java index 8be15bbe..30192ab4 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumPropolis.java +++ b/src/main/java/binnie/extrabees/items/types/EnumPropolis.java @@ -6,6 +6,7 @@ import net.minecraftforge.fluids.FluidStack; import forestry.api.recipes.RecipeManagers; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.extrabees.utils.Utils; @@ -64,7 +65,7 @@ public enum EnumPropolis implements IEBEnumItem { @Override public String getName(final ItemStack stack) { - return ExtraBees.proxy.localise("item.propolis." + this.name().toLowerCase()); + return I18N.localise("extrabees.item.propolis." + this.name().toLowerCase()); } } diff --git a/src/main/java/binnie/extratrees/alcohol/Alcohol.java b/src/main/java/binnie/extratrees/alcohol/Alcohol.java index 1208dfbd..a0f55c56 100644 --- a/src/main/java/binnie/extratrees/alcohol/Alcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/Alcohol.java @@ -11,7 +11,7 @@ import binnie.Binnie; import binnie.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; public enum Alcohol implements IFluidType, ICocktailLiquid { Apple("cider.apple", 16432700, 0.3, 0.05), @@ -107,7 +107,7 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { @Override public String getDisplayName() { - return ExtraTrees.proxy.localise("fluid.alcohol." + this.name().toLowerCase()); + return I18N.localise("extratrees.fluid.alcohol." + this.name().toLowerCase()); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/src/main/java/binnie/extratrees/alcohol/Glassware.java index 3c7f24ce..11dc1a88 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -1,15 +1,15 @@ package binnie.extratrees.alcohol; -import binnie.Binnie; -import binnie.Constants; -import binnie.extratrees.ExtraTrees; +import javax.annotation.Nullable; +import java.util.Locale; + import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Locale; +import binnie.Constants; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; public enum Glassware { BeerMug(480, 10, 14, " # ", " ", " "), @@ -52,9 +52,9 @@ public enum Glassware { public String getName(@Nullable String liquid) { if (liquid == null) { - return ExtraTrees.proxy.localise("item.glassware." + this.name().toLowerCase()); + return I18N.localise("extratrees.item.glassware." + this.name().toLowerCase()); } - return Binnie.LANGUAGE.localise(ExtraTrees.instance, "item.glassware." + this.name().toLowerCase() + ".usage", liquid); + return I18N.localise("extratrees.item.glassware." + this.name().toLowerCase() + ".usage", liquid); } public int getCapacity() { diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 55ba00b7..4b274c5d 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -16,7 +16,7 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; import binnie.Constants; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; import binnie.extratrees.api.CarpentryManager; public class PlankType { @@ -140,7 +140,7 @@ public class PlankType { @Override public String getDesignMaterialName() { - return ExtraTrees.proxy.localise("block.planks." + this.toString().toLowerCase()); + return I18N.localise("extratrees.block.planks." + this.toString().toLowerCase()); } @Override @@ -150,7 +150,7 @@ public class PlankType { @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks." + this.toString().toLowerCase() + ".desc"); + return I18N.localise("extratrees.block.planks." + this.toString().toLowerCase() + ".desc"); } @Override @@ -206,12 +206,12 @@ public class PlankType { @Override public String getDesignMaterialName() { - return ExtraTrees.proxy.localise("block.planks.vanilla." + this.toString().toLowerCase()); + return I18N.localise("extratrees.block.planks.vanilla." + this.toString().toLowerCase()); } @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks.vanilla." + this.toString().toLowerCase() + ".desc"); + return I18N.localise("extratrees.block.planks.vanilla." + this.toString().toLowerCase() + ".desc"); } @Override @@ -310,12 +310,12 @@ public class PlankType { @Override public String getDesignMaterialName() { - return ExtraTrees.proxy.localise("block.planks.forestry." + this.toString().toLowerCase()); + return I18N.localise("extratrees.block.planks.forestry." + this.toString().toLowerCase()); } @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks.forestry." + this.toString().toLowerCase() + ".desc"); + return I18N.localise("extratrees.block.planks.forestry." + this.toString().toLowerCase() + ".desc"); } @SideOnly(Side.CLIENT) @@ -381,7 +381,7 @@ public class PlankType { @Override public String getName() { - return ExtraTrees.proxy.localise("block.planks.ebxl." + this.toString().toLowerCase()); + return I18N.localise("extratrees.block.planks.ebxl." + this.toString().toLowerCase()); } @@ -392,7 +392,7 @@ public class PlankType { @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks.ebxl." + this.toString().toLowerCase() + ".desc"); + return I18N.localise("extratrees.block.planks.ebxl." + this.toString().toLowerCase() + ".desc"); } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 18b39420..f0ff3fd2 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -51,7 +51,7 @@ import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.core.models.DefaultStateMapper; import binnie.core.models.ModelManager; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.PlankType; import binnie.extratrees.block.WoodManager; @@ -199,7 +199,7 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat IPlankType typeSecond = this.getDescription(meta).getSecondaryPlankType(); boolean twoTypes = typeFirst != typeSecond; FenceType fenceType = this.getDescription(meta).getFenceType(); - String woodGrammar = ExtraTrees.proxy.localise("block.multifence" + (twoTypes ? "2" : "") + ".grammar"); + String woodGrammar = I18N.localise("extratrees.block.multifence" + (twoTypes ? "2" : "") + ".grammar"); woodGrammar = woodGrammar.replaceAll("%PREFIX", fenceType.getPrefix()); woodGrammar = woodGrammar.replaceAll("%TYPE", typeSecond.getDesignMaterialName()); diff --git a/src/main/java/binnie/extratrees/block/decor/FenceType.java b/src/main/java/binnie/extratrees/block/decor/FenceType.java index 99e3c132..85360103 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceType.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceType.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; public class FenceType { public static List VALUES; @@ -42,21 +42,21 @@ public class FenceType { public String getPrefix() { String prefix = ""; if (size == 1) { - prefix += ExtraTrees.proxy.localise("multifence.low.type"); + prefix += I18N.localise("extratrees.multifence.low.type"); } else if (size == 2) { - prefix += ExtraTrees.proxy.localise("multifence.full.type"); + prefix += I18N.localise("extratrees.multifence.full.type"); } if (solid) { if (!prefix.isEmpty()) { prefix += " "; } - prefix += ExtraTrees.proxy.localise("multifence.solid.type"); + prefix += I18N.localise("extratrees.multifence.solid.type"); } if (embossed) { if (!prefix.isEmpty()) { prefix += " "; } - prefix += ExtraTrees.proxy.localise("multifence.embedded.type"); + prefix += I18N.localise("extratrees.multifence.embedded.type"); } if (!prefix.isEmpty()) { prefix += " "; diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java index 96280e87..880e4392 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java @@ -6,8 +6,7 @@ import net.minecraft.item.ItemStack; import forestry.api.core.Tabs; -import binnie.Binnie; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; import binnie.extratrees.api.IDesign; import binnie.extratrees.block.PlankType; @@ -28,6 +27,6 @@ public class BlockCarpentry extends BlockDesign { @Override public String getBlockName(final DesignBlock design) { - return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName()); + return I18N.localise("extratrees.block.woodentile.name", design.getDesign().getName()); } } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index e68e134f..5f914182 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -13,10 +13,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import binnie.Binnie; import binnie.core.block.BlockMetadata; import binnie.core.block.TileEntityMetadata; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; public class BlockCarpentryPanel extends BlockCarpentry { public BlockCarpentryPanel() { @@ -72,7 +71,7 @@ public class BlockCarpentryPanel extends BlockCarpentry { @Override public String getDisplayName(final ItemStack itemStack) { final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); - return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName()); + return I18N.localise("extratrees.block.woodenpanel.name", block.getDesign().getName()); } @Override diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 68a8c705..7c8889e2 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -28,9 +28,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import binnie.Binnie; import binnie.core.block.TileEntityMetadata; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; import binnie.extratrees.api.IDesign; public class BlockStainedDesign extends BlockDesign { @@ -100,10 +99,7 @@ public class BlockStainedDesign extends BlockDesign { public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); Block block = iblockstate.getBlock(); - if (block != this) { - return true; - } - return false; + return block != this; } @Override @@ -113,6 +109,6 @@ public class BlockStainedDesign extends BlockDesign { @Override public String getBlockName(final DesignBlock design) { - return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName()); + return I18N.localise("extratrees.block.stainedglass.name", design.getDesign().getName()); } } diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index fb0f918a..7e0c2660 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -37,6 +37,7 @@ import forestry.core.genetics.alleles.AlleleCategorized; import binnie.Binnie; import binnie.Constants; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.FruitPod; import binnie.extratrees.config.ConfigurationMain; @@ -438,7 +439,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Override public String getDescription() { - return ExtraTrees.proxy.localise("item.food." + this.getClass().getTypeName().toLowerCase()); + return I18N.localise("extratrees.item.food." + this.getClass().getTypeName().toLowerCase()); } @Override diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index c113ee87..4debb599 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import binnie.core.item.IItemMiscProvider; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; public enum ExtraTreeItems implements IItemMiscProvider { @@ -39,7 +40,7 @@ public enum ExtraTreeItems implements IItemMiscProvider { @Override public String getName(final ItemStack stack) { - return ExtraTrees.proxy.localise("item." + name + ".name"); + return I18N.localise("extratrees.item." + name + ".name"); } @Override diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index 66238cdf..67a8f8bf 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -14,6 +14,7 @@ import forestry.core.fluids.Fluids; import binnie.core.Mods; import binnie.core.item.IItemMiscProvider; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.alcohol.Juice; @@ -151,7 +152,7 @@ public enum Food implements IItemMiscProvider { @Override public String getName(final ItemStack stack) { - return ExtraTrees.proxy.localise("item.food." + this.name().toLowerCase()); + return I18N.localise("extratrees.item.food." + this.name().toLowerCase()); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java index 4a30f4d9..5e608362 100644 --- a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java @@ -20,6 +20,7 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreesGUID; @@ -43,7 +44,7 @@ public class ItemArboristDatabase extends Item implements IItemModelRegister { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { if (isMaster(stack)) { - tooltip.add(TextFormatting.DARK_PURPLE + ExtraTrees.proxy.localise("item.database.arborist.master.tooltip")); + tooltip.add(TextFormatting.DARK_PURPLE + I18N.localise("extratrees.item.database.arborist.master.tooltip")); } } @@ -71,7 +72,7 @@ public class ItemArboristDatabase extends Item implements IItemModelRegister { @Override public String getItemStackDisplayName(ItemStack itemStack) { - return ExtraTrees.proxy.localise(isMaster(itemStack) ? "item.database.arborist.master.name" : "item.database.arborist.name"); + return I18N.localise("extratrees.item.database.arborist." + (isMaster(itemStack) ? "master.name" : "name")); } protected boolean isMaster(ItemStack itemStack) { diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index 5b8b50b9..ecb8ecbf 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; import binnie.extratrees.api.IToolHammer; public class ItemHammer extends Item implements IToolHammer, IItemModelRegister { @@ -35,7 +35,7 @@ public class ItemHammer extends Item implements IToolHammer, IItemModelRegister @Override public String getItemStackDisplayName(ItemStack itemStack) { - return ExtraTrees.proxy.localise(isDurableHammer ? "item.hammer.master.name" : "item.hammer.name"); + return I18N.localise("extratrees.item.hammer." + (isDurableHammer ? "master.name" : "name")); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemHops.java b/src/main/java/binnie/extratrees/item/ItemHops.java index 57111ea2..fe208b2b 100644 --- a/src/main/java/binnie/extratrees/item/ItemHops.java +++ b/src/main/java/binnie/extratrees/item/ItemHops.java @@ -25,7 +25,7 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; public class ItemHops extends Item implements net.minecraftforge.common.IPlantable, IItemModelRegister { private final Block crops; @@ -76,7 +76,7 @@ public class ItemHops extends Item implements net.minecraftforge.common.IPlantab @Override public String getItemStackDisplayName(ItemStack itemStack) { - return ExtraTrees.proxy.localise("item.hops.name"); + return I18N.localise("extratrees.item.hops.name"); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 9c55898f..c6645ad6 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -20,6 +20,7 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreesGUID; @@ -43,7 +44,7 @@ public class ItemMothDatabase extends Item implements IItemModelRegister { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { if (isMaster(stack)) { - tooltip.add(TextFormatting.DARK_PURPLE + ExtraTrees.proxy.localise("item.database.lepi.master.tooltip")); + tooltip.add(TextFormatting.DARK_PURPLE + I18N.localise("extratrees.item.database.lepi.master.tooltip")); } } @@ -71,7 +72,7 @@ public class ItemMothDatabase extends Item implements IItemModelRegister { @Override public String getItemStackDisplayName(ItemStack itemStack) { - return ExtraTrees.proxy.localise(isMaster(itemStack) ? "item.database.lepi.master.name" : "item.database.lepi.name"); + return I18N.localise("extratrees.item.database.lepi." + (isMaster(itemStack) ? "master.name" : "name")); } protected boolean isMaster(ItemStack itemStack) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index 9b4e61c6..2161409a 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -12,8 +12,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -29,6 +27,7 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.TileEntityMachine; +import binnie.core.util.I18N; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignCategory; @@ -150,7 +149,7 @@ public class ControlTileSelect extends Control implements IControlValue @Override public void getTooltip(final Tooltip tooltip) { - tooltip.add(Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.designer.pattern", this.getValue().getName())); + tooltip.add(I18N.localise("binniecore.gui.designer.pattern", this.getValue().getName())); } @Override diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java index 0a36bb9a..db6ac765 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java @@ -19,7 +19,7 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class PageFruit extends PageAbstract { @@ -34,7 +34,7 @@ public class PageFruit extends PageAbstract { public void onValueChanged(final ItemStack species) { this.deleteAllChildren(); final WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new Area(0, 0, this.size().x(), 24), ExtraTrees.proxy.localise("gui.database.tab.fruit." + (this.treesThatBearFruit ? "natural" : "potential")), TextJustification.MiddleCenter); + new ControlText(this, new Area(0, 0, this.size().x(), 24), I18N.localise("extratrees.gui.database.tab.fruit." + (this.treesThatBearFruit ? "natural" : "potential")), TextJustification.MiddleCenter); final Collection trees = this.treesThatBearFruit ? ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()) : ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatCanBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()); new ControlSpeciesBox(this, 4, 24, this.size().x() - 8, this.size().y() - 4 - 24).setOptions(trees); } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java index 507afc04..edbcf293 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java @@ -5,7 +5,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -17,7 +16,7 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceType; @@ -33,7 +32,7 @@ public class PagePlanksOverview extends PageAbstract { this.deleteAllChildren(); final WindowAbstractDatabase database = Window.get(this); new ControlText(this, new Area(0, 0, this.size().x(), 24), species.getDisplayName(), TextJustification.MiddleCenter); - new ControlText(this, new Area(12, 24, this.size().x() - 24, 24), ExtraTrees.proxy.localise("gui.database.planks.use"), TextJustification.MIDDLE_LEFTt); + new ControlText(this, new Area(12, 24, this.size().x() - 24, 24), I18N.localise("extratrees.gui.database.planks.use"), TextJustification.MIDDLE_LEFTt); final IPlankType type = WoodManager.getPlankType(species); int x = 12; if (type != null) { @@ -62,7 +61,7 @@ public class PagePlanksOverview extends PageAbstract { StringBuilder descBody = new StringBuilder("§o"); String descSig = ""; if (desc == null || desc.length() == 0) { - descBody.append(BinnieCore.getBinnieProxy().localise("gui.database.nodescription")); + descBody.append(I18N.localise("binniecore.gui.database.nodescription")); } else { final String[] descStrings = desc.split("\\|"); descBody.append(descStrings[0]); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index e95db547..5f84348f 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -23,7 +23,6 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.core.Control; @@ -35,7 +34,7 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class PageSpeciesTreeGenome extends PageSpecies { @@ -45,9 +44,9 @@ public class PageSpeciesTreeGenome extends PageSpecies { public static String tolerated(final boolean t) { if (t) { - return BinnieCore.getBinnieProxy().localise("gui.tolerated"); + return I18N.localise("binniecore.gui.tolerated"); } - return BinnieCore.getBinnieProxy().localise("gui.nottolerated"); + return I18N.localise("binniecore.gui.nottolerated"); } @Override @@ -75,7 +74,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { final BreedingSystem syst = Binnie.GENETICS.treeBreedingSystem; new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MIDDLE_LEFTt); y += th; - new ControlText(contents, new Area(0, y, w2, th), BinnieCore.getBinnieProxy().localise("gui.temperature.short") + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(0, y, w2, th), I18N.localise("binniecore.gui.temperature.short") + " : ", TextJustification.MiddleRight); new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFTt); y += th; TextureMap map = Minecraft.getMinecraft().getTextureMapBlocks(); @@ -92,7 +91,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { ex.printStackTrace(); } if (leaf != null) { - new ControlText(contents, new Area(0, y, w2, th2), ExtraTrees.proxy.localise("gui.database.leaves") + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(0, y, w2, th2), I18N.localise("extratrees.gui.database.leaves") + " : ", TextJustification.MiddleRight); new ControlBlockIconDisplay(contents, w2, y, leaf).setColour(leafColour); if (fruit != null && !treeSpecies.getUID().equals("forestry.treeOak")) { new ControlBlockIconDisplay(contents, w2, y, fruit).setColour(fruitColour); @@ -102,7 +101,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { Map products = fruitProvider.getProducts(); ItemStack log = treeSpecies.getWoodProvider().getWoodStack(); if (log.isEmpty()) { - new ControlText(contents, new Area(0, y, w2, th2), ExtraTrees.proxy.localise("gui.database.log") + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(0, y, w2, th2), I18N.localise("extratrees.gui.database.log") + " : ", TextJustification.MiddleRight); final ControlItemDisplay display = new ControlItemDisplay(contents, w2, y); display.setItemStack(log); display.setTooltip(); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java index 3e43e9f8..37965129 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java @@ -26,6 +26,7 @@ import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.block.WoodManager; @@ -120,7 +121,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { @Override public String getName() { - return ExtraTrees.proxy.localise("gui.database.mode." + this.name().toLowerCase()); + return I18N.localise("extratrees.gui.database.mode." + this.name().toLowerCase()); } } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java index 3a79549a..fc96f90f 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java @@ -9,7 +9,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -import binnie.core.BinnieCore; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextEdit; import binnie.core.craftgui.controls.scroll.ControlScrollableContent; @@ -25,6 +24,7 @@ import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.window.Panel; import binnie.core.machines.Machine; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.Designer; import binnie.extratrees.machines.DesignerType; @@ -55,7 +55,7 @@ public class WindowWoodworker extends Window { @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); - new ControlText(this, new Area(190, 36, 114, 10), BinnieCore.getBinnieProxy().localise("gui.design"), TextJustification.TopCenter).setColour(4473924); + new ControlText(this, new Area(190, 36, 114, 10), I18N.localise("binniecore.gui.design"), TextJustification.TopCenter).setColour(4473924); new Panel(this, 188, 48, 118, 126, MinecraftGUI.PanelType.Gray); this.textEdit = new ControlTextEdit(this, 188, 178, 118, 12); final ControlScrollableContent scroll = new ControlScrollableContent(this, 190, 50, 114, 122, 12); diff --git a/src/main/java/binnie/genetics/CreativeTabGenetics.java b/src/main/java/binnie/genetics/CreativeTabGenetics.java index c3a9597e..848c1652 100644 --- a/src/main/java/binnie/genetics/CreativeTabGenetics.java +++ b/src/main/java/binnie/genetics/CreativeTabGenetics.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import binnie.core.util.I18N; import binnie.genetics.item.GeneticsItems; public class CreativeTabGenetics extends CreativeTabs { @@ -24,7 +25,7 @@ public class CreativeTabGenetics extends CreativeTabs { @Override @SideOnly(Side.CLIENT) public String getTabLabel() { - return Genetics.proxy.localise("tab.genetics"); + return I18N.localise("genetics.tab.genetics"); } @Override diff --git a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index cf766975..c53fffe9 100644 --- a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -20,7 +20,7 @@ import forestry.api.genetics.ISpeciesRoot; import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.api.IGene; public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { @@ -69,7 +69,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { } else { list.add(totalList.get(0)); list.add(totalList.get(1)); - list.add(totalList.size() - 2 + " " + Genetics.proxy.localise("item.gene.more.genes")); + list.add(totalList.size() - 2 + " " + I18N.localise("genetics.item.gene.more.genes")); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java index 374d5bb7..c005014c 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java @@ -14,13 +14,13 @@ import forestry.api.lepidopterology.IButterfly; import forestry.apiculture.PluginApiculture; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.util.I18N; //TODO:localise @SideOnly(Side.CLIENT) @@ -42,7 +42,7 @@ public class AnalystPageBehaviour extends ControlAnalystPage { final IAlleleBeeEffect effect = bee.getGenome().getEffect(); final Vec3i t = bee.getGenome().getTerritory(); if (!effect.getUID().contains("None")) { - final String effectDesc = BinnieCore.getBinnieProxy().localiseOrBlank("allele." + effect.getUID() + ".desc"); + final String effectDesc = I18N.localiseOrBlank("binniecore.allele." + effect.getUID() + ".desc"); final String loc = effectDesc.equals("") ? ("Effect: " + effect.getName()) : effectDesc; new ControlText(this, new Area(4, y, this.width() - 8, 0), loc, TextJustification.TopCenter).setColour(this.getColour()); y += CraftGUI.render.textHeight(loc, this.width() - 8) + 1; @@ -62,7 +62,7 @@ public class AnalystPageBehaviour extends ControlAnalystPage { y += 22; final IAlleleButterflyEffect effect2 = bee2.getGenome().getEffect(); if (!effect2.getUID().contains("None")) { - final String effectDesc2 = BinnieCore.getBinnieProxy().localiseOrBlank("allele." + effect2.getUID() + ".desc"); + final String effectDesc2 = I18N.localiseOrBlank("binniecore.allele." + effect2.getUID() + ".desc"); final String loc2 = effectDesc2.equals("") ? ("Effect: " + effect2.getName()) : effectDesc2; new ControlText(this, new Area(4, y, this.width() - 8, 0), loc2, TextJustification.TopCenter).setColour(this.getColour()); y += CraftGUI.render.textHeight(loc2, this.width() - 8) + 1; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java index fc718578..33232beb 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java @@ -22,7 +22,7 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.control.ControlIconDisplay; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.item.ModuleItems; //TODO:localise @@ -37,21 +37,21 @@ public class AnalystPageBiology extends ControlAnalystPage { if (ind instanceof IBee) { final IBee bee = (IBee) ind; if (bee.getGenome().getNeverSleeps()) { - new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconAllDay).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.allday")); + new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconAllDay).addTooltip(I18N.localise("genetics.gui.analyst.biology.bee.allday")); } else if (bee.getGenome().getPrimary().isNocturnal()) { - new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconNight).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.night")); + new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconNight).addTooltip(I18N.localise("genetics.gui.analyst.biology.bee.night")); } else { - new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconDaytime).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.day")); + new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconDaytime).addTooltip(I18N.localise("genetics.gui.analyst.biology.bee.day")); } if (!bee.getGenome().getToleratesRain()) { - new ControlIconDisplay(this, (width() - 64) / 2 + 24, y, ModuleItems.iconNoRain).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.norain")); + new ControlIconDisplay(this, (width() - 64) / 2 + 24, y, ModuleItems.iconNoRain).addTooltip(I18N.localise("genetics.gui.analyst.biology.bee.norain")); } else { - new ControlIconDisplay(this, (width() - 64) / 2 + 24, y, ModuleItems.iconRain).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.rain")); + new ControlIconDisplay(this, (width() - 64) / 2 + 24, y, ModuleItems.iconRain).addTooltip(I18N.localise("genetics.gui.analyst.biology.bee.rain")); } if (bee.getGenome().getCaveDwelling()) { - new ControlIconDisplay(this, (width() - 64) / 2 + 48, y, ModuleItems.iconNoSky).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.nosky")); + new ControlIconDisplay(this, (width() - 64) / 2 + 48, y, ModuleItems.iconNoSky).addTooltip(I18N.localise("genetics.gui.analyst.biology.bee.nosky")); } else { - new ControlIconDisplay(this, (width() - 64) / 2 + 48, y, ModuleItems.iconSky).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.sky")); + new ControlIconDisplay(this, (width() - 64) / 2 + 48, y, ModuleItems.iconSky).addTooltip(I18N.localise("genetics.gui.analyst.biology.bee.sky")); } y += 30; } else if (ind instanceof IButterfly) { @@ -166,6 +166,6 @@ public class AnalystPageBiology extends ControlAnalystPage { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.biology.title"); + return I18N.localise("genetics.gui.analyst.biology.title"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index a9d17d34..e834250f 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -30,7 +30,7 @@ import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; public class AnalystPageDatabase extends ControlAnalystPage { private final ControlScrollableContent scroll; @@ -183,7 +183,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.registry.title"); + return I18N.localise("genetics.gui.analyst.registry.title"); } private Collection getSpecies(final BreedingSystem system) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java index f5c453c2..cb3f95b0 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java @@ -17,7 +17,7 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class AnalystPageDescription extends ControlAnalystPage { @@ -59,10 +59,10 @@ public class AnalystPageDescription extends ControlAnalystPage { y += 10; new ControlTextCentered(this, y, TextFormatting.ITALIC + branchBinomial + " " + species.getBinomial() + TextFormatting.RESET).setColour(this.getColour()); y += 20; - String discovered = Genetics.proxy.localise("gui.analyst.desc.discovered") + " " + TextFormatting.BOLD + authority + TextFormatting.RESET; + String discovered = I18N.localise("genetics.gui.analyst.desc.discovered") + " " + TextFormatting.BOLD + authority + TextFormatting.RESET; new ControlTextCentered(this, y, discovered).setColour(this.getColour()); y += (int) (3.0f + CraftGUI.render.textHeight(discovered, this.width())); - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.desc.complexity") + ": " + species.getComplexity()).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.desc.complexity") + ": " + species.getComplexity()).setColour(this.getColour()); y += 26; final ControlText descText = new ControlText(this, new Area(8, y, this.width() - 16, 0), descBody + "§r", TextJustification.TopCenter); final IWidget signatureText = new ControlText(this, new Area(8, y, this.width() - 16, 0), descSig + "§r", TextJustification.BottomRight); @@ -75,6 +75,6 @@ public class AnalystPageDescription extends ControlAnalystPage { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.desc.title"); + return I18N.localise("genetics.gui.analyst.desc.title"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index 72e4ce3e..1b56574d 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -22,7 +22,7 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.genetics.BreedingSystem; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class AnalystPageGenome extends ControlAnalystPage { @@ -65,6 +65,6 @@ public class AnalystPageGenome extends ControlAnalystPage { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.genome." + (this.active ? "active" : "inactive")) + " " + Genetics.proxy.localise("gui.analyst.genome.title"); + return I18N.localise("genetics.gui.analyst.genome." + (this.active ? "active" : "inactive")) + " " + I18N.localise("genetics.gui.analyst.genome.title"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java index 0f3ce92a..edc723cc 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java @@ -12,7 +12,7 @@ import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.core.genetics.BreedingSystem; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; public class AnalystPageKaryogram extends ControlAnalystPage { public AnalystPageKaryogram(final IWidget parent, final Area area, final IIndividual ind) { @@ -45,6 +45,6 @@ public class AnalystPageKaryogram extends ControlAnalystPage { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.karyogram.title"); + return I18N.localise("genetics.gui.analyst.karyogram.title"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index 8d48f6d8..1cf31de1 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -33,7 +33,7 @@ import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.resource.BinnieSprite; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.item.ModuleItems; public class AnalystPageMutations extends ControlAnalystPage { @@ -86,21 +86,21 @@ public class AnalystPageMutations extends ControlAnalystPage { hive = new ItemStack(Blocks.CHEST); } if (ind.getGenome().getPrimary() == ForestryAllele.BeeSpecies.Valiant.getAllele()) { - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.mutations.bee.natural")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.mutations.bee.natural")).setColour(this.getColour()); y += 10; - new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.mutations.bee.hive")).setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise("genetics.gui.analyst.mutations.bee.hive")).setColour(this.getColour()); y += 22; } else if (ind.getGenome().getPrimary() == ForestryAllele.BeeSpecies.Monastic.getAllele()) { - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.mutations.bee.natural")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.mutations.bee.natural")).setColour(this.getColour()); y += 10; - new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.mutations.bee.villager")).setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise("genetics.gui.analyst.mutations.bee.villager")).setColour(this.getColour()); y += 22; } else if (hive != null) { - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.mutations.bee.natural")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.mutations.bee.natural")).setColour(this.getColour()); y += 10; final ControlItemDisplay display = new ControlItemDisplay(this, (this.width() - 16) / 2, y); if (ind.getGenome().getPrimary() == ForestryAllele.BeeSpecies.Steadfast.getAllele()) { - display.addTooltip(Genetics.proxy.localise("gui.analyst.mutations.bee.dungeon")); + display.addTooltip(I18N.localise("genetics.gui.analyst.mutations.bee.dungeon")); } else { display.setTooltip(); } @@ -114,7 +114,7 @@ public class AnalystPageMutations extends ControlAnalystPage { if (resultant.size() == 1) { ox = (this.width() - 44) / 2; } - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.mutations.resultant")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.mutations.resultant")).setColour(this.getColour()); y += 10; for (final IMutation mutation : resultant) { final float specificChance = this.getSpecificChance(ind, mutation, system); @@ -128,9 +128,9 @@ public class AnalystPageMutations extends ControlAnalystPage { final IAlleleSpecies species2 = mutation.getAllele1(); final String comb = species0.getName() + " + " + species2.getName(); this.addTooltip(comb); - String chance = getMutationColour(mutation.getBaseChance()).getCode() + (int) mutation.getBaseChance() + "% " + Genetics.proxy.localise("gui.analyst.mutations.chance"); + String chance = getMutationColour(mutation.getBaseChance()).getCode() + (int) mutation.getBaseChance() + "% " + I18N.localise("genetics.gui.analyst.mutations.chance"); if (specificChance != mutation.getBaseChance()) { - chance = chance + getMutationColour(specificChance).getCode() + " (" + (int) specificChance + "% " + Genetics.proxy.localise("gui.analyst.mutations.currently") + ")"; + chance = chance + getMutationColour(specificChance).getCode() + " (" + (int) specificChance + "% " + I18N.localise("genetics.gui.analyst.mutations.currently") + ")"; } this.addTooltip(chance); for (final String s : mutation.getSpecialConditions()) { @@ -171,7 +171,7 @@ public class AnalystPageMutations extends ControlAnalystPage { if (further.size() == 1) { ox = (this.width() - 44) / 2; } - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.mutations.further")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.mutations.further")).setColour(this.getColour()); y += 10; for (final IMutation mutation : further) { final IAllele speciesComb = mutation.getPartner(speciesCurrent); @@ -187,9 +187,9 @@ public class AnalystPageMutations extends ControlAnalystPage { this.addTooltip(species2.getName()); final String comb = speciesCurrent.getName() + " + " + species0.getName(); this.addTooltip(comb); - String chance = getMutationColour(mutation.getBaseChance()).getCode() + (int) mutation.getBaseChance() + "% " + Genetics.proxy.localise("gui.analyst.mutations.chance"); + String chance = getMutationColour(mutation.getBaseChance()).getCode() + (int) mutation.getBaseChance() + "% " + I18N.localise("genetics.gui.analyst.mutations.chance"); if (specificChance2 != mutation.getBaseChance()) { - chance = chance + getMutationColour(specificChance2).getCode() + " (" + (int) specificChance2 + "% " + Genetics.proxy.localise("gui.analyst.mutations.currently") + ")"; + chance = chance + getMutationColour(specificChance2).getCode() + " (" + (int) specificChance2 + "% " + I18N.localise("genetics.gui.analyst.mutations.currently") + ")"; } this.addTooltip(chance); for (final String s : mutation.getSpecialConditions()) { @@ -243,7 +243,7 @@ public class AnalystPageMutations extends ControlAnalystPage { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.mutations.title"); + return I18N.localise("genetics.gui.analyst.mutations.title"); } protected EnumColor getMutationColour(final float percent) { @@ -269,13 +269,13 @@ public class AnalystPageMutations extends ControlAnalystPage { public ControlUnknownMutation(final IWidget parent, final int x, final int y, final int w, final int h) { super(parent, x, y, w, h); this.addAttribute(Attribute.MouseOver); - this.addTooltip(Genetics.proxy.localise("gui.analyst.mutations.unknown.tooltip")); + this.addTooltip(I18N.localise("genetics.gui.analyst.mutations.unknown.tooltip")); } @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - RenderUtil.drawText(this.getArea(), TextJustification.MiddleCenter, Genetics.proxy.localise("gui.analyst.mutations.unknown"), 11184810); + RenderUtil.drawText(this.getArea(), TextJustification.MiddleCenter, I18N.localise("genetics.gui.analyst.mutations.unknown"), 11184810); } } } diff --git a/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java index 48c337fe..9a495cab 100644 --- a/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java @@ -33,9 +33,9 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.kitchen.craftgui.ControlFluidDisplay; -import binnie.genetics.Genetics; import binnie.genetics.gui.AnalystPageProduce; public class AnalystPageProducts extends AnalystPageProduce { @@ -48,7 +48,7 @@ public class AnalystPageProducts extends AnalystPageProduce { int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.produces.rate") + ": " + Binnie.GENETICS.beeBreedingSystem.getAlleleName(EnumBeeChromosome.SPEED, ind.getGenome().getActiveAllele(EnumBeeChromosome.SPEED))).setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise("genetics.gui.analyst.produces.rate") + ": " + Binnie.GENETICS.beeBreedingSystem.getAlleleName(EnumBeeChromosome.SPEED, ind.getGenome().getActiveAllele(EnumBeeChromosome.SPEED))).setColour(this.getColour()); y += 20; final Collection refinedProducts = new UniqueItemStackSet(); final Collection productList = new UniqueItemStackSet(); @@ -57,7 +57,7 @@ public class AnalystPageProducts extends AnalystPageProduce { products.putAll(genome.getPrimary().getProductChances()); products.putAll(genome.getSecondary().getProductChances()); if (!products.isEmpty()) { - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.products.natural")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.products.natural")).setColour(this.getColour()); y += 12; for (final Map.Entry entry : products.entrySet()) { if (!productList.add(entry.getKey())) { @@ -71,7 +71,7 @@ public class AnalystPageProducts extends AnalystPageProduce { } products = genome.getPrimary().getSpecialtyChances(); if (!products.isEmpty()) { - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.products.specialty")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.products.specialty")).setColour(this.getColour()); y += 12; for (final Map.Entry entry : products.entrySet()) { refinedProducts.addAll(this.getAllProducts(entry.getKey())); @@ -80,7 +80,7 @@ public class AnalystPageProducts extends AnalystPageProduce { } y += 12; } - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.products.refined")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.products.refined")).setColour(this.getColour()); y += 12; Collection level2Products = new UniqueItemStackSet(); for (final ItemStack stack : refinedProducts) { @@ -165,7 +165,7 @@ public class AnalystPageProducts extends AnalystPageProduce { super.getTooltip(tooltip); final Collection products = AnalystPageProducts.this.getCentrifuge(key); if (!products.isEmpty()) { - tooltip.add(Genetics.proxy.localise("gui.analyst.products.centrifuges") + ": "); + tooltip.add(I18N.localise("genetics.gui.analyst.products.centrifuges") + ": "); for (final ItemStack prod : products) { final NBTTagCompound nbt = new NBTTagCompound(); prod.writeToNBT(nbt); @@ -174,7 +174,7 @@ public class AnalystPageProducts extends AnalystPageProduce { } final Collection liquids = AnalystPageProducts.this.getSqueezer(key); if (!liquids.isEmpty()) { - tooltip.add(Genetics.proxy.localise("gui.analyst.products.squeezes") + ": "); + tooltip.add(I18N.localise("genetics.gui.analyst.products.squeezes") + ": "); for (final ItemStack prod2 : liquids) { final NBTTagCompound nbt2 = new NBTTagCompound(); prod2.writeToNBT(nbt2); @@ -189,11 +189,11 @@ public class AnalystPageProducts extends AnalystPageProduce { CraftGUIUtil.moveWidget(textWidget, new Point(12, 0)); item.setItemStack(key); final int time = (int) (PluginApiculture.ticksPerBeeWorkCycle * 100.0 / (speed * value)); - textWidget.setValue(Genetics.proxy.localise("gui.analyst.products.every") + " " + this.getTimeString(time)); + textWidget.setValue(I18N.localise("genetics.gui.analyst.products.every") + " " + this.getTimeString(time)); } @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.produces.title"); + return I18N.localise("genetics.gui.analyst.produces.title"); } } diff --git a/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java b/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java index 698bd5af..0eba33db 100644 --- a/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java +++ b/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java @@ -7,7 +7,7 @@ import forestry.api.lepidopterology.IButterfly; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.gui.ControlAnalystPage; import binnie.genetics.gui.ControlIndividualDisplay; @@ -24,6 +24,6 @@ public class AnalystPageSpecimen extends ControlAnalystPage { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.specimen.title"); + return I18N.localise("genetics.gui.analyst.specimen.title"); } } diff --git a/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java index ccb75ea0..3c906bb9 100644 --- a/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java @@ -19,7 +19,7 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.control.ControlIconDisplay; import binnie.core.craftgui.renderer.RenderUtil; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.gui.ControlAnalystPage; public class AnalystPageAppearance extends ControlAnalystPage { @@ -32,11 +32,11 @@ public class AnalystPageAppearance extends ControlAnalystPage { new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 12; final ControlColourDisplay a = new ControlColourDisplay(this, this.width() / 2 - 28, y, genome.getPrimaryColor()); - a.addTooltip(Genetics.proxy.localise("gui.analyst.appearance.primary")); + a.addTooltip(I18N.localise("genetics.gui.analyst.appearance.primary")); final ControlColourDisplay b = new ControlColourDisplay(this, this.width() / 2 - 8, y, genome.getSecondaryColor()); - b.addTooltip(Genetics.proxy.localise("gui.analyst.appearance.secondary")); + b.addTooltip(I18N.localise("genetics.gui.analyst.appearance.secondary")); final ControlColourDisplay c = new ControlColourDisplay(this, this.width() / 2 + 12, y, genome.getStemColor()); - c.addTooltip(Genetics.proxy.localise("gui.analyst.appearance.stem")); + c.addTooltip(I18N.localise("genetics.gui.analyst.appearance.stem")); y += 26; IFlowerType type = genome.getType(); final int sections = type.getSections(); @@ -71,6 +71,6 @@ public class AnalystPageAppearance extends ControlAnalystPage { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.appearance.title"); + return I18N.localise("genetics.gui.analyst.appearance.title"); } } diff --git a/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java index f646ed16..41738127 100644 --- a/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java @@ -21,7 +21,7 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.Tolerance; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.gui.ControlAnalystPage; import binnie.genetics.gui.ControlToleranceBar; @@ -36,15 +36,15 @@ public class AnalystPageSoil extends ControlAnalystPage { int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 16; - new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.tolerance.moisture"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), I18N.localise("genetics.gui.analyst.soil.tolerance.moisture"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; this.createMoisture(this, (this.width() - 100) / 2, y, 100, 10, moisture, moistureTol); y += 16; - new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.tolerance.ph"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), I18N.localise("genetics.gui.analyst.soil.tolerance.ph"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; this.createAcidity(this, (this.width() - 100) / 2, y, 100, 10, pH, pHTol); y += 16; - new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.recommended"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), I18N.localise("genetics.gui.analyst.soil.recommended"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; EnumMoisture recomMoisture = EnumMoisture.NORMAL; final boolean canTolNormal = Tolerance.canTolerate(moisture, EnumMoisture.NORMAL, moistureTol); @@ -87,7 +87,7 @@ public class AnalystPageSoil extends ControlAnalystPage { recomSoil.setItemStack(stack); recomSoil.setTooltip(); y += 32; - new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.other"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), I18N.localise("genetics.gui.analyst.soil.other"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; final List stacks = new ArrayList<>(); for (final EnumAcidity a : EnumSet.range(EnumAcidity.ACID, EnumAcidity.ALKALINE)) { @@ -111,7 +111,7 @@ public class AnalystPageSoil extends ControlAnalystPage { new ControlToleranceBar(parent, x, y, w, h, EnumMoisture.class) { @Override protected String getName(final EnumMoisture value) { - return value.getTranslated(false); + return value.getLocalisedName(false); } @Override @@ -125,7 +125,7 @@ public class AnalystPageSoil extends ControlAnalystPage { new ControlToleranceBar(parent, x, y, w, h, EnumAcidity.class) { @Override protected String getName(final EnumAcidity value) { - return value.getTranslated(false); + return value.getLocalisedName(false); } @Override @@ -137,6 +137,6 @@ public class AnalystPageSoil extends ControlAnalystPage { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.soil.title"); + return I18N.localise("genetics.gui.analyst.soil.title"); } } diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java index b67899c0..195d48c6 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java @@ -26,7 +26,7 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.genetics.Tolerance; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.gui.ControlAnalystPage; import binnie.genetics.gui.ControlBiome; import binnie.genetics.gui.ControlToleranceBar; @@ -54,17 +54,17 @@ public class AnalystPageClimate extends ControlAnalystPage { int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 16; - new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.climate.temp"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), I18N.localise("genetics.gui.analyst.climate.temp"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; this.createTemperatureBar(this, (this.width() - 100) / 2, y, 100, 10, temp, tempTol); y += 16; if (!(ind instanceof IFlower)) { - new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.climate.hum"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), I18N.localise("genetics.gui.analyst.climate.hum"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; this.createHumidity(this, (this.width() - 100) / 2, y, 100, 10, humid, humidTol); y += 16; } - new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.climate.biomes"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), I18N.localise("genetics.gui.analyst.climate.biomes"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; final List biomes = new ArrayList<>(); for (final Biome biome : Biome.EXPLORATION_BIOMES_LIST) { //TODO check @@ -128,6 +128,6 @@ public class AnalystPageClimate extends ControlAnalystPage { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.climate.title"); + return I18N.localise("genetics.gui.analyst.climate.title"); } } diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java index f075e3b3..13516a1e 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java @@ -25,8 +25,8 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; -import binnie.genetics.Genetics; import binnie.genetics.gui.AnalystPageProduce; public class AnalystPageFruit extends AnalystPageProduce { @@ -37,7 +37,7 @@ public class AnalystPageFruit extends AnalystPageProduce { int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.fruit.yield") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise("genetics.gui.analyst.fruit.yield") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColour(this.getColour()); y += 20; final Collection products = new UniqueItemStackSet(); final Collection specialties = new UniqueItemStackSet(); @@ -55,7 +55,7 @@ public class AnalystPageFruit extends AnalystPageProduce { throw Throwables.propagate(e); } if (products.size() > 0) { - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.fruit.natural")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.fruit.natural")).setColour(this.getColour()); y += 10; final int w = products.size() * 18 - 2; final int i = 0; @@ -67,7 +67,7 @@ public class AnalystPageFruit extends AnalystPageProduce { y += 26; } if (specialties.size() > 0) { - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.fruit.specialty")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.fruit.specialty")).setColour(this.getColour()); y += 10; final int w = products.size() * 18 - 2; final int i = 0; @@ -84,14 +84,14 @@ public class AnalystPageFruit extends AnalystPageProduce { final Collection refinedProducts = new UniqueItemStackSet(); refinedProducts.addAll(this.getAllProductsAndFluids(allProducts)); if (refinedProducts.size() > 0) { - y = this.getRefined(Genetics.proxy.localise("gui.analyst.fruit.refined"), y, refinedProducts); + y = this.getRefined(I18N.localise("genetics.gui.analyst.fruit.refined"), y, refinedProducts); y += 8; } if (products.size() == 0 && specialties.size() == 0) { - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.fruit.noFruits")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.fruit.noFruits")).setColour(this.getColour()); y += 28; } - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.fruit.possible")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.fruit.possible")).setColour(this.getColour()); y += 12; final Collection fruitAlleles = Binnie.GENETICS.getChromosomeMap(Binnie.GENETICS.getTreeRoot()).get(EnumTreeChromosome.FRUITS); for (final IFruitFamily fam : ind.getGenome().getPrimary().getSuitableFruit()) { @@ -125,6 +125,6 @@ public class AnalystPageFruit extends AnalystPageProduce { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.fruit.title"); + return I18N.localise("genetics.gui.analyst.fruit.title"); } } diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java index 5d309a28..4094667e 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java @@ -11,7 +11,7 @@ import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.gui.ControlAnalystPage; public class AnalystPageGrowth extends ControlAnalystPage { @@ -25,18 +25,18 @@ public class AnalystPageGrowth extends ControlAnalystPage { if (ind instanceof ITree) { final ITree tree = (ITree) ind; final int mat = tree.getGenome().getMaturationTime(); - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.growth.mature")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.growth.mature")).setColour(this.getColour()); y += 12; new ControlTextCentered(this, y, TextFormatting.BOLD + this.getTimeString(Math.round(1373.3999f * mat))).setColour(this.getColour()); y += 22; - new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.growth.height") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise("genetics.gui.analyst.growth.height") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColour(this.getColour()); y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.growth.girth") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise("genetics.gui.analyst.growth.girth") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColour(this.getColour()); } } @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.growth.title"); + return I18N.localise("genetics.gui.analyst.growth.title"); } } diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java index 2f901eb1..06e87f5c 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java @@ -20,8 +20,8 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.control.ControlIconDisplay; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; -import binnie.genetics.Genetics; import binnie.genetics.gui.AnalystPageProduce; import binnie.genetics.item.ModuleItems; @@ -35,9 +35,9 @@ public class AnalystPageWood extends AnalystPageProduce { new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 12; if (((IAlleleBoolean) ind.getGenome().getActiveAllele(EnumTreeChromosome.FIREPROOF)).getValue()) { - new ControlIconDisplay(this, (width() - 16) / 2, y, ModuleItems.iconNoFire).addTooltip(Genetics.proxy.localise("gui.analyst.wood.fireproof")); + new ControlIconDisplay(this, (width() - 16) / 2, y, ModuleItems.iconNoFire).addTooltip(I18N.localise("genetics.gui.analyst.wood.fireproof")); } else { - new ControlIconDisplay(this, (width() - 16) / 2, y, ModuleItems.iconFire).addTooltip(Genetics.proxy.localise("gui.analyst.wood.flammable")); + new ControlIconDisplay(this, (width() - 16) / 2, y, ModuleItems.iconFire).addTooltip(I18N.localise("genetics.gui.analyst.wood.flammable")); } y += 30; final Collection products = new UniqueItemStackSet(); @@ -49,7 +49,7 @@ public class AnalystPageWood extends AnalystPageProduce { } products.addAll(ind.getGenome().getFruitProvider().getProducts().keySet()); if (products.size() > 0) { - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.wood.logs")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.wood.logs")).setColour(this.getColour()); y += 10; final int w = products.size() * 18 - 2; final int i = 0; @@ -65,11 +65,11 @@ public class AnalystPageWood extends AnalystPageProduce { final Collection refinedProducts = new UniqueItemStackSet(); refinedProducts.addAll(this.getAllProductsAndFluids(allProducts)); if (refinedProducts.size() > 0) { - y = this.getRefined(Genetics.proxy.localise("gui.analyst.wood.refined"), y, refinedProducts); + y = this.getRefined(I18N.localise("genetics.gui.analyst.wood.refined"), y, refinedProducts); y += 8; } if (products.size() == 0) { - new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.wood.noFruits")).setColour(this.getColour()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.wood.noFruits")).setColour(this.getColour()); y += 28; } this.setSize(new Point(this.width(), y + 8)); @@ -77,6 +77,6 @@ public class AnalystPageWood extends AnalystPageProduce { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.wood.title"); + return I18N.localise("genetics.gui.analyst.wood.title"); } } diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index d56a46c1..387b2042 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -16,6 +16,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; import binnie.core.item.ItemCore; +import binnie.core.util.I18N; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; @@ -59,7 +60,7 @@ public class ItemDatabase extends ItemCore { @Override public String getItemStackDisplayName(ItemStack itemStack) { - return Genetics.proxy.localise(isMaster(itemStack) ? "item.database.master.name" : "item.database.name"); + return I18N.localise("genetics." + (isMaster(itemStack) ? "item.database.master.name" : "item.database.name")); } protected boolean isMaster(ItemStack itemStack) { diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index 8ba87c9a..f1886ef6 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -15,8 +15,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.items.IColoredItem; import binnie.core.item.ItemCore; +import binnie.core.util.I18N; import binnie.genetics.CreativeTabGenetics; -import binnie.genetics.Genetics; import binnie.genetics.genetics.IGeneItem; public abstract class ItemGene extends ItemCore implements IColoredItem { @@ -34,11 +34,11 @@ public abstract class ItemGene extends ItemCore implements IColoredItem { public void addInformation(final ItemStack itemstack, final EntityPlayer entityPlayer, final List list, final boolean advanced) { int damage = itemstack.getMaxDamage() - itemstack.getItemDamage(); if (damage == 0) { - list.add(Genetics.proxy.localise("item.gene.empty")); + list.add(I18N.localise("genetics.item.gene.empty")); } else if (damage == 1) { - list.add("1 " + Genetics.proxy.localise("item.gene.charge")); + list.add("1 " + I18N.localise("genetics.item.gene.charge")); } else { - list.add(damage + " " + Genetics.proxy.localise("item.gene.charges")); + list.add(damage + " " + I18N.localise("genetics.item.gene.charges")); } IGeneItem gene = this.getGeneItem(itemstack); if (gene != null) { diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index a1e63588..8dd49ede 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -21,6 +21,7 @@ import forestry.api.genetics.ISpeciesRoot; import binnie.Binnie; import binnie.core.genetics.Gene; import binnie.core.item.ItemCore; +import binnie.core.util.I18N; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; @@ -53,30 +54,30 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar public String getItemStackDisplayName(ItemStack itemstack) { GeneItem gene = GeneItem.create(itemstack); if (gene == null) { - return Genetics.proxy.localise("item.sequence.corrupted"); + return I18N.localise("genetics.item.sequence.corrupted"); } else { - return gene.getBreedingSystem().getDescriptor() + " " + Genetics.proxy.localise("item.sequence.name"); + return gene.getBreedingSystem().getDescriptor() + " " + I18N.localise("genetics.item.sequence.name"); } } @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemStack, EntityPlayer player, List subItems, boolean advanced) { - subItems.add(Genetics.proxy.localise("item.sequence." + (5 - itemStack.getItemDamage() % 6))); + subItems.add(I18N.localise("genetics.item.sequence." + (5 - itemStack.getItemDamage() % 6))); SequencerItem gene = SequencerItem.create(itemStack); if (gene != null) { if (gene.analysed) { gene.getInfo(subItems); } else { - subItems.add("<" + Genetics.proxy.localise("item.sequence.unknown") + ">"); + subItems.add("<" + I18N.localise("genetics.item.sequence.unknown") + ">"); } int seq = gene.sequenced; if (seq == 0) { - subItems.add(Genetics.proxy.localise("item.sequence.unsequenced")); + subItems.add(I18N.localise("genetics.item.sequence.unsequenced")); } else if (seq < 100) { - subItems.add(String.format(Genetics.proxy.localise("genetics.item.sequence.partially"), seq)); + subItems.add(I18N.localise("genetics.genetics.item.sequence.partially", seq)); } else { - subItems.add(Genetics.proxy.localise("item.sequence.sequenced")); + subItems.add(I18N.localise("genetics.item.sequence.sequenced")); } } } diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index ca673a1b..a5d188b3 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -22,6 +22,7 @@ import forestry.api.genetics.ISpeciesRoot; import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; @@ -102,9 +103,9 @@ public class ItemSerum extends ItemGene implements IItemSerum { GeneItem gene = this.getGeneItem(itemstack); if (gene != null && gene.getSpeciesRoot() != null) { BreedingSystem system = Binnie.GENETICS.getSystem(gene.getSpeciesRoot()); - return system.getDescriptor() + " " + Genetics.proxy.localise("item.gene.serum"); + return system.getDescriptor() + " " + I18N.localise("genetics.item.gene.serum"); } else { - return Genetics.proxy.localise("item.gene.corrupted.serum"); + return I18N.localise("genetics.item.gene.corrupted.serum"); } } diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 9cfb5007..fa155e34 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -22,6 +22,7 @@ import forestry.api.genetics.ISpeciesRoot; import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; @@ -117,10 +118,10 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { ISpeciesRoot speciesRoot = geneItem.getSpeciesRoot(); if (speciesRoot != null) { BreedingSystem system = Binnie.GENETICS.getSystem(speciesRoot); - return system.getDescriptor() + " " + Genetics.proxy.localise("item.gene.serum.array"); + return system.getDescriptor() + " " + I18N.localise("genetics.item.gene.serum.array"); } } - return Genetics.proxy.localise("item.gene.serum.array.corrupted"); + return I18N.localise("genetics.item.gene.serum.array.corrupted"); } @Override diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java index da851a5a..e0492f13 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import binnie.core.machines.IMachine; import binnie.core.machines.power.ComponentProcessIndefinate; import binnie.core.machines.power.ErrorState; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; public class AcclimatiserLogic extends ComponentProcessIndefinate { public AcclimatiserLogic(final IMachine machine) { @@ -18,10 +18,10 @@ public class AcclimatiserLogic extends ComponentProcessIndefinate { @Override public ErrorState canWork() { if (this.getUtil().getStack(Acclimatiser.SLOT_TARGET).isEmpty()) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.labMachine.acclimatiser.errors.no.individual.desc"), Acclimatiser.SLOT_TARGET); + return new ErrorState.NoItem(I18N.localise("genetics.machine.labMachine.acclimatiser.errors.no.individual.desc"), Acclimatiser.SLOT_TARGET); } if (this.getUtil().getNonEmptyStacks(Acclimatiser.SLOT_ACCLIMATISER).isEmpty()) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.labMachine.acclimatiser.errors.no.item.desc"), Acclimatiser.SLOT_ACCLIMATISER); + return new ErrorState.NoItem(I18N.localise("genetics.machine.labMachine.acclimatiser.errors.no.item.desc"), Acclimatiser.SLOT_ACCLIMATISER); } return super.canWork(); } @@ -29,7 +29,7 @@ public class AcclimatiserLogic extends ComponentProcessIndefinate { @Override public ErrorState canProgress() { if (!Acclimatiser.canAcclimatise(this.getUtil().getStack(Acclimatiser.SLOT_TARGET), this.getUtil().getNonEmptyStacks(Acclimatiser.SLOT_ACCLIMATISER))) { - return new ErrorState.InvalidItem(Genetics.proxy.localise("machine.labMachine.acclimatiser.errors.can.not.acclimatise.desc"), Acclimatiser.SLOT_TARGET); + return new ErrorState.InvalidItem(I18N.localise("genetics.machine.labMachine.acclimatiser.errors.can.not.acclimatise.desc"), Acclimatiser.SLOT_TARGET); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java b/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java index d3d14007..e6669431 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java @@ -3,7 +3,7 @@ package binnie.genetics.machine.acclimatiser; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; public class ValidatorAcclimatiserItem extends SlotValidator { public ValidatorAcclimatiserItem() { @@ -22,6 +22,6 @@ public class ValidatorAcclimatiserItem extends SlotValidator { @Override public String getTooltip() { - return Genetics.proxy.localise("machine.labMachine.acclimatiser.tooltips.slots.acclimatising"); + return I18N.localise("genetics.machine.labMachine.acclimatiser.tooltips.slots.acclimatising"); } } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java index 1a34b0b0..55b0dcea 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java @@ -16,6 +16,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; @@ -48,7 +49,7 @@ public class WindowAcclimatiser extends WindowMachine { @Override public String getTitle() { - return Genetics.proxy.localise("machine.labMachine.acclimatiser"); + return I18N.localise("genetics.machine.labMachine.acclimatiser"); } @Override diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java index 22d6fd1d..9d0b71ee 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java @@ -6,7 +6,7 @@ import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; public class AnalyserLogic extends ComponentProcessSetCost implements IProcess { private static final float DYE_PER_TICK = 0.002f; @@ -18,11 +18,11 @@ public class AnalyserLogic extends ComponentProcessSetCost implements IProcess { @Override public ErrorState canWork() { if (this.getUtil().isSlotEmpty(Analyser.SLOT_TARGET)) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.labMachine.analyser.errors.no.item.desc"), Analyser.SLOT_TARGET); + return new ErrorState.NoItem(I18N.localise("genetics.machine.labMachine.analyser.errors.no.item.desc"), Analyser.SLOT_TARGET); } final boolean analysed = Analyser.isAnalysed(this.getUtil().getStack(Analyser.SLOT_TARGET)); if (analysed) { - return new ErrorState.InvalidItem(Genetics.proxy.localise("machine.labMachine.analyser.errors.already.analysed.desc"), Genetics.proxy.localise("machine.labMachine.analyser.errors.already.analysed.info"), Analyser.SLOT_TARGET); + return new ErrorState.InvalidItem(I18N.localise("genetics.machine.labMachine.analyser.errors.already.analysed.desc"), I18N.localise("genetics.machine.labMachine.analyser.errors.already.analysed.info"), Analyser.SLOT_TARGET); } return super.canWork(); } @@ -30,10 +30,10 @@ public class AnalyserLogic extends ComponentProcessSetCost implements IProcess { @Override public ErrorState canProgress() { if(getMachine().getOwner() == null){ - return new ErrorState.InvalidItem(Genetics.proxy.localise("genetics.machine.errors.no.owner.desc"), Genetics.proxy.localise("genetics.machine.errors.no.owner.info"), Analyser.SLOT_TARGET); + return new ErrorState.InvalidItem(I18N.localise("genetics.genetics.machine.errors.no.owner.desc"), I18N.localise("genetics.genetics.machine.errors.no.owner.info"), Analyser.SLOT_TARGET); } if (this.getUtil().getSlotCharge(Analyser.SLOT_DYE) == 0.0f) { - return new ErrorState.Item(Genetics.proxy.localise("machine.labMachine.analyser.errors.insufficient.dye.desc"), Genetics.proxy.localise("machine.labMachine.analyser.errors.insufficient.dye.info"), new int[]{13}); + return new ErrorState.Item(I18N.localise("genetics.machine.labMachine.analyser.errors.insufficient.dye.desc"), I18N.localise("genetics.machine.labMachine.analyser.errors.insufficient.dye.info"), new int[]{13}); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java b/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java index 933502e7..bef4cb76 100644 --- a/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java +++ b/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java @@ -3,7 +3,7 @@ package binnie.genetics.machine.analyser; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; public class SlotValidatorUnanalysed extends SlotValidator { public SlotValidatorUnanalysed() { @@ -17,6 +17,6 @@ public class SlotValidatorUnanalysed extends SlotValidator { @Override public String getTooltip() { - return Genetics.proxy.localise("machine.labMachine.analyser.tooltips.slots.unanalysed"); + return I18N.localise("genetics.machine.labMachine.analyser.tooltips.slots.unanalysed"); } } diff --git a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java index dead60a3..0659210e 100644 --- a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java @@ -21,6 +21,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotCharge; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.craftgui.window.Panel; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; @@ -62,7 +63,7 @@ public class WindowAnalyser extends WindowMachine { @Override public String getTitle() { - return Genetics.proxy.localise("machine.labMachine.analyser"); + return I18N.localise("genetics.machine.labMachine.analyser"); } @Override diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java index 46130de0..d509e2b4 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java @@ -11,7 +11,7 @@ import binnie.core.machines.inventory.IChargedSlots; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.item.GeneticLiquid; public class GenepoolLogic extends ComponentProcessSetCost implements IProcess { @@ -42,7 +42,7 @@ public class GenepoolLogic extends ComponentProcessSetCost implements IProcess { @Override public ErrorState canWork() { if (this.getUtil().isSlotEmpty(Genepool.SLOT_BEE)) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.errors.no.individual.desc"), Genepool.SLOT_BEE); + return new ErrorState.NoItem(I18N.localise("genetics.machine.errors.no.individual.desc"), Genepool.SLOT_BEE); } return super.canWork(); } @@ -51,13 +51,13 @@ public class GenepoolLogic extends ComponentProcessSetCost implements IProcess { public ErrorState canProgress() { ItemStack individual = this.getUtil().getStack(Genepool.SLOT_BEE); if (!this.getUtil().spaceInTank(Genepool.TANK_DNA, getDNAAmount(individual))) { - return new ErrorState.NoSpace(Genetics.proxy.localise("machine.errors.tanks.no.room.desc"), new int[]{0}); + return new ErrorState.NoSpace(I18N.localise("genetics.machine.errors.tanks.no.room.desc"), new int[]{0}); } if (!this.getUtil().liquidInTank(Genepool.TANK_ETHANOL, 1)) { - return new ErrorState.InsufficientLiquid(Genetics.proxy.localise("machine.labMachine.genepool.errors.not.enough.ethanol.desc"), Genepool.TANK_ETHANOL); + return new ErrorState.InsufficientLiquid(I18N.localise("genetics.machine.labMachine.genepool.errors.not.enough.ethanol.desc"), Genepool.TANK_ETHANOL); } if (this.getUtil().getSlotCharge(Genepool.SLOT_ENZYME) == 0.0f) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.labMachine.genepool.errors.insufficient.enzyme.desc"), Genepool.SLOT_ENZYME); + return new ErrorState.NoItem(I18N.localise("genetics.machine.labMachine.genepool.errors.insufficient.enzyme.desc"), Genepool.SLOT_ENZYME); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java index 1c249953..6188f1f4 100644 --- a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java @@ -20,6 +20,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.minecraft.control.ControlSlotCharge; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; @@ -58,7 +59,7 @@ public class WindowGenepool extends WindowMachine { @Override public String getTitle() { - return Genetics.proxy.localise("machine.labMachine.genepool"); + return I18N.localise("genetics.machine.labMachine.genepool"); } @Override diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java index f0e8a07c..52e810f7 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java @@ -13,7 +13,7 @@ import binnie.core.machines.power.ComponentProcessIndefinate; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.machines.transfer.TransferRequest; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.api.IIncubatorRecipe; public class IncubatorLogic extends ComponentProcessIndefinate implements IProcess { @@ -36,7 +36,7 @@ public class IncubatorLogic extends ComponentProcessIndefinate implements IProce @Override public ErrorState canWork() { if (this.recipe == null) { - return new ErrorState(Genetics.proxy.localise("machine.errors.no.recipe.desc"), Genetics.proxy.localise("machine.errors.no.recipe.info")); + return new ErrorState(I18N.localise("genetics.machine.errors.no.recipe.desc"), I18N.localise("genetics.machine.errors.no.recipe.info")); } return super.canWork(); } @@ -45,10 +45,10 @@ public class IncubatorLogic extends ComponentProcessIndefinate implements IProce public ErrorState canProgress() { if (this.recipe != null) { if (!this.recipe.isInputLiquidSufficient(this.getUtil().getFluid(Incubator.TANK_INPUT))) { - return new ErrorState.InsufficientLiquid(Genetics.proxy.localise("machine.labMachine.incubator.errors.no.liquid.desc"), Incubator.TANK_INPUT); + return new ErrorState.InsufficientLiquid(I18N.localise("genetics.machine.labMachine.incubator.errors.no.liquid.desc"), Incubator.TANK_INPUT); } if (!this.roomForOutput) { - return new ErrorState.TankSpace(Genetics.proxy.localise("machine.labMachine.incubator.errors.no.room.desc"), Incubator.TANK_OUTPUT); + return new ErrorState.TankSpace(I18N.localise("genetics.machine.labMachine.incubator.errors.no.room.desc"), Incubator.TANK_OUTPUT); } } return super.canProgress(); diff --git a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java b/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java index e67737a4..dbcdbf12 100644 --- a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java @@ -19,6 +19,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; @@ -59,7 +60,7 @@ public class WindowIncubator extends WindowMachine { @Override public String getTitle() { - return Genetics.proxy.localise("machine.labMachine.incubator"); + return I18N.localise("genetics.machine.labMachine.incubator"); } @Override diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java index ee2244da..5eca6b25 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java @@ -17,7 +17,7 @@ import binnie.core.machines.MachineUtil; import binnie.core.machines.power.ComponentProcess; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.Engineering; @@ -85,19 +85,19 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { ItemStack stack = this.getUtil().getStack(0); int n = getNumberOfGenes(stack); if (n > 1) { - return String.format(Genetics.proxy.localise("genetics.machine.machine.inoculator.tooltips.logic.genes"), Integer.valueOf(n).toString()); + return String.format(I18N.localise("genetics.genetics.machine.machine.inoculator.tooltips.logic.genes"), Integer.valueOf(n).toString()); } else { - return Genetics.proxy.localise("genetics.machine.machine.inoculator.tooltips.logic.gene"); + return I18N.localise("genetics.genetics.machine.machine.inoculator.tooltips.logic.gene"); } } @Override public ErrorState canWork() { if (this.getUtil().isSlotEmpty(Inoculator.SLOT_TARGET)) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.inoculator.errors.no.individual.desc"), Inoculator.SLOT_TARGET); + return new ErrorState.NoItem(I18N.localise("genetics.machine.machine.inoculator.errors.no.individual.desc"), Inoculator.SLOT_TARGET); } if (this.getUtil().isSlotEmpty(Inoculator.SLOT_SERUM_VIAL)) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.errors.no.serum.desc"), Inoculator.SLOT_SERUM_VIAL); + return new ErrorState.NoItem(I18N.localise("genetics.machine.errors.no.serum.desc"), Inoculator.SLOT_SERUM_VIAL); } final ErrorState state = this.isValidSerum(); if (state != null) { @@ -105,10 +105,10 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { } ItemStack serum = this.getUtil().getStack(Inoculator.SLOT_SERUM_VIAL); if (!serum.isEmpty() && Engineering.getCharges(serum) == 0) { - return new ErrorState(Genetics.proxy.localise("machine.errors.empty.serum.desc"), Genetics.proxy.localise("machine.errors.empty.serum.info")); + return new ErrorState(I18N.localise("genetics.machine.errors.empty.serum.desc"), I18N.localise("genetics.machine.errors.empty.serum.info")); } if (getUtil().isTankEmpty(Inoculator.TANK_VEKTOR)) { - return new ErrorState.InsufficientLiquid(Genetics.proxy.localise("machine.machine.inoculator.errors.insufficient.vector"), Inoculator.TANK_VEKTOR); + return new ErrorState.InsufficientLiquid(I18N.localise("genetics.machine.machine.inoculator.errors.insufficient.vector"), Inoculator.TANK_VEKTOR); } return super.canWork(); } @@ -119,10 +119,10 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { final ItemStack target = this.getUtil().getStack(Inoculator.SLOT_TARGET); final IGene[] genes = Engineering.getGenes(serum); if (genes.length == 0) { - return new ErrorState(Genetics.proxy.localise("machine.errors.invalid.serum.desc"), Genetics.proxy.localise("machine.errors.invalid.serum.no.genes.info")); + return new ErrorState(I18N.localise("genetics.machine.errors.invalid.serum.desc"), I18N.localise("genetics.machine.errors.invalid.serum.no.genes.info")); } if (!genes[0].getSpeciesRoot().isMember(target)) { - return new ErrorState(Genetics.proxy.localise("machine.errors.invalid.serum.desc"), Genetics.proxy.localise("machine.errors.invalid.serum.mismatch.info")); + return new ErrorState(I18N.localise("genetics.machine.errors.invalid.serum.desc"), I18N.localise("genetics.machine.errors.invalid.serum.mismatch.info")); } final IIndividual individual = genes[0].getSpeciesRoot().getMember(target); if (individual != null) { @@ -135,7 +135,7 @@ public class InoculatorLogic extends ComponentProcess implements IProcess { } } } - return new ErrorState(Genetics.proxy.localise("genetics.machine.errors.defunct.serum.desc"), Genetics.proxy.localise("genetics.machine.errors.defunct.serum.info")); + return new ErrorState(I18N.localise("genetics.genetics.machine.errors.defunct.serum.desc"), I18N.localise("genetics.genetics.machine.errors.defunct.serum.info")); } @Override diff --git a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java index 2b06cced..5295a470 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java @@ -21,6 +21,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; @@ -64,7 +65,7 @@ public class WindowInoculator extends WindowMachine { @Override public String getTitle() { - return Genetics.proxy.localise("machine.machine.inoculator"); + return I18N.localise("genetics.machine.machine.inoculator"); } @Override diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java index aca8cca4..5a055f0e 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java @@ -18,7 +18,7 @@ import binnie.core.machines.inventory.IChargedSlots; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.item.ItemSequence; public class IsolatorLogic extends ComponentProcessSetCost implements IProcess { @@ -33,13 +33,13 @@ public class IsolatorLogic extends ComponentProcessSetCost implements IProcess { @Override public ErrorState canWork() { if (this.getUtil().isSlotEmpty(Isolator.SLOT_TARGET)) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.isolator.errors.no.individual.desc"), Isolator.SLOT_TARGET); + return new ErrorState.NoItem(I18N.localise("genetics.machine.machine.isolator.errors.no.individual.desc"), Isolator.SLOT_TARGET); } if (!this.getUtil().isSlotEmpty(Isolator.SLOT_RESULUT)) { - return new ErrorState.NoSpace(Genetics.proxy.localise("machine.machine.isolator.errors.no.room.desc"), Isolator.SLOT_FINISHED); + return new ErrorState.NoSpace(I18N.localise("genetics.machine.machine.isolator.errors.no.room.desc"), Isolator.SLOT_FINISHED); } if (this.getUtil().isSlotEmpty(Isolator.SLOT_SEQUENCER_VIAL)) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.isolator.errors.no.empty.sequencer.desc"), Isolator.SLOT_SEQUENCER_VIAL); + return new ErrorState.NoItem(I18N.localise("genetics.machine.machine.isolator.errors.no.empty.sequencer.desc"), Isolator.SLOT_SEQUENCER_VIAL); } return super.canWork(); } @@ -47,10 +47,10 @@ public class IsolatorLogic extends ComponentProcessSetCost implements IProcess { @Override public ErrorState canProgress() { if (!this.getUtil().liquidInTank(Isolator.TANK_ETHANOL, ETHANOL_PER_PROCESS)) { - return new ErrorState.InsufficientLiquid(Genetics.proxy.localise("machine.machine.isolator.errors.insufficient.ethanol.desc"), Isolator.TANK_ETHANOL); + return new ErrorState.InsufficientLiquid(I18N.localise("genetics.machine.machine.isolator.errors.insufficient.ethanol.desc"), Isolator.TANK_ETHANOL); } if (this.getUtil().getSlotCharge(Isolator.SLOT_ENZYME) == 0.0f) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.errors.no.enzyme.desc"), Isolator.SLOT_ENZYME); + return new ErrorState.NoItem(I18N.localise("genetics.machine.errors.no.enzyme.desc"), Isolator.SLOT_ENZYME); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java index a67940ea..527b17ff 100644 --- a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java @@ -20,6 +20,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.minecraft.control.ControlSlotCharge; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; @@ -64,7 +65,7 @@ public class WindowIsolator extends WindowMachine { @Override public String getTitle() { - return Genetics.proxy.localise("machine.machine.isolator"); + return I18N.localise("genetics.machine.machine.isolator"); } @Override diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java index 3e0a3006..06919195 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java @@ -8,7 +8,7 @@ import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.genetics.Engineering; public class PolymeriserLogic extends ComponentProcessSetCost implements IProcess { @@ -76,9 +76,9 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces final ItemStack serum = this.getUtil().getStack(Polymeriser.SLOT_SERUM); int n = getNumberOfGenes(serum); if (n > 1) { - return String.format(Genetics.proxy.localise("genetics.machine.machine.polymeriser.tooltips.logic.genes"), Integer.valueOf(n).toString()); + return String.format(I18N.localise("genetics.genetics.machine.machine.polymeriser.tooltips.logic.genes"), Integer.valueOf(n).toString()); } else { - return Genetics.proxy.localise("genetics.machine.machine.polymeriser.tooltips.logic.gene"); + return I18N.localise("genetics.genetics.machine.machine.polymeriser.tooltips.logic.gene"); } } @@ -86,10 +86,10 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces public ErrorState canWork() { ItemStack serumStack = this.getUtil().getStack(Polymeriser.SLOT_SERUM); if (serumStack.isEmpty()) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.polymeriser.errors.item.no"), Polymeriser.SLOT_SERUM); + return new ErrorState.NoItem(I18N.localise("genetics.machine.machine.polymeriser.errors.item.no"), Polymeriser.SLOT_SERUM); } if (!serumStack.isItemDamaged()) { - return new ErrorState.InvalidItem(Genetics.proxy.localise("machine.machine.polymeriser.errors.item.filled"), Polymeriser.SLOT_SERUM); + return new ErrorState.InvalidItem(I18N.localise("genetics.machine.machine.polymeriser.errors.item.filled"), Polymeriser.SLOT_SERUM); } return super.canWork(); } @@ -97,10 +97,10 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces @Override public ErrorState canProgress() { if (this.getUtil().getFluid(Polymeriser.TANK_BACTERIA) == null) { - return new ErrorState.InsufficientLiquid(Genetics.proxy.localise("machine.machine.polymeriser.errors.insufficient.bacteria"), Polymeriser.TANK_BACTERIA); + return new ErrorState.InsufficientLiquid(I18N.localise("genetics.machine.machine.polymeriser.errors.insufficient.bacteria"), Polymeriser.TANK_BACTERIA); } if (this.getUtil().getFluid(Polymeriser.TANK_DNA) == null) { - return new ErrorState.InsufficientLiquid(Genetics.proxy.localise("machine.machine.polymeriser.errors.insufficient.dna"), Polymeriser.TANK_DNA); + return new ErrorState.InsufficientLiquid(I18N.localise("genetics.machine.machine.polymeriser.errors.insufficient.dna"), Polymeriser.TANK_DNA); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java b/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java index 36a4a8f6..7cd99202 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java @@ -3,7 +3,7 @@ package binnie.genetics.machine.polymeriser; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.api.IItemChargeable; import binnie.genetics.machine.ModuleMachine; @@ -19,6 +19,6 @@ public class SlotValidatorUnfilledSerum extends SlotValidator { @Override public String getTooltip() { - return Genetics.proxy.localise("machine.machine.polymeriser.tooltips.slots.unfilled"); + return I18N.localise("genetics.machine.machine.polymeriser.tooltips.slots.unfilled"); } } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java index 302a3186..61568bf3 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java @@ -20,6 +20,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.minecraft.control.ControlSlotCharge; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; @@ -57,7 +58,7 @@ public class WindowPolymeriser extends WindowMachine { @Override public String getTitle() { - return Genetics.proxy.localise("machine.machine.polymeriser"); + return I18N.localise("genetics.machine.machine.polymeriser"); } @Override diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java index 25899185..9b5bb89e 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java @@ -8,7 +8,7 @@ import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcess; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.genetics.GeneTracker; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.item.GeneticsItems; @@ -40,7 +40,7 @@ public class SequencerLogic extends ComponentProcess implements IProcess { @Override public ErrorState canWork() { if (this.getUtil().isSlotEmpty(Sequencer.SLOT_TARGET)) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.sequencer.errors.no.dna"), 5); + return new ErrorState.NoItem(I18N.localise("genetics.machine.machine.sequencer.errors.no.dna"), 5); } return super.canWork(); } @@ -48,14 +48,14 @@ public class SequencerLogic extends ComponentProcess implements IProcess { @Override public ErrorState canProgress() { if (this.getMachine().getOwner() == null) { - return new ErrorState(Genetics.proxy.localise("machine.errors.no.owner.desc"), Genetics.proxy.localise("machine.errors.no.owner.info")); + return new ErrorState(I18N.localise("genetics.machine.errors.no.owner.desc"), I18N.localise("genetics.machine.errors.no.owner.info")); } if (this.getUtil().getSlotCharge(Sequencer.SLOT_DYE) == 0.0f) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.sequencer.errors.insufficient.dye"), Sequencer.SLOT_DYE); + return new ErrorState.NoItem(I18N.localise("genetics.machine.machine.sequencer.errors.insufficient.dye"), Sequencer.SLOT_DYE); } ItemStack stackDone = this.getUtil().getStack(Sequencer.SLOT_DONE); if (!stackDone.isEmpty() && stackDone.getCount() >= 64) { - return new ErrorState.NoSpace(Genetics.proxy.localise("machine.machine.sequencer.errors.no.space"), new int[]{Sequencer.SLOT_DONE}); + return new ErrorState.NoSpace(I18N.localise("genetics.machine.machine.sequencer.errors.no.space"), new int[]{Sequencer.SLOT_DONE}); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java b/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java index e64b5ff3..0748060a 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java @@ -3,6 +3,7 @@ package binnie.genetics.machine.sequencer; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.machine.ModuleMachine; @@ -23,6 +24,6 @@ public class SlotValidatorUnsequenced extends SlotValidator { @Override public String getTooltip() { - return Genetics.proxy.localise("machine.machine.sequencer.tooltips.slots.unsequenced.dna"); + return I18N.localise("genetics.machine.machine.sequencer.tooltips.slots.unsequenced.dna"); } } diff --git a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java index 21007504..8a59be08 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java @@ -24,6 +24,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.minecraft.control.ControlSlotCharge; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; @@ -41,7 +42,7 @@ public class WindowSequencer extends WindowMachine { @SideOnly(Side.CLIENT) public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) { if (name.equals("username")) { - this.slotText.setValue(TextFormatting.DARK_GRAY + String.format(Genetics.proxy.localise("machine.machine.sequencer.texts.sequenced.by"), nbt.getString("username"))); + this.slotText.setValue(TextFormatting.DARK_GRAY + String.format(I18N.localise("genetics.machine.machine.sequencer.texts.sequenced.by"), nbt.getString("username"))); } super.receiveGuiNBTOnClient(player, name, nbt); } @@ -62,7 +63,7 @@ public class WindowSequencer extends WindowMachine { final ControlSlot slotTarget = new ControlSlot.Builder(this, x + 96, y + 16).assign(5); x = 34; y = 92; - this.slotText = new ControlText(this, new Area(0, y, this.width(), 12), TextFormatting.DARK_GRAY + Genetics.proxy.localise("machine.machine.sequencer.texts.userless"), TextJustification.MiddleCenter); + this.slotText = new ControlText(this, new Area(0, y, this.width(), 12), TextFormatting.DARK_GRAY + I18N.localise("genetics.machine.machine.sequencer.texts.userless"), TextJustification.MiddleCenter); y += 20; final ControlSlot slotDye = new ControlSlot.Builder(this, x, y).assign(0); x += 20; @@ -76,7 +77,7 @@ public class WindowSequencer extends WindowMachine { @Override public String getTitle() { - return Genetics.proxy.localise("machine.machine.sequencer"); + return I18N.localise("genetics.machine.machine.sequencer"); } @Override diff --git a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java index 0d0c48a3..66102ed8 100644 --- a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java @@ -13,7 +13,7 @@ import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.api.IItemSerum; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; @@ -42,7 +42,7 @@ public class PackageSplicer extends AdvGeneticMachine.PackageAdvGeneticBase impl @Override public String getTooltip() { - return Genetics.proxy.localise("machine.advMachine.splicer.tooltips.slots.serum"); + return I18N.localise("genetics.machine.advMachine.splicer.tooltips.slots.serum"); } }; slotSerumVial.setValidator(serumValid); diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java index 5d08eaf4..0902f47b 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java @@ -15,7 +15,7 @@ import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcess; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.Engineering; @@ -108,12 +108,12 @@ public class SplicerLogic extends ComponentProcess implements IProcess { @Override public ErrorState canWork() { if (this.getUtil().isSlotEmpty(Splicer.SLOT_TARGET)) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.advMachine.splicer.errors.no.individual.desc"), Splicer.SLOT_TARGET); + return new ErrorState.NoItem(I18N.localise("genetics.machine.advMachine.splicer.errors.no.individual.desc"), Splicer.SLOT_TARGET); } ItemStack serum = this.getUtil().getStack(Splicer.SLOT_SERUM_VIAL); if (serum.isEmpty()) { - return new ErrorState.NoItem(Genetics.proxy.localise("machine.errors.no.serum.desc"), Splicer.SLOT_SERUM_VIAL); + return new ErrorState.NoItem(I18N.localise("genetics.machine.errors.no.serum.desc"), Splicer.SLOT_SERUM_VIAL); } final ErrorState state = this.isValidSerum(); @@ -122,7 +122,7 @@ public class SplicerLogic extends ComponentProcess implements IProcess { } if (Engineering.getCharges(serum) == 0) { - return new ErrorState(Genetics.proxy.localise("machine.errors.empty.serum.desc"), Genetics.proxy.localise("machine.errors.empty.serum.info")); + return new ErrorState(I18N.localise("genetics.machine.errors.empty.serum.desc"), I18N.localise("genetics.machine.errors.empty.serum.info")); } return super.canWork(); } @@ -136,10 +136,10 @@ public class SplicerLogic extends ComponentProcess implements IProcess { final ItemStack target = this.getUtil().getStack(Splicer.SLOT_TARGET); final IGene[] genes = Engineering.getGenes(serum); if (genes.length == 0) { - return new ErrorState(Genetics.proxy.localise("machine.errors.invalid.serum.desc"), Genetics.proxy.localise("machine.errors.invalid.serum.no.genes.info")); + return new ErrorState(I18N.localise("genetics.machine.errors.invalid.serum.desc"), I18N.localise("genetics.machine.errors.invalid.serum.no.genes.info")); } if (!genes[0].getSpeciesRoot().isMember(target)) { - return new ErrorState(Genetics.proxy.localise("machine.errors.invalid.serum.desc"), Genetics.proxy.localise("machine.errors.invalid.serum.mismatch.info")); + return new ErrorState(I18N.localise("genetics.machine.errors.invalid.serum.desc"), I18N.localise("genetics.machine.errors.invalid.serum.mismatch.info")); } final IIndividual individual = genes[0].getSpeciesRoot().getMember(target); boolean hasAll = true; @@ -151,7 +151,7 @@ public class SplicerLogic extends ComponentProcess implements IProcess { } } if (hasAll) { - return new ErrorState(Genetics.proxy.localise("genetics.machine.errors.defunct.serum.desc"), Genetics.proxy.localise("machine.errors.defunct.serum.info")); + return new ErrorState(I18N.localise("genetics.genetics.machine.errors.defunct.serum.desc"), I18N.localise("genetics.machine.errors.defunct.serum.info")); } return null; } diff --git a/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java b/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java index 13101480..8872dca4 100644 --- a/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java +++ b/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java @@ -7,7 +7,7 @@ import forestry.api.genetics.ISpeciesRoot; import binnie.Binnie; import binnie.core.machines.inventory.SlotValidator; -import binnie.genetics.Genetics; +import binnie.core.util.I18N; public class ValidatorIndividualInoculate extends SlotValidator { public ValidatorIndividualInoculate() { @@ -22,6 +22,6 @@ public class ValidatorIndividualInoculate extends SlotValidator { @Override public String getTooltip() { - return Genetics.proxy.localise("machine.advMachine.splicer.tooltips.slots.individual"); + return I18N.localise("genetics.machine.advMachine.splicer.tooltips.slots.individual"); } } diff --git a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java index 5e427599..78e86110 100644 --- a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java @@ -19,6 +19,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; @@ -60,7 +61,7 @@ public class WindowSplicer extends WindowMachine { @Override public String getTitle() { - return Genetics.proxy.localise("machine.advMachine.splicer"); + return I18N.localise("genetics.machine.advMachine.splicer"); } @Override