[1.7.10] Some refactoring (#102)

* Some refactoring

* Some refactoring
Added some localization

* Added some localization
Fix wrong branch localization in page branch overview
Simplify some localization

* Simplify some localization

* Removed unused localize method

* Simplify some localization

* Removed proxy.localise method

* Simplify localization
This commit is contained in:
Alexander Kornilov authored and mezz committed 2017-06-06 21:43:47 -07:00
1 parent 81301c3bd2
commit 1ffaad9fcd
232 files changed
+1947 -2054

No files matched your search

@@ -46,7 +46,7 @@ public class WindowSequencer extends WindowMachine {
if (side == Side.CLIENT && name.equals("username")) {
slotText.setValue(
EnumChatFormatting.DARK_GRAY
+ I18N.localise(Genetics.instance, "machine.sequencer.gui.sequensedBy", nbt.getString("username"))
+ I18N.localise("genetics.machine.sequencer.gui.sequensedBy", nbt.getString("username"))
);
}
super.recieveGuiNBT(side, player, name, nbt);
@@ -57,12 +57,12 @@ public class WindowSequencer extends WindowMachine {
super.initialiseClient();
int x = 16;
int y = 32;
CraftGUIUtil.horizontalGrid(x, y, TextJustification.MiddleCenter, 2.0f, new ControlSlotArray(this, 0, 0, 2, 2).create(Sequencer.SLOT_RESERVE), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSequencerProgress(this, 0, 0), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSlot(this, 0.0f, 0.0f).assign(6));
CraftGUIUtil.horizontalGrid(x, y, TextJustification.MIDDLE_CENTER, 2.0f, new ControlSlotArray(this, 0, 0, 2, 2).create(Sequencer.SLOT_RESERVE), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSequencerProgress(this, 0, 0), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSlot(this, 0.0f, 0.0f).assign(6));
ControlSlot slotTarget = new ControlSlot(this, x + 96, y + 16);
slotTarget.assign(5);
x = 34;
y = 92;
slotText = new ControlText(this, new IArea(0.0f, y, w(), 12.0f), EnumChatFormatting.DARK_GRAY + I18N.localise(Genetics.instance, "machine.sequencer.gui.willNotSave"), TextJustification.MiddleCenter);
slotText = new ControlText(this, new IArea(0.0f, y, w(), 12.0f), EnumChatFormatting.DARK_GRAY + I18N.localise("genetics.machine.sequencer.gui.willNotSave"), TextJustification.MIDDLE_CENTER);
y += 20;
ControlSlot slotDye = new ControlSlot(this, x, y);
slotDye.assign(0);
@@ -77,7 +77,7 @@ public class WindowSequencer extends WindowMachine {
@Override
public String getTitle() {
return I18N.localise(Genetics.instance, "machine.machine.sequencer");
return I18N.localise("genetics.machine.machine.sequencer");
}
@Override