Merge pull request #129 from KorDum/feature/localization

[1.7.10] Added missed localization
This commit is contained in:
Alexander Kornilov authored and GitHub committed 2017-06-17 11:08:35 +03:00
commit eaeb6a4db1
11 files changed
+125 -59

No files matched your search

@@ -231,7 +231,7 @@ public class WindowGenesis extends Window {
}
@Override
public int getOutlineColour() {
public int getOutlineColor() {
return value.getColor();
}
@@ -69,7 +69,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
if (icon.hasOutline()) {
iTexture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline);
iTexture = iTexture.crop(position, 8.0f);
CraftGUI.Render.color(icon.getOutlineColour());
CraftGUI.Render.color(icon.getOutlineColor());
CraftGUI.Render.texture(iTexture, area.inset(2));
}
}
@@ -29,7 +29,7 @@ public enum EnumColor {
this.code = code;
}
public int getColour() {
public int getColor() {
return colour;
}
@@ -34,7 +34,7 @@ public class ControlTabIcon<T> extends ControlTab<T> {
return false;
}
public int getOutlineColour() {
public int getOutlineColor() {
return 0xffffff;
}
}
@@ -3,6 +3,7 @@ package binnie.core.machines.power;
import binnie.core.machines.IMachine;
import binnie.core.machines.MachineComponent;
import binnie.core.machines.network.INetwork;
import binnie.core.util.I18N;
import net.minecraft.nbt.NBTTagCompound;
public abstract class ComponentProcessIndefinate extends MachineComponent implements IProcess, INetwork.TilePacketSync {
@@ -11,7 +12,6 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem
private float actionPauseProcess;
private float actionCancelTask;
int clientEnergyPerSecond;
int clientInProgress;
@Override
public void syncFromNBT(NBTTagCompound nbt) {
@@ -42,7 +42,6 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem
@Override
public void onUpdate() {
float energyAvailable = (float) getPower().getInterface().useEnergy(PowerSystem.RF, getEnergyPerTick(), false);
if (canWork() == null) {
if (!isInProgress() && canProgress() == null) {
onStartTask();
@@ -76,13 +75,19 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem
if (actionCancelTask == 0.0f) {
return null;
}
return new ErrorState("Task Cancelled", "Cancelled by Buildcraft Gate");
return new ErrorState(
I18N.localise("binniecore.gui.tooltip.task.canceled"),
I18N.localise("binniecore.gui.tooltip.task.canceled.desc")
);
}
@Override
public ErrorState canProgress() {
if (actionPauseProcess != 0.0f) {
return new ErrorState("Process Paused", "Paused by Buildcraft Gate");
return new ErrorState(
I18N.localise("binniecore.gui.tooltip.task.paused"),
I18N.localise("binniecore.gui.tooltip.task.paused.desc")
);
}
if (getPower().getInterface().getEnergy(PowerSystem.RF) < getEnergyPerTick()) {
return new ErrorState.InsufficientPower();
@@ -111,7 +116,7 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem
@Override
public String getTooltip() {
return "Processing";
return I18N.localise("binniecore.gui.tooltip.processing");
}
@Override
@@ -31,12 +31,12 @@ class ControlColourSelector extends Control implements ITooltip, IControlValue<E
@Override
public void setValue(EnumColor value) {
this.value = value;
setColor(value.getColour());
setColor(value.getColor());
}
@Override
public void onRenderBackground() {
super.onRenderBackground();
CraftGUI.Render.gradientRect(getArea(), 0xff000000 + value.getColour(), 0xff000000 + value.getColour());
CraftGUI.Render.gradientRect(getArea(), 0xff000000 + value.getColor(), 0xff000000 + value.getColor());
}
}
@@ -39,6 +39,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.craftgui.window.Panel;
import binnie.core.machines.Machine;
import binnie.core.machines.transfer.TransferRequest;
import binnie.core.util.I18N;
import binnie.genetics.craftgui.WindowMachine;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.block.Block;
@@ -59,12 +60,12 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@SuppressWarnings("Duplicates")
public class WindowCompartment extends WindowMachine implements IWindowAffectsShiftClick {
private Map<Panel, Integer> panels;
private ControlTextEdit tabName;
private ControlItemDisplay tabIcon;
private ControlColourSelector tabColour;
boolean dueUpdate;
private int currentTab;
public static Window create(EntityPlayer player, IInventory inventory, Side side) {
@@ -101,9 +102,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
int compartmentPageWidth = 16 + 18 * inv.getPageSize() / 5;
int compartmentPageHeight = 106;
int compartmentWidth = compartmentPageWidth + (doubleTabbed ? 48 : 24);
int compartmentHeight = compartmentPageHeight;
Control controlCompartment = new Control(this, x, y, compartmentWidth, compartmentHeight);
Control controlCompartment = new Control(this, x, y, compartmentWidth, compartmentPageHeight);
ControlTabBar<Integer> tab = new ControlTabBar<Integer>(controlCompartment, 0.0f, 0.0f, 24.0f, compartmentPageHeight, Position.LEFT) {
@Override
public ControlTab<Integer> createTab(float x, float y, float w, float h, Integer value) {
@@ -119,8 +119,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
}
@Override
public int getOutlineColour() {
return getTab(value).getColor().getColour();
public int getOutlineColor() {
return getTab(value).getColor().getColor();
}
@Override
@@ -131,7 +131,10 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
}
};
String[] tabHelp = {"Compartment Tab", "Tabs that divide the inventory into sections. Each one can be labelled seperately."};
String[] tabHelp = {
I18N.localise("binniecore.machine.storage.tab"),
I18N.localise("binniecore.machine.storage.tab.desc")
};
tab.addHelp(tabHelp);
tab.setValues(Arrays.asList(tabs1));
tab.setValue(0);
@@ -146,6 +149,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
}
}.setOrigin(EventHandler.Origin.DirectChild, tab));
x += 24;
ControlPages<Integer> compartmentPages = new ControlPages<Integer>(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight);
ControlPage[] page = new ControlPage[inv.getTabNumber()];
for (int p = 0; p < inv.getTabNumber(); ++p) {
@@ -159,7 +163,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
@Override
public void onRenderForeground() {
Texture iTexture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline);
CraftGUI.Render.color(getTab(panels.get(this)).getColor().getColour());
CraftGUI.Render.color(getTab(panels.get(this)).getColor().getColor());
CraftGUI.Render.texture(iTexture, getArea().inset(3));
}
};
@@ -188,8 +192,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
}
@Override
public int getOutlineColour() {
return getTab(value).getColor().getColour();
public int getOutlineColor() {
return getTab(value).getColor().getColor();
}
@Override
@@ -215,23 +219,22 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
CraftGUIUtil.linkWidgets(tab2, compartmentPages);
x += 24;
}
x += 16;
setSize(new IPoint(Math.max(32 + compartmentWidth, 252), h()));
controlCompartment.setPosition(new IPoint((w() - controlCompartment.w()) / 2.0f, controlCompartment.y()));
ControlPlayerInventory invent = new ControlPlayerInventory(this, true);
new ControlPlayerInventory(this, true);
ControlSlide slide = new ControlSlide(this, 0.0f, 134.0f, 136.0f, 92.0f, Position.LEFT);
slide.setLabel("Tab Properties");
slide.setLabel(I18N.localise("binniecore.machine.storage.tab.properties"));
slide.setSlide(false);
slide.addHelp("Tab Properties");
slide.addHelp("The label, colour and icon of the Tab can be altered here. Clicking on the icon with a held item will change it.");
slide.addHelp(I18N.localise("binniecore.machine.storage.tooltip.properties"));
slide.addHelp(I18N.localise("binniecore.machine.storage.tooltip.properties.desc"));
Panel tabPropertyPanel = new Panel(slide, 16.0f, 8.0f, 112.0f, 76.0f, MinecraftGUI.PanelType.Gray);
int y2 = 4;
new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), "Tab Name:");
Panel parent = tabPropertyPanel;
new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), I18N.localise("binniecore.machine.storage.tab.name"));
float x2 = 4.0f;
y2 += 12;
tabName = new ControlTextEdit(parent, x2, y2, 104.0f, 12.0f);
tabName = new ControlTextEdit(tabPropertyPanel, x2, y2, 104.0f, 12.0f);
tabName.addSelfEventHandler(new EventTextEdit.Handler() {
@Override
public void onEvent(EventTextEdit event) {
@@ -243,7 +246,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
}
}.setOrigin(EventHandler.Origin.Self, tabName));
y2 += 20;
new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), "Tab Icon: ");
new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), I18N.localise("binniecore.machine.storage.tab.icon"));
tabIcon = new ControlItemDisplay(tabPropertyPanel, 58.0f, y2 - 4);
tabIcon.setItemStack(new ItemStack(Items.paper));
@@ -265,10 +268,11 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
});
tabColour = new ControlColourSelector(tabPropertyPanel, 82.0f, y2 - 4, 16.0f, 16.0f, EnumColor.White);
tabIcon.addHelp("Icon for Current Tab");
tabIcon.addHelp("Click here with an item to change");
tabIcon.addHelp(I18N.localise("binniecore.machine.storage.tooltip.icon"));
tabIcon.addHelp(I18N.localise("binniecore.machine.storage.tooltip.icon.desc"));
y2 += 20;
new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), "Colour: ");
new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), I18N.localise("binniecore.machine.storage.tab.color"));
int cw = 8;
Panel panelColour = new Panel(tabPropertyPanel, 40.0f, y2 - 4, cw * 8 + 2, cw * 2 + 1, MinecraftGUI.PanelType.Gray);
for (int cc = 0; cc < 16; ++cc) {
@@ -283,24 +287,13 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
sendClientAction("comp-change-tab", nbt);
}
});
color.addHelp("Colour Selector");
color.addHelp("Select a colour to highlight the current tab");
color.addHelp(I18N.localise("binniecore.machine.storage.tooltip.color"));
color.addHelp(I18N.localise("binniecore.machine.storage.tooltip.color.desc"));
}
y2 += 20;
ControlButton searchButton = new ControlButton(controlCompartment, compartmentWidth - 24 - 64 - 8, compartmentPageHeight, 64.0f, 16.0f, "Search") {
@Override
protected void onMouseClick(EventMouse.Down event) {
createSearchDialog();
}
@Override
public void onRenderBackground() {
Object texture = isMouseOver() ? CraftGUITexture.TabHighlighted : CraftGUITexture.Tab;
CraftGUI.Render.texture(CraftGUI.Render.getTexture(texture).crop(Position.BOTTOM, 8.0f), getArea());
}
};
searchButton.addHelp("Search Button");
searchButton.addHelp("Clicking this will open the Search dialog. This allows you to search the inventory for specific items.");
ControlButton searchButton = new SearchButton(controlCompartment, compartmentWidth, compartmentPageHeight);
searchButton.addHelp(I18N.localise("binniecore.machine.storage.tooltip.search"));
searchButton.addHelp(I18N.localise("binniecore.machine.storage.tooltip.search.desc"));
}
public void createSearchDialog() {
@@ -337,21 +330,21 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
});
includeItems = true;
includeBlocks = true;
new ControlCheckbox(this, 16.0f, 40.0f, 100.0f, "Sort A-Z", sortByName) {
new ControlCheckbox(this, 16.0f, 40.0f, 100.0f, I18N.localise("binniecore.machine.storage.sort"), sortByName) {
@Override
protected void onValueChanged(boolean value) {
sortByName = value;
updateSearch();
}
};
new ControlCheckbox(this, 16.0f, 64.0f, 100.0f, "Include Items", includeItems) {
new ControlCheckbox(this, 16.0f, 64.0f, 100.0f, I18N.localise("binniecore.machine.storage.filterItems"), includeItems) {
@Override
protected void onValueChanged(boolean value) {
includeItems = value;
updateSearch();
}
};
new ControlCheckbox(this, 16.0f, 88.0f, 100.0f, "Include Blocks", includeBlocks) {
new ControlCheckbox(this, 16.0f, 88.0f, 100.0f, I18N.localise("binniecore.machine.storage.filterBlocks"), includeBlocks) {
@Override
protected void onValueChanged(boolean value) {
includeBlocks = value;
@@ -446,7 +439,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
@Override
public String getTitle() {
return "Compartment";
return I18N.localise("binniecore.machine.storage.compartment");
}
@Override
@@ -475,4 +468,21 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
public CompartmentTab getCurrentTab() {
return getTab(currentTab);
}
private class SearchButton extends ControlButton {
public SearchButton(Control controlCompartment, int compartmentWidth, int compartmentPageHeight) {
super(controlCompartment, compartmentWidth - 24 - 64 - 8, compartmentPageHeight, 64.0f, 16.0f, I18N.localise("binniecore.machine.storage.search"));
}
@Override
protected void onMouseClick(EventMouse.Down event) {
createSearchDialog();
}
@Override
public void onRenderBackground() {
Object texture = isMouseOver() ? CraftGUITexture.TabHighlighted : CraftGUITexture.Tab;
CraftGUI.Render.texture(CraftGUI.Render.getTexture(texture).crop(Position.BOTTOM, 8.0f), getArea());
}
}
}
@@ -135,12 +135,12 @@ public class AnalystPageMutations extends ControlAnalystPage {
CraftGUI.Render.item(new IPoint(0.0f, 0.0f), system.getDefaultMember(mutation.getAllele0().getUID()));
CraftGUI.Render.item(new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getAllele1().getUID()));
if (specificChance != mutation.getBaseChance()) {
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd0.getIcon());
CraftGUI.Render.color(getMutationColour(specificChance).getColour());
CraftGUI.Render.color(getMutationColour(specificChance).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd1.getIcon());
} else {
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd.getIcon());
}
}
@@ -192,14 +192,14 @@ public class AnalystPageMutations extends ControlAnalystPage {
public void onRenderBackground() {
CraftGUI.Render.item(new IPoint(0.0f, 0.0f), system.getDefaultMember(speciesComb.getUID()));
CraftGUI.Render.item(new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getTemplate()[0].getUID()));
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColor());
if (specificChance2 != mutation.getBaseChance()) {
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow0.getIcon());
CraftGUI.Render.color(getMutationColour(specificChance2).getColour());
CraftGUI.Render.color(getMutationColour(specificChance2).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow1.getIcon());
} else {
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow.getIcon());
}
}
@@ -10,3 +10,8 @@ binniecore.allele.forestry.effectMycophilic.desc=Spreads mushrooms and mycelium
binniecore.allele.forestry.effectNone.desc=No discernible effects
binniecore.item.container.cylinder.binnie.bacteriapoly=Polymerised Bacteria Cylinder
binniecore.machine.storage.tab.properties.desc=The label, colour and icon of the Tab can be altered here. Clicking on the icon with a held item will change it
binniecore.machine.storage.tab.color=Colour:
binniecore.machine.storage.tooltip.color=Colour Selector
binniecore.machine.storage.tooltip.color.desc=Select a colour to highlight the current tab
@@ -265,6 +265,23 @@ binniecore.machine.storage.compartmentDiamond=Diamond Compartment
binniecore.machine.storage.compartmentCopper=Copper Compartment
binniecore.machine.storage.compartmentBronze=Bronze Compartment
binniecore.machine.storage.compartmentGold=Gold Compartment
binniecore.machine.storage.tab=Compartment Tab
binniecore.machine.storage.tab.desc=Tabs that divide the inventory into sections. Each one can be labelled seperately
binniecore.machine.storage.tab.properties=Tab Properties
binniecore.machine.storage.tab.properties.desc=The label, color and icon of the Tab can be altered here. Clicking on the icon with a held item will change it
binniecore.machine.storage.tab.name=Tab Name:
binniecore.machine.storage.tab.icon=Tab Icon:
binniecore.machine.storage.tooltip.icon=Icon for Current Tab
binniecore.machine.storage.tooltip.icon.desc=Click here with an item to change
binniecore.machine.storage.tab.color=Color:
binniecore.machine.storage.tooltip.color=Color Selector
binniecore.machine.storage.tooltip.color.desc=Select a color to highlight the current tab
binniecore.machine.storage.search=Search
binniecore.machine.storage.tooltip.search=Search Button
binniecore.machine.storage.tooltip.search.desc=Clicking this will open the Search dialog. This allows you to search the inventory for specific items
binniecore.machine.storage.sort=Sort A-Z
binniecore.machine.storage.filterItems=Include Items
binniecore.machine.storage.filterBlocks=Include Blocks
< %1$s is the name of the pattern >
binniecore.gui.designer.pattern=%1$s Pattern
@@ -316,6 +333,12 @@ binniecore.gui.tooltip.help.0=To activate help tooltips,
binniecore.gui.tooltip.help.1=hold down the tab key and
binniecore.gui.tooltip.help.2=mouse over controls.
binniecore.gui.tooltip.processing=Processing
binniecore.gui.tooltip.task.canceled=Task Cancelled
binniecore.gui.tooltip.task.canceled.desc=Cancelled by Buildcraft Gate
binniecore.gui.tooltip.task.paused=Process Paused
binniecore.gui.tooltip.task.paused.desc=Paused by Buildcraft Gate
binniecore.gui.tooltip.powerSupply=Power Supply
binniecore.gui.tooltip.poweredBy=Powered by %s
binniecore.gui.tooltip.powerBar=Power Bar
@@ -266,6 +266,23 @@ binniecore.machine.storage.compartmentDiamond=Алмазный сундук
binniecore.machine.storage.compartmentCopper=Медный сундук
binniecore.machine.storage.compartmentBronze=Бронзовый сундук
binniecore.machine.storage.compartmentGold=Золотой сундук
binniecore.machine.storage.tab=Вкладка
binniecore.machine.storage.tab.desc=Вкладки делят сундук на разделы. Каждая может быть названа отдельно
binniecore.machine.storage.tab.properties=Свойства вкладки
binniecore.machine.storage.tab.properties.desc=Название, цвет и иконка вкладки может быть изменены здесь. Нажатие на иконку с предметом изменит ее
binniecore.machine.storage.tab.name=Название:
binniecore.machine.storage.tab.icon=Иконка:
binniecore.machine.storage.tooltip.icon=Иконка для текущей вкладки
binniecore.machine.storage.tooltip.icon.desc=Нажмите предметом для изменения иконки
binniecore.machine.storage.tab.color=Цвет:
binniecore.machine.storage.tooltip.color=Цвет
binniecore.machine.storage.tooltip.color.desc=Выбор цвета для вкладки
binniecore.machine.storage.search=Поиск
binniecore.machine.storage.tooltip.search=Поиск
binniecore.machine.storage.tooltip.search.desc=Открывает поисковое окно. Позволяет искать определенные предметы
binniecore.machine.storage.sort=Сортировка А-Я
binniecore.machine.storage.filterItems=Включая предметы
binniecore.machine.storage.filterBlocks=Вклюячая блоки
< %1$s is the name of the pattern >
binniecore.gui.designer.pattern=Шаблон %1$s
@@ -317,6 +334,12 @@ binniecore.gui.tooltip.help.0=Для показа всплывающих под
binniecore.gui.tooltip.help.1=зажмите клавишу TAB и
binniecore.gui.tooltip.help.2=наведите курсор на элемент интерфейса.
binniecore.gui.tooltip.processing=Прогресс
binniecore.gui.tooltip.task.canceled=Задача отменена
binniecore.gui.tooltip.task.canceled.desc=Отменено BuildCraft гейтом
binniecore.gui.tooltip.task.paused=В паузе
binniecore.gui.tooltip.task.paused.desc=Поставлено в паузу BuildCraft гейтом
binniecore.gui.tooltip.powerSupply=Источник питания
binniecore.gui.tooltip.poweredBy=Запитавший: %s
binniecore.gui.tooltip.powerBar=Батарея