[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

@@ -24,12 +24,12 @@ public class BinnieCircuitLayout implements ICircuitLayout {
@Override
public String getName() {
return I18N.localise(mod, "circuit.layout." + uid.toLowerCase());
return I18N.localise(mod.getModID() + ".circuit.layout." + uid.toLowerCase());
}
@Override
public String getUsage() {
return I18N.localise(mod, "circuit.layout." + uid.toLowerCase() + ".usage");
return I18N.localise(mod.getModID() + ".circuit.layout." + uid.toLowerCase() + ".usage");
}
@Override
@@ -76,7 +76,7 @@ public class WindowFieldKit extends Window {
@Override
protected String getName() {
return I18N.localise(BinnieCore.instance, "gui.fieldKit");
return I18N.localise("binniecore.gui.fieldKit");
}
private void setupValidators() {
@@ -89,7 +89,7 @@ public class WindowFieldKit extends Window {
@Override
public String getTooltip() {
return I18N.localise(BinnieCore.instance, "gui.tooltip.individual");
return I18N.localise("binniecore.gui.tooltip.individual");
}
});
@@ -101,7 +101,7 @@ public class WindowFieldKit extends Window {
@Override
public String getTooltip() {
return I18N.localise(BinnieCore.instance, "gui.tooltip.paper");
return I18N.localise("binniecore.gui.tooltip.paper");
}
});
getWindowInventory().disableAutoDispense(1);
@@ -119,8 +119,8 @@ public class WindowFieldKit extends Window {
GlassControl = new ControlImage(this, handGlass.x(), handGlass.y(), new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett));
new ControlSlot(this, handGlass.x() + 54.0f, handGlass.y() + 26.0f).assign(InventoryType.Window, 0);
new ControlSlot(this, 208.0f, 8.0f).assign(InventoryType.Window, 1);
(text = new ControlText(this, new IPoint(232.0f, 13.0f), I18N.localise(BinnieCore.instance, "gui.tooltip.paper"))).setColor(0x222222);
(text = new ControlText(this, new IArea(0.0f, 120.0f, w(), 24.0f), "", TextJustification.MiddleCenter)).setColor(0x222222);
(text = new ControlText(this, new IPoint(232.0f, 13.0f), I18N.localise("binniecore.gui.tooltip.paper"))).setColor(0x222222);
(text = new ControlText(this, new IArea(0.0f, 120.0f, w(), 24.0f), "", TextJustification.MIDDLE_CENTER)).setColor(0x222222);
chromo = new ControlChromosome(this, 150.0f, 24.0f);
addEventHandler(new EventValueChanged.Handler() {
@@ -230,7 +230,7 @@ public class WindowFieldKit extends Window {
if (item != null && !Analyser.isAnalysed(item)) {
if (getWindowInventory().getStackInSlot(1) == null) {
text.setValue(I18N.localise(BinnieCore.instance, "gui.tooltip.noPaper"));
text.setValue(I18N.localise("binniecore.gui.tooltip.noPaper"));
isAnalysing = false;
analyseProgress = 1.0f;
} else {
@@ -264,7 +264,7 @@ public class WindowFieldKit extends Window {
@Override
public String showInfoButton() {
return I18N.localise(BinnieCore.instance, "gui.fieldKit.info");
return I18N.localise("binniecore.gui.fieldKit.info");
}
@Override
@@ -56,7 +56,7 @@ public class WindowGenesis extends Window {
@Override
protected String getName() {
return I18N.localise(BinnieCore.instance, "gui.genesis");
return I18N.localise("binniecore.gui.genesis");
}
@Override
@@ -24,7 +24,7 @@ public class ControlButton extends Control {
public ControlButton(IWidget parent, float x, float y, float width, float height, String text) {
this(parent, x, y, width, height);
this.text = text;
textWidget = new ControlText(this, getArea(), text, TextJustification.MiddleCenter);
textWidget = new ControlText(this, getArea(), text, TextJustification.MIDDLE_CENTER);
}
private EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() {
@@ -26,7 +26,7 @@ public class ControlCheckbox extends Control implements IControlValue<Boolean> {
this.text = text;
value = bool;
if (w > 16.0f) {
new ControlText(this, new IArea(16.0f, 1.0f, w - 16.0f, 16.0f), text, TextJustification.MiddleCenter).setColor(4473924);
new ControlText(this, new IArea(16.0f, 1.0f, w - 16.0f, 16.0f), text, TextJustification.MIDDLE_CENTER).setColor(4473924);
}
addAttribute(WidgetAttribute.MOUSE_OVER);
@@ -13,7 +13,7 @@ public class ControlText extends Control implements IControlValue<String> {
private TextJustification align;
public ControlText(IWidget parent, IPoint pos, String text) {
this(parent, new IArea(pos, new IPoint(500.0f, 0.0f)), text, TextJustification.TopLeft);
this(parent, new IArea(pos, new IPoint(500.0f, 0.0f)), text, TextJustification.TOP_LEFT);
}
public ControlText(IWidget parent, String text, TextJustification align) {
@@ -7,6 +7,6 @@ import binnie.core.craftgui.geometry.TextJustification;
public class ControlTextCentered extends ControlText {
public ControlTextCentered(IWidget parent, float y, String text) {
super(parent, new IArea(new IPoint(0.0f, y), new IPoint(parent.size().x(), 0.0f)), text, TextJustification.TopCenter);
super(parent, new IArea(new IPoint(0.0f, y), new IPoint(parent.size().x(), 0.0f)), text, TextJustification.TOP_CENTER);
}
}
@@ -11,7 +11,7 @@ public class ControlTextOption<T> extends ControlOption<T> {
public ControlTextOption(ControlList<T> controlList, T option, String optionName, int y) {
super(controlList, option, y);
textWidget = null;
textWidget = new ControlText(this, getArea(), optionName, TextJustification.MiddleCenter);
textWidget = new ControlText(this, getArea(), optionName, TextJustification.MIDDLE_CENTER);
mouseHandler.setOrigin(EventHandler.Origin.Self, this);
addEventHandler(mouseHandler);
@@ -1,7 +1,6 @@
package binnie.core.craftgui.database;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
@@ -34,11 +33,14 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme
BreedingSystem system = Binnie.Genetics.getSystem(speciesRoot.getUID());
IIndividual ind = system.getSpeciesRoot().templateAsIndividual(system.getSpeciesRoot().getTemplate(species.getUID()));
super.setItemStack(system.getSpeciesRoot().getMemberStack(ind, system.getDefaultType()));
GameProfile username = Window.get(this).getUsername();
Window window = Window.get(this);
GameProfile username = window.getUsername();
if (state == EnumDiscoveryState.UNDETERMINED) {
state = (system.isSpeciesDiscovered(species, Window.get(this).getWorld(), username) ? EnumDiscoveryState.DISCOVERED : EnumDiscoveryState.UNDISCOVERED);
} else if (Window.get(this) instanceof WindowAbstractDatabase && ((WindowAbstractDatabase) Window.get(this)).isNEI) {
state = system.isSpeciesDiscovered(species, window.getWorld(), username)
? EnumDiscoveryState.DISCOVERED
: EnumDiscoveryState.UNDISCOVERED;
} else if (window instanceof WindowAbstractDatabase && ((WindowAbstractDatabase) window).isNEI) {
state = EnumDiscoveryState.SHOW;
}
@@ -95,11 +97,11 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme
break;
case DISCOVERED:
tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.discovered.discovered"));
tooltip.add(I18N.localise("binniecore.gui.database.discovered.discovered"));
break;
case UNDISCOVERED:
tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.discovered.undiscovered"));
tooltip.add(I18N.localise("binniecore.gui.database.discovered.undiscovered"));
break;
}
}
@@ -8,39 +8,43 @@ import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IMutation;
class ControlMutationItem extends ControlOption<IMutation> {
private ControlDatabaseIndividualDisplay itemWidget1;
private ControlDatabaseIndividualDisplay itemWidget2;
private ControlDatabaseIndividualDisplay itemWidget3;
private ControlMutationSymbol addSymbol;
private ControlMutationSymbol arrowSymbol;
public ControlMutationItem(ControlList<IMutation> controlList, IMutation option, IAlleleSpecies species, int y) {
super(controlList, option, y);
itemWidget1 = new ControlDatabaseIndividualDisplay(this, 4.0f, 4.0f);
itemWidget2 = new ControlDatabaseIndividualDisplay(this, 44.0f, 4.0f);
itemWidget3 = new ControlDatabaseIndividualDisplay(this, 104.0f, 4.0f);
addSymbol = new ControlMutationSymbol(this, 24, 4, 0);
arrowSymbol = new ControlMutationSymbol(this, 64, 4, 1);
ControlDatabaseIndividualDisplay itemWidget1 = new ControlDatabaseIndividualDisplay(this, 4.0f, 4.0f);
ControlDatabaseIndividualDisplay itemWidget2 = new ControlDatabaseIndividualDisplay(this, 44.0f, 4.0f);
ControlDatabaseIndividualDisplay itemWidget3 = new ControlDatabaseIndividualDisplay(this, 104.0f, 4.0f);
ControlMutationSymbol addSymbol = new ControlMutationSymbol(this, 24, 4, 0);
ControlMutationSymbol arrowSymbol = new ControlMutationSymbol(this, 64, 4, 1);
boolean isNEI = ((WindowAbstractDatabase) getSuperParent()).isNEI();
BreedingSystem system = ((WindowAbstractDatabase) getSuperParent()).getBreedingSystem();
Window window = Window.get(this);
if (getValue() == null) {
return;
}
boolean isMutationDiscovered = system.isMutationDiscovered(getValue(), Window.get(this).getWorld(), Window.get(this).getUsername());
boolean isMutationDiscovered = system.isMutationDiscovered(getValue(), window.getWorld(), window.getUsername());
IAlleleSpecies allele;
EnumDiscoveryState state;
allele = getValue().getAllele0();
state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species == allele) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED));
state = getState(isNEI, isMutationDiscovered, species, allele);
itemWidget1.setSpecies(allele, state);
allele = getValue().getAllele1();
state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species == allele) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED));
state = getState(isNEI, isMutationDiscovered, species, allele);
itemWidget2.setSpecies(allele, state);
allele = (IAlleleSpecies) getValue().getTemplate()[0];
state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species == allele) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED));
state = getState(isNEI, isMutationDiscovered, species, allele);
itemWidget3.setSpecies(allele, state);
addSymbol.setValue(getValue());
arrowSymbol.setValue(getValue());
}
private EnumDiscoveryState getState(boolean isNEI, boolean isMutationDiscovered, IAlleleSpecies species, IAlleleSpecies allele) {
return (isNEI || isMutationDiscovered || species == allele)
? EnumDiscoveryState.SHOW
: EnumDiscoveryState.UNDETERMINED;
}
}
@@ -1,6 +1,5 @@
package binnie.core.craftgui.database;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.WidgetAttribute;
import binnie.core.craftgui.controls.listbox.ControlList;
@@ -25,7 +24,7 @@ class ControlSpeciesBoxOption extends ControlTextOption<IAlleleSpecies> {
textWidget.setValue(option.getName());
addAttribute(WidgetAttribute.MOUSE_OVER);
} else {
textWidget.setValue(I18N.localise(BinnieCore.instance, "gui.database.discovered.undiscovered"));
textWidget.setValue(I18N.localise("binniecore.gui.database.discovered.undiscovered"));
}
CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f));
@@ -16,11 +16,11 @@ public class DatabaseTab implements ITooltipHelp {
@Override
public String toString() {
return I18N.localise(mod, "gui.database.tab." + unloc);
return I18N.localise(mod.getModID() + ".gui.database.tab." + unloc);
}
@Override
public void getHelpTooltip(Tooltip tooltip) {
tooltip.add(I18N.localiseOrBlank(mod, "gui.database.tab." + unloc + ".help"));
tooltip.add(I18N.localiseOrBlank(mod.getModID() + ".gui.database.tab." + unloc + ".help"));
}
}
@@ -1,6 +1,5 @@
package binnie.core.craftgui.database;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
@@ -28,19 +27,20 @@ public class PageBranchOverview extends PageBranch {
@Override
public void onValueChanged(IClassification branch) {
String name = I18N.localise(branch.getName());
branchName.setValue(
EnumChatFormatting.BOLD
+ I18N.localise(BinnieCore.instance, "gui.database.branch.name", branch.getName())
+ I18N.localise("binniecore.gui.database.branch.name", name)
+ EnumChatFormatting.RESET
);
branchScientific.setValue(
EnumChatFormatting.ITALIC
+ I18N.localise(BinnieCore.instance, "gui.database.branch.apidae", branch.getScientific())
+ I18N.localise("binniecore.gui.database.branch.apidae", branch.getScientific())
+ EnumChatFormatting.RESET
);
branchAuthority.setValue(
EnumChatFormatting.BOLD
+ I18N.localise(BinnieCore.instance, "gui.database.branch.discoveredBy", branch.getMemberSpecies()[0].getAuthority())
+ I18N.localise("binniecore.gui.database.branch.discoveredBy", branch.getMemberSpecies()[0].getAuthority())
+ EnumChatFormatting.RESET);
for (IWidget widget : branchDescription) {
@@ -49,8 +49,8 @@ public class PageBranchOverview extends PageBranch {
branchDescription.clear();
String desc = branch.getDescription();
if (desc == null || desc.isEmpty()) {
desc = I18N.localise(BinnieCore.instance, "gui.database.branch.noDesc");
if (desc.contains("for.genus.bees.")) { // unlocalized
desc = I18N.localise("binniecore.gui.database.branch.noDesc");
}
StringBuilder line = new StringBuilder();
@@ -1,8 +1,6 @@
package binnie.core.craftgui.database;
import binnie.core.BinnieCore;
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;
@@ -11,7 +9,6 @@ import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IClassification;
public class PageBranchSpecies extends PageBranch {
private ControlText title;
private ControlSpeciesBox speciesList;
@Mod.EventHandler
@@ -21,7 +18,7 @@ public class PageBranchSpecies extends PageBranch {
public PageBranchSpecies(IWidget parent, DatabaseTab tab) {
super(parent, tab);
title = new ControlTextCentered(this, 8.0f, I18N.localise(BinnieCore.instance, "gui.database.species"));
new ControlTextCentered(this, 8.0f, I18N.localise("binniecore.gui.database.species"));
addEventHandler(new ValueHandler());
speciesList = new ControlSpeciesBox(this, 4.0f, 20.0f, 136.0f, 152.0f);
}
@@ -1,6 +1,5 @@
package binnie.core.craftgui.database;
import binnie.core.BinnieCore;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.controls.page.ControlPage;
@@ -27,16 +26,16 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem();
new ControlTextCentered(this, 8.0f,
EnumChatFormatting.BOLD
+ I18N.localise(BinnieCore.instance, "gui.database.descriptor", system.getDescriptor())
+ I18N.localise("binniecore.gui.database.descriptor", system.getDescriptor())
+ EnumChatFormatting.RESET
);
new ControlTextCentered(this, 75.0f, I18N.localise(BinnieCore.instance, "gui.database.species.count", system.discoveredSpeciesCount, system.totalSpeciesCount));
new ControlTextCentered(this, 75.0f, I18N.localise("binniecore.gui.database.species.count", system.discoveredSpeciesCount, system.totalSpeciesCount));
new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage);
new ControlTextCentered(this, 75.0f, I18N.localise(BinnieCore.instance, "gui.database.branches.count", system.discoveredBranchCount, system.totalBranchCount));
new ControlTextCentered(this, 75.0f, I18N.localise("binniecore.gui.database.branch.count", system.discoveredBranchCount, system.totalBranchCount));
new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage);
if (system.discoveredSecretCount > 0) {
new ControlTextCentered(this, 75.0f, I18N.localise(BinnieCore.instance, "gui.database.species.secretCount", system.discoveredSecretCount, system.totalSecretCount));
new ControlTextCentered(this, 75.0f, I18N.localise("binniecore.gui.database.species.secretCount", system.discoveredSecretCount, system.totalSecretCount));
}
new ControlTextCentered(this, 32.0f, player.getName());
@@ -1,24 +1,21 @@
package binnie.core.craftgui.database;
import binnie.core.BinnieCore;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.util.I18N;
import forestry.api.genetics.IAlleleSpecies;
public class PageSpeciesMutations extends PageSpecies {
private ControlText furtherTitle;
private ControlMutationBox furtherList;
private ControlMutationBox list;
public PageSpeciesMutations(IWidget parent, DatabaseTab tab) {
super(parent, tab);
furtherTitle = new ControlTextCentered(this, 8.0f, I18N.localise(BinnieCore.instance, "gui.database.furtherMutations"));
furtherList = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.FURTHER);
new ControlTextCentered(this, 8.0f, I18N.localise("binniecore.gui.database.furtherMutations"));
list = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.FURTHER);
}
@Override
public void onValueChanged(IAlleleSpecies species) {
furtherList.setSpecies(species);
list.setSpecies(species);
}
}
@@ -1,6 +1,5 @@
package binnie.core.craftgui.database;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
@@ -30,15 +29,18 @@ public class PageSpeciesOverview extends PageSpecies {
controlScientific = new ControlTextCentered(this, 32.0f, "");
controlAuthority = new ControlTextCentered(this, 44.0f, "");
controlComplexity = new ControlTextCentered(this, 56.0f, "");
controlDescription = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.MiddleCenter);
controlSignature = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.BottomRight);
controlDescription = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.MIDDLE_CENTER);
controlSignature = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.BOTTOM_RIGHT);
}
@Override
public void onValueChanged(IAlleleSpecies species) {
controlInd1.setSpecies(species, EnumDiscoveryState.SHOW);
controlInd2.setSpecies(species, EnumDiscoveryState.SHOW);
String branchBinomial = (species.getBranch() != null) ? species.getBranch().getScientific() : "<Unknown>";
String branchBinomial = (species.getBranch() != null)
? species.getBranch().getScientific()
: "<Unknown>";
controlName.setValue(EnumChatFormatting.BOLD + species.getName() + EnumChatFormatting.RESET);
controlScientific.setValue(EnumChatFormatting.ITALIC + branchBinomial + " " + species.getBinomial() + EnumChatFormatting.RESET);
controlAuthority.setValue(EnumChatFormatting.BOLD + "Discovered by " + species.getAuthority() + EnumChatFormatting.RESET);
@@ -48,7 +50,7 @@ public class PageSpeciesOverview extends PageSpecies {
String descSig = "";
if (desc == null || desc.isEmpty()) {
descBody += I18N.localise(BinnieCore.instance, "gui.database.species.noDesc");
descBody += I18N.localise("binniecore.gui.database.species.noDesc");
} else {
String[] descStrings = desc.split("\\|");
descBody += descStrings[0];
@@ -1,19 +1,16 @@
package binnie.core.craftgui.database;
import binnie.core.BinnieCore;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.util.I18N;
import forestry.api.genetics.IAlleleSpecies;
public class PageSpeciesResultant extends PageSpecies {
private ControlText title;
private ControlMutationBox list;
public PageSpeciesResultant(IWidget parent, DatabaseTab tab) {
super(parent, tab);
title = new ControlTextCentered(this, 8.0f, I18N.localise(BinnieCore.instance, "gui.database.resultantMutations"));
new ControlTextCentered(this, 8.0f, I18N.localise("binniecore.gui.database.resultantMutations"));
list = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.RESULTANT);
}
@@ -1,6 +1,5 @@
package binnie.core.craftgui.database;
import binnie.core.BinnieCore;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlTextEdit;
import binnie.core.craftgui.controls.listbox.ControlListBox;
@@ -21,6 +20,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;
import binnie.core.util.IValidator;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.relauncher.Side;
@@ -228,7 +228,7 @@ public abstract class WindowAbstractDatabase extends Window {
@Override
public String getName() {
return BinnieCore.proxy.localise("gui.database.mode." + name().toLowerCase());
return I18N.localise("binniecore.gui.database.mode." + name().toLowerCase());
}
}
@@ -250,6 +250,6 @@ public abstract class WindowAbstractDatabase extends Window {
CraftGUIUtil.alignToWidget(infoPages = new ControlPages<>(modePage, 0.0f, 0.0f, 144.0f, 176.0f), database.panelInformation);
}
public abstract void createListBox(IArea p0);
public abstract void createListBox(IArea area);
}
}
@@ -16,7 +16,7 @@ public class CraftGUIUtil {
}
public static void horizontalGrid(float px, float py, IWidget... widgets) {
horizontalGrid(px, py, TextJustification.MiddleCenter, 0.0f, widgets);
horizontalGrid(px, py, TextJustification.MIDDLE_CENTER, 0.0f, widgets);
}
public static void horizontalGrid(float px, float py, TextJustification just, float spacing, IWidget... widgets) {
@@ -32,7 +32,7 @@ public class CraftGUIUtil {
}
public static void verticalGrid(float px, float py, IWidget... widgets) {
horizontalGrid(px, py, TextJustification.MiddleCenter, 0.0f, widgets);
horizontalGrid(px, py, TextJustification.MIDDLE_CENTER, 0.0f, widgets);
}
public static void verticalGrid(float px, float py, TextJustification just, float spacing, IWidget... widgets) {
@@ -1,15 +1,15 @@
package binnie.core.craftgui.geometry;
public enum TextJustification {
TopLeft(0.0f, 0.0f),
TopCenter(0.5f, 0.0f),
TopRight(1.0f, 0.0f),
MiddleLeft(0.0f, 0.5f),
MiddleCenter(0.5f, 0.5f),
MiddleRight(1.0f, 0.5f),
BottomLeft(0.0f, 1.0f),
BottomCenter(0.5f, 1.0f),
BottomRight(1.0f, 1.0f);
TOP_LEFT(0.0f, 0.0f),
TOP_CENTER(0.5f, 0.0f),
TOP_RIGHT(1.0f, 0.0f),
MIDDLE_LEFT(0.0f, 0.5f),
MIDDLE_CENTER(0.5f, 0.5f),
MIDDLE_RIGHT(1.0f, 0.5f),
BOTTOM_LEFT(0.0f, 1.0f),
BOTTOM_CENTER(0.5f, 1.0f),
BOTTOM_RIGHT(1.0f, 1.0f);
protected float xOffset;
protected float yOffset;
@@ -1,6 +1,5 @@
package binnie.core.craftgui.minecraft.control;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
@@ -32,6 +31,7 @@ public class ControlEnergyBar extends Control implements ITooltip {
addAttribute(WidgetAttribute.MOUSE_OVER);
}
// TODO unused method?
public IPoweredMachine getClientPower() {
IInventory inventory = Window.get(this).getInventory();
TileEntityMachine machine = (inventory instanceof TileEntityMachine) ? (TileEntityMachine) inventory : null;
@@ -67,19 +67,19 @@ public class ControlEnergyBar extends Control implements ITooltip {
@Override
public void getTooltip(Tooltip tooltip) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.chargedPower", (int) getPercentage()));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.powerInfo", getStoredEnergy(), getMaxEnergy()));
tooltip.add(I18N.localise("binniecore.gui.tooltip.chargedPower", (int) getPercentage()));
tooltip.add(I18N.localise("binniecore.gui.tooltip.powerInfo", getStoredEnergy(), getMaxEnergy()));
}
@Override
public void getHelpTooltip(Tooltip tooltip) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.powerBar"));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.currentPower", getStoredEnergy(), (int) getPercentage()));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.capacityPower", getMaxEnergy()));
tooltip.add(I18N.localise("binniecore.gui.tooltip.powerBar"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.currentPower", getStoredEnergy(), (int) getPercentage()));
tooltip.add(I18N.localise("binniecore.gui.tooltip.capacityPower", getMaxEnergy()));
IProcess process = Machine.getInterface(IProcess.class, Window.get(this).getInventory());
if (process != null) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.usagePower", (int) process.getEnergyPerTick()));
tooltip.add(I18N.localise("binniecore.gui.tooltip.usagePower", (int) process.getEnergyPerTick()));
}
}
@@ -1,6 +1,5 @@
package binnie.core.craftgui.minecraft.control;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
@@ -24,10 +23,10 @@ public class ControlHelp extends Control implements ITooltip {
@Override
public void getTooltip(Tooltip tooltip) {
tooltip.setType(Tooltip.Type.HELP);
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help"));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help.0"));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help.1"));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help.2"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.help"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.help.0"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.help.1"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.help.2"));
}
@Override
@@ -1,6 +1,5 @@
package binnie.core.craftgui.minecraft.control;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
@@ -27,7 +26,7 @@ public class ControlInfo extends Control implements ITooltip {
@Override
public void getTooltip(Tooltip tooltip) {
tooltip.setType(Tooltip.Type.INFORMATION);
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.info"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.info"));
tooltip.add(info);
tooltip.setMaxWidth(200);
}
@@ -144,32 +144,32 @@ public class ControlLiquidTank extends Control implements ITooltip {
TankSlot slot = getTankSlot();
tooltip.add(slot.getName());
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.capacity", getTankCapacity()));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.insertSide", MachineSide.asString(slot.getInputSides())));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.extractSide", MachineSide.asString(slot.getOutputSides())));
tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.capacity", getTankCapacity()));
tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.insertSide", MachineSide.asString(slot.getInputSides())));
tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.extractSide", MachineSide.asString(slot.getOutputSides())));
if (slot.isReadOnly()) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.outputOnlyTank"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.outputOnlyTank"));
}
if (slot.getValidator() == null) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.acceptsAny"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.acceptsAny"));
} else {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.accepts", slot.getValidator().getTooltip()));
tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.accepts", slot.getValidator().getTooltip()));
}
}
@Override
public void getTooltip(Tooltip tooltip) {
if (!isTankValid()) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.empty"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.empty"));
return;
}
int percentage = (int) (100.0 * getTank().getAmount() / getTankCapacity());
tooltip.add(getTank().getName());
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.full", percentage));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.amount", (int) getTank().getAmount()));
tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.full", percentage));
tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.amount", (int) getTank().getAmount()));
}
private TankSlot getTankSlot() {
@@ -1,6 +1,5 @@
package binnie.core.craftgui.minecraft.control;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
@@ -28,8 +27,8 @@ public class ControlPowerSystem extends Control implements ITooltip {
@Override
public void getTooltip(Tooltip tooltip) {
tooltip.setType(Tooltip.Type.POWER);
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.powerSupply"));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.poweredBy", system.getUnitName()));
tooltip.add(I18N.localise("binniecore.gui.tooltip.powerSupply"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.poweredBy", system.getUnitName()));
tooltip.setMaxWidth(200);
}
}
@@ -1,6 +1,5 @@
package binnie.core.craftgui.minecraft.control;
import binnie.core.BinnieCore;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.WidgetAttribute;
@@ -31,9 +30,9 @@ public class ControlProgressBase extends Control {
String ts = "";
if (minutes > 0) {
if (minutes == 1) {
ts += I18N.localise(BinnieCore.instance, "gui.database.time.minute");
ts += I18N.localise("binniecore.gui.database.time.minute");
} else {
ts += I18N.localise(BinnieCore.instance, "gui.database.time.minutes", minutes);
ts += I18N.localise("binniecore.gui.database.time.minutes", minutes);
}
}
@@ -42,9 +41,9 @@ public class ControlProgressBase extends Control {
ts += " ";
}
if (seconds == 1) {
ts += I18N.localise(BinnieCore.instance, "gui.database.time.second");
ts += I18N.localise("binniecore.gui.database.time.second");
} else {
ts += I18N.localise(BinnieCore.instance, "gui.database.time.seconds", seconds);
ts += I18N.localise("binniecore.gui.database.time.seconds", seconds);
}
}
return ts;
@@ -79,22 +78,22 @@ public class ControlProgressBase extends Control {
return;
}
tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.progress"));
tooltip.add(I18N.localise("binniecore.gui.database.time.progress"));
if (progress == 0.0f) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.notInProgress"));
tooltip.add(I18N.localise("binniecore.gui.database.time.notInProgress"));
} else if (process.getProcessTime() > 0) {
tooltip.add(machineProcess.getTooltip() + " (" + (int) process.getCurrentProgress() + "%)");
} else {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.inProgress"));
tooltip.add(I18N.localise("binniecore.gui.database.time.inProgress"));
}
if (process.getProcessTime() > 0) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.left", convertTime((int) ((1.0f - progress) * process.getProcessTime()))));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.total", convertTime(process.getProcessTime())));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.energyCost.0", process.getProcessEnergy() * 10));
tooltip.add(I18N.localise("binniecore.gui.database.time.left", convertTime((int) ((1.0f - progress) * process.getProcessTime()))));
tooltip.add(I18N.localise("binniecore.gui.database.time.total", convertTime(process.getProcessTime())));
tooltip.add(I18N.localise("binniecore.gui.database.energyCost.0", process.getProcessEnergy() * 10));
} else {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.energyCost.1", process.getEnergyPerTick() * 10.0f));
tooltip.add(I18N.localise("binniecore.gui.database.energyCost.1", process.getEnergyPerTick() * 10.0f));
}
}
}
@@ -57,7 +57,7 @@ public class ControlSlide extends Control {
if (anchor.y() > 0) {
GL11.glTranslatef(0.0f, -lh, 0.0f);
}
CraftGUI.Render.text(labelArea, TextJustification.MiddleCenter, label, 16777215);
CraftGUI.Render.text(labelArea, TextJustification.MIDDLE_CENTER, label, 16777215);
GL11.glPopMatrix();
}
CraftGUI.Render.texture(CraftGUITexture.Window, getArea());
@@ -1,6 +1,5 @@
package binnie.core.craftgui.minecraft.control;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
@@ -190,27 +189,27 @@ public class ControlSlot extends ControlSlotBase {
InventorySlot slot = getInventorySlot();
if (getInventorySlot() != null) {
tooltip.add(slot.getName());
tooltip.add(I18N.localise(BinnieCore.instance, "gui.side.insertSide", MachineSide.asString(slot.getInputSides())));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.side.extractSide", MachineSide.asString(slot.getOutputSides())));
tooltip.add(I18N.localise("binniecore.gui.side.insertSide", MachineSide.asString(slot.getInputSides())));
tooltip.add(I18N.localise("binniecore.gui.side.extractSide", MachineSide.asString(slot.getOutputSides())));
if (slot.isReadOnly()) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.pickupOnly"));
tooltip.add(I18N.localise("binniecore.gui.slot.pickupOnly"));
}
if (slot.getValidator() == null) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", I18N.localise(BinnieCore.instance, "gui.slot.anyItem")));
tooltip.add(I18N.localise("binniecore.gui.slot.accepts", I18N.localise("binniecore.gui.slot.anyItem")));
} else {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", slot.getValidator().getTooltip()));
tooltip.add(I18N.localise("binniecore.gui.slot.accepts", slot.getValidator().getTooltip()));
}
} else if (this.slot.inventory instanceof WindowInventory) {
SlotValidator s = ((WindowInventory) this.slot.inventory).getValidator(this.slot.getSlotIndex());
if (s == null) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", I18N.localise(BinnieCore.instance, "gui.slot.anyItem")));
tooltip.add(I18N.localise("binniecore.gui.slot.accepts", I18N.localise("binniecore.gui.slot.anyItem")));
} else {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", s.getTooltip()));
tooltip.add(I18N.localise("binniecore.gui.slot.accepts", s.getTooltip()));
}
} else if (this.slot.inventory instanceof InventoryPlayer) {
tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.playerInventory"));
tooltip.add(I18N.localise("binniecore.gui.slot.playerInventory"));
}
}
@@ -1,6 +1,5 @@
package binnie.core.craftgui.minecraft.control;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
@@ -30,7 +29,7 @@ public class ControlUser extends Control implements ITooltip {
@Override
public void getTooltip(Tooltip tooltip) {
tooltip.setType(Tooltip.Type.USER);
tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.owner"));
tooltip.add(I18N.localise("binniecore.gui.tooltip.owner"));
if (!username.isEmpty()) {
tooltip.add(username);
@@ -126,7 +126,7 @@ public class Renderer {
}
public void text(IPoint pos, String text, int colour) {
text(new IArea(pos, new IPoint(500.0f, 500.0f)), TextJustification.TopLeft, text, colour);
text(new IArea(pos, new IPoint(500.0f, 500.0f)), TextJustification.TOP_LEFT, text, colour);
}
public void text(IArea area, TextJustification justification, String text, int colour) {
@@ -1,7 +1,6 @@
package binnie.core.genetics;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import binnie.extrabees.ExtraBees;
import binnie.genetics.genetics.AlleleHelper;
@@ -60,16 +59,16 @@ class BeeBreedingSystem extends BreedingSystem {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (chromosome == EnumBeeChromosome.FERTILITY) {
if (allele.getUID().contains("Low")) {
return I18N.localise(BinnieCore.instance, "allele.fertility.low");
return I18N.localise("binniecore.allele.fertility.low");
}
if (allele.getUID().contains("Normal")) {
return I18N.localise(BinnieCore.instance, "allele.fertility.normal");
return I18N.localise("binniecore.allele.fertility.normal");
}
if (allele.getUID().contains("High")) {
return I18N.localise(BinnieCore.instance, "allele.fertility.high");
return I18N.localise("binniecore.allele.fertility.high");
}
if (allele.getUID().contains("Maximum")) {
return I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
return I18N.localise("binniecore.allele.fertility.maximum");
}
}
return super.getAlleleName(chromosome, allele);
@@ -1,7 +1,6 @@
package binnie.core.genetics;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.resource.BinnieIcon;
import binnie.core.util.I18N;
import binnie.extrabees.genetics.ExtraBeeMutation;
@@ -59,11 +58,11 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
}
public String getChromosomeName(IChromosomeType chromo) {
return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".chromosome." + chromo.getName());
return I18N.localise("binniecore." + getSpeciesRoot().getUID() + ".chromosome." + chromo.getName());
}
public String getChromosomeShortName(IChromosomeType chromo) {
return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short");
return I18N.localise("binniecore." + getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short");
}
public String getEpitome(float discoveredPercentage) {
@@ -83,7 +82,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
} else if (discoveredPercentage < 1.0f) {
i = 5;
}
return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".epitome." + i);
return I18N.localise("binniecore." + getSpeciesRoot().getUID() + ".epitome." + i);
}
public abstract ISpeciesRoot getSpeciesRoot();
@@ -352,7 +351,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
}
public String getDescriptor() {
return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".descriptor");
return I18N.localise("binniecore." + getSpeciesRoot().getUID() + ".descriptor");
}
public String getIdent() {
@@ -373,17 +372,17 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (allele instanceof IAlleleBoolean) {
return ((IAlleleBoolean) allele).getValue() ?
I18N.localise(BinnieCore.instance, "allele.true") :
I18N.localise(BinnieCore.instance, "allele.false");
I18N.localise("binniecore.allele.true") :
I18N.localise("binniecore.allele.false");
}
if (allele.getName().equals("for.gui.maximum")) {
return I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
return I18N.localise("binniecore.allele.fertility.maximum");
}
return allele.getName();
}
public String getName() {
return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".shortName");
return I18N.localise("binniecore." + getSpeciesRoot().getUID() + ".shortName");
}
@Override
@@ -1,6 +1,5 @@
package binnie.core.genetics;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
public enum EnumBeeModifier {
@@ -12,6 +11,6 @@ public enum EnumBeeModifier {
GENETIC_DECAY;
public String getName() {
return I18N.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase());
return I18N.localise("binniecore.beemodifier." + name().toLowerCase());
}
}
@@ -7,7 +7,6 @@ import binnie.botany.api.IBotanistTracker;
import binnie.botany.api.IFlowerRoot;
import binnie.botany.core.BotanyCore;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import binnie.extrabees.ExtraBees;
import binnie.genetics.genetics.AlleleHelper;
@@ -55,16 +54,16 @@ class FlowerBreedingSystem extends BreedingSystem {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (chromosome == EnumFlowerChromosome.FERTILITY) {
if (allele.getUID().contains("Low")) {
return I18N.localise(BinnieCore.instance, "allele.fertility.low");
return I18N.localise("binniecore.allele.fertility.low");
}
if (allele.getUID().contains("Normal")) {
return I18N.localise(BinnieCore.instance, "allele.fertility.normal");
return I18N.localise("binniecore.allele.fertility.normal");
}
if (allele.getUID().contains("High")) {
return I18N.localise(BinnieCore.instance, "allele.fertility.high");
return I18N.localise("binniecore.allele.fertility.high");
}
if (allele.getUID().contains("Maximum")) {
return I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
return I18N.localise("binniecore.allele.fertility.maximum");
}
}
return super.getAlleleName(chromosome, allele);
@@ -1,7 +1,6 @@
package binnie.core.genetics;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import forestry.api.genetics.IAllele;
@@ -50,24 +49,24 @@ class MothBreedingSystem extends BreedingSystem {
if (chromosome == EnumButterflyChromosome.METABOLISM) {
int metabolism = ((IAlleleInteger) allele).getValue();
if (metabolism >= 19) {
return I18N.localise(BinnieCore.instance, "allele.metabolism.highest");
return I18N.localise("binniecore.allele.metabolism.highest");
}
if (metabolism >= 16) {
return I18N.localise(BinnieCore.instance, "allele.metabolism.higher");
return I18N.localise("binniecore.allele.metabolism.higher");
}
if (metabolism >= 13) {
return I18N.localise(BinnieCore.instance, "allele.metabolism.high");
return I18N.localise("binniecore.allele.metabolism.high");
}
if (metabolism >= 10) {
return I18N.localise(BinnieCore.instance, "allele.metabolism.normal");
return I18N.localise("binniecore.allele.metabolism.normal");
}
if (metabolism >= 7) {
return I18N.localise(BinnieCore.instance, "allele.metabolism.slow");
return I18N.localise("binniecore.allele.metabolism.slow");
}
if (metabolism >= 4) {
return I18N.localise(BinnieCore.instance, "allele.metabolism.slower");
return I18N.localise("binniecore.allele.metabolism.slower");
}
return I18N.localise(BinnieCore.instance, "allele.metabolism.slowest");
return I18N.localise("binniecore.allele.metabolism.slowest");
}
if (chromosome == EnumButterflyChromosome.FERTILITY) {
return ((IAlleleInteger) allele).getValue() + "x";
@@ -1,7 +1,6 @@
package binnie.core.genetics;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import binnie.core.util.UniqueItemStackSet;
import binnie.extratrees.ExtraTrees;
@@ -90,23 +89,23 @@ public class TreeBreedingSystem extends BreedingSystem {
if (chromosome == EnumTreeChromosome.PLANT) {
EnumSet<EnumPlantType> types = ((IAllelePlantType) allele).getPlantTypes();
return types.isEmpty()
? I18N.localise(BinnieCore.instance, "allele.none")
? I18N.localise("binniecore.allele.none")
: types.iterator().next().toString();
}
if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) {
IFruitProvider provider = ((IAlleleFruit) allele).getProvider();
return (provider.getProducts().length == 0)
? I18N.localise(BinnieCore.instance, "allele.none")
? I18N.localise("binniecore.allele.none")
: provider.getProducts()[0].getDisplayName();
}
if (chromosome == EnumTreeChromosome.GROWTH) {
if (allele.getUID().contains("Tropical")) {
return I18N.localise(BinnieCore.instance, "allele.growth.tropical");
return I18N.localise("binniecore.allele.growth.tropical");
}
if (allele.getUID().contains("Lightlevel")) {
return I18N.localise(BinnieCore.instance, "allele.growth.lightlevel");
return I18N.localise("binniecore.allele.growth.lightlevel");
}
}
return super.getAlleleName(chromosome, allele);
@@ -33,6 +33,6 @@ public class ItemGenesis extends Item {
@Override
public String getItemStackDisplayName(ItemStack itemStack) {
return I18N.localise(BinnieCore.instance, "item.genesis.name");
return I18N.localise("binniecore.item.genesis.name");
}
}
@@ -2,6 +2,7 @@ package binnie.core.liquid;
import binnie.core.BinnieCore;
import binnie.core.Mods;
import binnie.core.util.I18N;
import binnie.genetics.item.GeneticsItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -50,7 +51,7 @@ public enum FluidContainer {
}
public String getName() {
return BinnieCore.proxy.localise("item.container." + name().toLowerCase());
return I18N.localise("binniecore.item.container." + name().toLowerCase());
}
public boolean isActive() {
@@ -1,7 +1,6 @@
package binnie.core.liquid;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import binnie.extratrees.alcohol.AlcoholEffect;
import binnie.extratrees.alcohol.drink.DrinkManager;
@@ -70,7 +69,7 @@ public class ItemFluidContainer extends ItemFood {
FluidStack fluid = getLiquid(stack);
if (fluid == null) {
return I18N.localise(BinnieCore.instance, "item.fluidContainer.missed");
return I18N.localise("binniecore.item.fluidContainer.missed");
}
return fluid.getFluid().getLocalizedName(fluid) + " " + container.getName();
}
@@ -8,12 +8,11 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
public class ManagerLiquid extends ManagerBase {
Map<String, IFluidType> fluids;
public Map<String, IFluidType> fluids;
public ManagerLiquid() {
fluids = new LinkedHashMap<>();
@@ -27,7 +27,7 @@ public abstract class MachinePackage {
public abstract TileEntity createTileEntity();
public String getDisplayName() {
return I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID());
return I18N.localise(group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID());
}
public Integer getMetadata() {
@@ -57,6 +57,6 @@ public abstract class MachinePackage {
}
public String getInformation() {
return I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID() + ".info");
return I18N.localise(group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID() + ".info");
}
}
@@ -1,6 +1,5 @@
package binnie.core.machines.inventory;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -93,7 +92,7 @@ public class InventorySlot extends BaseSlot<ItemStack> {
@Override
public String getName() {
return I18N.localise(BinnieCore.instance, "gui.slot." + unlocName);
return I18N.localise("binniecore.gui.slot." + unlocName);
}
public enum Type {
@@ -1,6 +1,5 @@
package binnie.core.machines.inventory;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import net.minecraftforge.common.util.ForgeDirection;
@@ -31,10 +30,10 @@ public class MachineSide {
public static String asString(Collection<ForgeDirection> sides) {
if (sides.containsAll(MachineSide.ALL)) {
return I18N.localise(BinnieCore.instance, "gui.side.any");
return I18N.localise("binniecore.gui.side.any");
}
if (sides.isEmpty()) {
return I18N.localise(BinnieCore.instance, "gui.side.none");
return I18N.localise("binniecore.gui.side.none");
}
String text = "";
@@ -42,48 +41,48 @@ public class MachineSide {
if (sides.size() > 0) {
text += ", ";
}
text += I18N.localise(BinnieCore.instance, "gui.side.up");
text += I18N.localise("binniecore.gui.side.up");
}
if (sides.contains(ForgeDirection.DOWN)) {
if (sides.size() > 0) {
text += ", ";
}
text += I18N.localise(BinnieCore.instance, "gui.side.down");
text += I18N.localise("binniecore.gui.side.down");
}
if (sides.containsAll(MachineSide.SIDES)) {
if (sides.size() > 0) {
text += ", ";
}
text += I18N.localise(BinnieCore.instance, "gui.side.sides");
text += I18N.localise("binniecore.gui.side.sides");
} else {
if (sides.contains(ForgeDirection.NORTH)) {
if (sides.size() > 0) {
text += ", ";
}
text += I18N.localise(BinnieCore.instance, "gui.side.north");
text += I18N.localise("binniecore.gui.side.north");
}
if (sides.contains(ForgeDirection.EAST)) {
if (sides.size() > 0) {
text += ", ";
}
text += I18N.localise(BinnieCore.instance, "gui.side.east");
text += I18N.localise("binniecore.gui.side.east");
}
if (sides.contains(ForgeDirection.SOUTH)) {
if (sides.size() > 0) {
text += ", ";
}
text += I18N.localise(BinnieCore.instance, "gui.side.south");
text += I18N.localise("binniecore.gui.side.south");
}
if (sides.contains(ForgeDirection.WEST)) {
if (sides.size() > 0) {
text += ", ";
}
text += I18N.localise(BinnieCore.instance, "gui.side.west");
text += I18N.localise("binniecore.gui.side.west");
}
}
return text;
@@ -1,6 +1,5 @@
package binnie.core.machines.inventory;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import forestry.api.genetics.AlleleManager;
import net.minecraft.item.ItemStack;
@@ -55,7 +54,7 @@ public abstract class SlotValidator extends Validator<ItemStack> {
@Override
public String getTooltip() {
return I18N.localise(BinnieCore.instance, "gui.slot.breedableIndividual");
return I18N.localise("binniecore.gui.slot.breedableIndividual");
}
}
}
@@ -1,6 +1,5 @@
package binnie.core.machines.inventory;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
@@ -49,6 +48,6 @@ public class TankSlot extends BaseSlot<FluidStack> {
@Override
public String getName() {
return I18N.localise(BinnieCore.instance, "gui.slot." + unlocName);
return I18N.localise("binniecore.gui.slot." + unlocName);
}
}
@@ -1,6 +1,5 @@
package binnie.core.machines.power;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import forestry.api.core.INBTTagable;
import net.minecraft.nbt.NBTTagCompound;
@@ -107,13 +106,13 @@ public class ErrorState implements INBTTagable {
}
public NoItem(String desc, int[] slots) {
super(I18N.localise(BinnieCore.instance, "machine.error.noItem"), desc, slots);
super(I18N.localise("binniecore.machine.error.noItem"), desc, slots);
}
}
public static class InvalidItem extends Item {
public InvalidItem(String desc, int slot) {
this(I18N.localise(BinnieCore.instance, "machine.error.invalidItem"), desc, slot);
this(I18N.localise("binniecore.machine.error.invalidItem"), desc, slot);
}
public InvalidItem(String name, String desc, int slot) {
@@ -123,32 +122,32 @@ public class ErrorState implements INBTTagable {
public static class NoSpace extends Item {
public NoSpace(String desc, int slot) {
super(I18N.localise(BinnieCore.instance, "machine.error.noSpace"), desc, new int[]{slot});
super(I18N.localise("binniecore.machine.error.noSpace"), desc, new int[]{slot});
}
public NoSpace(String desc, int[] slots) {
super(I18N.localise(BinnieCore.instance, "machine.error.noSpace"), desc, slots);
super(I18N.localise("binniecore.machine.error.noSpace"), desc, slots);
}
}
public static class InsufficientPower extends ErrorState {
public InsufficientPower() {
super(
I18N.localise(BinnieCore.instance, "machine.error.insufficientPower.title"),
I18N.localise(BinnieCore.instance, "machine.error.insufficientPower.desc")
I18N.localise("binniecore.machine.error.insufficientPower.title"),
I18N.localise("binniecore.machine.error.insufficientPower.desc")
);
}
}
public static class TankSpace extends Tank {
public TankSpace(String desc, int tank) {
super(I18N.localise(BinnieCore.instance, "machine.error.tankFull"), desc, new int[]{tank});
super(I18N.localise("binniecore.machine.error.tankFull"), desc, new int[]{tank});
}
}
public static class InsufficientLiquid extends Tank {
public InsufficientLiquid(String desc, int tank) {
super(I18N.localise(BinnieCore.instance, "machine.error.insufficientLiquid"), desc, new int[]{tank});
super(I18N.localise("binniecore.machine.error.insufficientLiquid"), desc, new int[]{tank});
}
}
}
@@ -5,10 +5,10 @@ import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.WidgetAttribute;
import binnie.core.craftgui.controls.ControlButton;
import binnie.core.craftgui.controls.ControlCheckbox;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextEdit;
import binnie.core.craftgui.controls.ControlButton;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.page.ControlPage;
import binnie.core.craftgui.controls.page.ControlPages;
@@ -4,7 +4,6 @@ import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.gui.IBinnieGUID;
import binnie.core.network.packet.MessageBase;
import binnie.core.util.I18N;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -58,12 +57,4 @@ public class BinnieModProxy implements IBinnieModProxy {
public void postInit() {
// ignored
}
public String localise(String string) {
return I18N.localise(mod, string);
}
public String localiseOrBlank(String string) {
return I18N.localiseOrBlank(mod, string);
}
}
+3 -16
View File
@@ -1,27 +1,14 @@
package binnie.core.util;
import binnie.core.AbstractMod;
import net.minecraft.util.StatCollector;
public class I18N {
public static String unlocalised(AbstractMod mod, String id) {
return mod.getModID() + "." + id;
}
public static String localise(String key) {
return StatCollector.translateToLocal(key.toString());
return StatCollector.translateToLocal(key);
}
public static String localise(AbstractMod mod, String id) {
return localise(unlocalised(mod, id));
}
public static String localiseOrBlank(AbstractMod mod, String id) {
return localiseOrBlank(unlocalised(mod, id));
}
public static String localise(AbstractMod mod, String id, Object... objs) {
return String.format(localise(mod, id), objs);
public static String localise(String key, Object... objs) {
return String.format(StatCollector.translateToLocal(key), objs);
}
public static String localiseOrBlank(String key) {