mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 03:49:07 +00:00
Improve localization
This commit is contained in:
1 parent
be827a17a7
commit
941c377c58
117 files changed
+463
-494
No files matched your search
@@ -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<ManagerBase> 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();
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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<EnumFlowerColor> 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());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<EnumMoisture> 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
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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<String> 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()) {
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
}
|
||||
@@ -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<String> descLines = new ArrayList<>();
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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<DatabaseTab> {
|
||||
private GameProfile player;
|
||||
@@ -26,13 +26,13 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
|
||||
}
|
||||
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());
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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]);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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<Object, String> 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);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
@ParametersAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
@FieldsAreNonnullByDefault
|
||||
package binnie.core.language;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
import binnie.core.util.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
@@ -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
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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<ItemStack> {
|
||||
private ItemStack itemStack;
|
||||
@@ -101,11 +100,11 @@ public class InventorySlot extends BaseSlot<ItemStack> {
|
||||
|
||||
@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
|
||||
}
|
||||
}
|
||||
@@ -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<FluidStack> {
|
||||
public static final String NameJuice = "Juice Tank";
|
||||
@@ -50,6 +49,6 @@ public class TankSlot extends BaseSlot<FluidStack> {
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "gui.slot." + this.unlocName);
|
||||
return I18N.localise("binniecore.gui.slot." + this.unlocName);
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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<FenceType> 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 += " ";
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<String> 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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<String> 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) {
|
||||
|
||||
@@ -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<IDesign>
|
||||
|
||||
@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
|
||||
|
||||
@@ -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<ItemStack> {
|
||||
@@ -34,7 +34,7 @@ public class PageFruit extends PageAbstract<ItemStack> {
|
||||
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<IAlleleSpecies> 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);
|
||||
}
|
||||
|
||||
@@ -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<ItemStack> {
|
||||
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<ItemStack> {
|
||||
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]);
|
||||
|
||||
@@ -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<ItemStack, Float> 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();
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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<IAlleleSpecies> getSpecies(final BreedingSystem system) {
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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<ItemStack> refinedProducts = new UniqueItemStackSet();
|
||||
final Collection<ItemStack> 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<ItemStack, Float> 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<ItemStack, Float> 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<ItemStack> level2Products = new UniqueItemStackSet();
|
||||
for (final ItemStack stack : refinedProducts) {
|
||||
@@ -165,7 +165,7 @@ public class AnalystPageProducts extends AnalystPageProduce {
|
||||
super.getTooltip(tooltip);
|
||||
final Collection<ItemStack> 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<ItemStack> 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");
|
||||
}
|
||||
}
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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<ItemStack> stacks = new ArrayList<>();
|
||||
for (final EnumAcidity a : EnumSet.range(EnumAcidity.ACID, EnumAcidity.ALKALINE)) {
|
||||
@@ -111,7 +111,7 @@ public class AnalystPageSoil extends ControlAnalystPage {
|
||||
new ControlToleranceBar<EnumMoisture>(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<EnumAcidity>(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");
|
||||
}
|
||||
}
|
||||
@@ -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<Biome> 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");
|
||||
}
|
||||
}
|
||||
@@ -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<ItemStack> products = new UniqueItemStackSet();
|
||||
final Collection<ItemStack> 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<ItemStack> 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<IAllele> 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");
|
||||
}
|
||||
}
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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<ItemStack> 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<ItemStack> 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");
|
||||
}
|
||||
}
|
||||
@@ -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) {
|
||||
|
||||
@@ -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<String> 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) {
|
||||
|
||||
@@ -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<String> 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"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
Loaded 100 of 117 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user