Removed LanguageManager

Added I18N static class
Some code reformatting
This commit is contained in:
kordum committed 2017-05-09 20:07:11 +03:00
1 parent 1ffe80b8c9
commit 186cbda444
62 files changed
+360 -375

No files matched your search

-2
View File
@@ -3,7 +3,6 @@ package binnie;
import binnie.core.ManagerBase;
import binnie.core.genetics.ManagerGenetics;
import binnie.core.item.ManagerItem;
import binnie.core.language.ManagerLanguage;
import binnie.core.liquid.ManagerLiquid;
import binnie.core.machines.ManagerMachine;
import binnie.core.mod.config.ManagerConfig;
@@ -14,7 +13,6 @@ import java.util.List;
public final class Binnie {
public static List<ManagerBase> Managers = new ArrayList<>();
public static ManagerLanguage I18N = new ManagerLanguage();
public static ManagerGenetics Genetics = new ManagerGenetics();
public static ManagerConfig Configuration = new ManagerConfig();
public static ManagerLiquid Liquid = new ManagerLiquid();
+2 -2
View File
@@ -211,7 +211,7 @@ public class Botany extends AbstractMod {
}
}
if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.Acid) {
if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ACID) {
EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
int next = Math.max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0);
if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) {
@@ -221,7 +221,7 @@ public class Botany extends AbstractMod {
}
}
if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.Alkaline) {
if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ALKALINE) {
EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
int next = Math.min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) {
@@ -1,11 +1,18 @@
package binnie.botany.api;
import binnie.botany.Botany;
import binnie.core.util.I18N;
public enum EnumAcidity {
Acid,
Neutral,
Alkaline;
ACID,
NEUTRAL,
ALKALINE;
public String getID() {
return name().toLowerCase();
}
public String getLocalisedName() {
return I18N.localise(Botany.instance, "ph." + getID());
}
}
@@ -1,11 +1,18 @@
package binnie.botany.api;
import binnie.botany.Botany;
import binnie.core.util.I18N;
public enum EnumMoisture {
Dry,
Normal,
Damp;
DRY,
NORMAL,
DAMP;
public String getID() {
return name().toLowerCase();
}
public String getLocalisedName() {
return I18N.localise(Botany.instance, "moisture." + getID());
}
}
@@ -1,5 +1,8 @@
package binnie.botany.api;
import binnie.botany.Botany;
import binnie.core.util.I18N;
public enum EnumSoilType {
SOIL,
LOAM,
@@ -8,4 +11,8 @@ public enum EnumSoilType {
public String getID() {
return name().toLowerCase();
}
public String getLocalisedName() {
return I18N.localise(Botany.instance, "soil." + getID());
}
}
@@ -1,12 +1,12 @@
package binnie.botany.ceramic;
import binnie.Binnie;
import binnie.botany.Botany;
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;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -75,7 +75,7 @@ public class BlockCeramic extends Block implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
return Binnie.I18N.localise(Botany.instance, "ceramicBlock");
return I18N.localise(Botany.instance, "ceramicBlock");
}
@Override
@@ -1,12 +1,16 @@
package binnie.botany.ceramic;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.botany.items.BotanyItems;
import binnie.core.BinnieCore;
import binnie.core.block.*;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.IMultipassBlock;
import binnie.core.block.MultipassBlockRenderer;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -527,19 +531,19 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
}
public String getName() {
return Binnie.I18N.localise(Botany.instance, type.name);
return I18N.localise(Botany.instance, type.name);
}
public void addTooltip(List tooltip) {
String name = color1.getName();
if (type.canDouble() && color2 != color1) {
name = Binnie.I18N.localise(Botany.instance, "colour.double", name, color2.getName());
name = I18N.localise(Botany.instance, "colour.double", name, color2.getName());
}
tooltip.add(EnumChatFormatting.GRAY + name);
}
public int ordinal() {
return color1.ordinal() + color2.ordinal() * 256 + type.ordinal() * 256 * 256;
return color1.ordinal() + color2.ordinal() * 256 + type.ordinal() * 65536;
}
public IIcon getIcon(int layer) {
@@ -1,10 +1,10 @@
package binnie.botany.ceramic;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.carpentry.BlockDesign;
import binnie.extratrees.carpentry.DesignBlock;
@@ -31,7 +31,7 @@ public class BlockCeramicPatterned extends BlockDesign {
@Override
public String getBlockName(DesignBlock design) {
return Binnie.I18N.localise(Botany.instance, "ceramicBlock");
return I18N.localise(Botany.instance, "ceramicBlock");
}
@Override
@@ -1,12 +1,12 @@
package binnie.botany.ceramic;
import binnie.Binnie;
import binnie.botany.Botany;
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;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -106,7 +106,7 @@ public class BlockStained extends Block implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
return Binnie.I18N.localise(Botany.instance, "pigmentedGlass");
return I18N.localise(Botany.instance, "pigmentedGlass");
}
@Override
@@ -10,7 +10,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
public class CeramicColor implements IDesignMaterial {
static Map<EnumFlowerColor, CeramicColor> map;
private static Map<EnumFlowerColor, CeramicColor> map;
static {
CeramicColor.map = new LinkedHashMap<>();
@@ -1,24 +1,11 @@
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 (EnumAcidity pH : EnumAcidity.values()) {
Binnie.I18N.addObjectName(pH, Binnie.I18N.unlocalised(Botany.instance, "ph." + pH.getID()));
}
for (EnumMoisture pH2 : EnumMoisture.values()) {
Binnie.I18N.addObjectName(pH2, Binnie.I18N.unlocalised(Botany.instance, "moisture." + pH2.getID()));
}
for (EnumSoilType pH3 : EnumSoilType.values()) {
Binnie.I18N.addObjectName(pH3, Binnie.I18N.unlocalised(Botany.instance, "soil." + pH3.getID()));
}
// ignored
}
@Override
@@ -8,9 +8,10 @@ import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.WidgetAttribute;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.geometry.IArea;
public class ControlColorDisplay extends Control implements IControlValue<IFlowerColor>, ITooltip {
IFlowerColor value;
private IFlowerColor value;
public ControlColorDisplay(IWidget parent, float x, float y) {
super(parent, x, y, 16.0f, 16.0f);
@@ -29,8 +30,9 @@ public class ControlColorDisplay extends Control implements IControlValue<IFlowe
@Override
public void onRenderBackground() {
CraftGUI.Render.solid(getArea(), -1);
CraftGUI.Render.solid(getArea().inset(1), 0xff000000 + getValue().getColor(false));
IArea area = getArea();
CraftGUI.Render.solid(area, -1);
CraftGUI.Render.solid(area.inset(1), 0xff000000 + getValue().getColor(false));
}
@Override
@@ -1,6 +1,5 @@
package binnie.botany.craftgui;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.api.IColourMix;
import binnie.core.craftgui.CraftGUI;
@@ -13,6 +12,7 @@ import binnie.core.craftgui.geometry.IPoint;
import binnie.core.craftgui.resource.Texture;
import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet;
import binnie.core.craftgui.resource.minecraft.StandardTexture;
import binnie.core.util.I18N;
public class ControlColourMixSymbol extends Control implements ITooltip {
protected static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
@@ -47,7 +47,7 @@ public class ControlColourMixSymbol extends Control implements ITooltip {
public void getTooltip(Tooltip tooltip) {
if (type == 1) {
float chance = value.getChance();
tooltip.add(Binnie.I18N.localise(Botany.instance, "gui.controls.colorMixSymbol.chance", chance));
tooltip.add(I18N.localise(Botany.instance, "gui.controls.colorMixSymbol.chance", chance));
}
}
}
@@ -1,6 +1,5 @@
package binnie.botany.craftgui;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.api.IColourMix;
import binnie.botany.api.IFlowerColor;
@@ -10,6 +9,7 @@ import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageAbstract;
import binnie.core.util.I18N;
import java.util.ArrayList;
import java.util.List;
@@ -20,7 +20,7 @@ public class PageColorMixResultant extends PageAbstract<IFlowerColor> {
public PageColorMixResultant(IWidget parent, DatabaseTab tab) {
super(parent, tab);
pageSpeciesFurtherTitle = new ControlTextCentered(this, 8.0f, Binnie.I18N.localise(Botany.instance, "gui.controls.pageSpeciesFurtherTitle"));
pageSpeciesFurtherTitle = new ControlTextCentered(this, 8.0f, I18N.localise(Botany.instance, "gui.controls.pageSpeciesFurtherTitle"));
pageSpeciesFurtherList = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Resultant);
}
@@ -1,6 +1,5 @@
package binnie.botany.craftgui;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.api.IColourMix;
import binnie.botany.api.IFlowerColor;
@@ -10,6 +9,7 @@ import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageAbstract;
import binnie.core.util.I18N;
import java.util.ArrayList;
import java.util.List;
@@ -20,7 +20,7 @@ public class PageColourMix extends PageAbstract<IFlowerColor> {
public PageColourMix(IWidget parent, DatabaseTab tab) {
super(parent, tab);
pageSpeciesFurtherTitle = new ControlTextCentered(this, 8.0f, Binnie.I18N.localise(Botany.instance, "gui.controls.pageColorFurtherTitle"));
pageSpeciesFurtherTitle = new ControlTextCentered(this, 8.0f, I18N.localise(Botany.instance, "gui.controls.pageColorFurtherTitle"));
pageSpeciesFurtherList = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Further);
}
@@ -18,6 +18,7 @@ import binnie.core.craftgui.geometry.IArea;
import binnie.core.craftgui.geometry.IPoint;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.util.I18N;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IIndividual;
@@ -46,7 +47,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
int w = 144;
int h = 176;
new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome"), TextJustification.MiddleCenter);
new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), I18N.localise(Botany.instance, "gui.database.tab.genome"), TextJustification.MiddleCenter);
ControlScrollableContent scrollable = new ControlScrollableContent(this, 4.0f, 20.0f, w - 8, h - 8 - 16, 12.0f);
Control contents = new Control(scrollable, 0.0f, 0.0f, w - 8 - 12, h - 8 - 16);
@@ -56,29 +57,30 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
int y = 0;
int th = 14;
int valueX = w2 + 4;
new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.temp"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.temp"), TextJustification.MiddleRight);
// TODO localized temperature
new ControlText(contents, new IArea(valueX, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MiddleLeft);
y += th;
new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.moist"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(valueX, y, w3, th), Binnie.I18N.localise(treeSpecies.getMoisture()), TextJustification.MiddleLeft);
new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.moist"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(valueX, y, w3, th), treeSpecies.getMoisture().getLocalisedName(), TextJustification.MiddleLeft);
y += th;
new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.ph"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(valueX, y, w3, th), Binnie.I18N.localise(treeSpecies.getPH()), TextJustification.MiddleLeft);
new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.ph"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(valueX, y, w3, th), treeSpecies.getPH().getLocalisedName(), TextJustification.MiddleLeft);
y += th;
new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.fertility"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.fertility"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(valueX, y, w3, th), genome.getFertility() + "x", TextJustification.MiddleLeft);
y += th;
float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f;
String lifespanValue = String.format("%.2f", lifespan);
new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.lifespan"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(valueX, y, w3, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.lifespan.value", lifespanValue), TextJustification.MiddleLeft);
new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.lifespan"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(valueX, y, w3, th), I18N.localise(Botany.instance, "gui.database.tab.genome.lifespan.value", lifespanValue), TextJustification.MiddleLeft);
y += th;
new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.nectar"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.nectar"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(valueX, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MiddleLeft);
y += th;
@@ -99,7 +101,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
}
int numOfLines = 1 + (tot - 1) / 3;
new ControlText(contents, new IArea(0.0f, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.varieties"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(0.0f, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), I18N.localise(Botany.instance, "gui.database.tab.genome.varieties"), TextJustification.MiddleRight);
y += th;
contents.setSize(new IPoint(contents.size().x(), y));
scrollable.setScrollableContent(contents);
@@ -19,6 +19,7 @@ import binnie.core.craftgui.database.PageSpeciesResultant;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.craftgui.geometry.IArea;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.entity.player.EntityPlayer;
@@ -57,7 +58,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
@Override
protected String getName() {
return Binnie.I18N.localise(Botany.instance, "gui.database.name");
return I18N.localise(Botany.instance, "gui.database.name");
}
enum FlowerMode implements IDatabaseMode {
@@ -1,10 +1,10 @@
package binnie.botany.farm;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.api.EnumAcidity;
import binnie.botany.api.EnumMoisture;
import binnie.core.circuits.BinnieCircuit;
import binnie.core.util.I18N;
import forestry.api.circuits.ChipsetManager;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.IFarmHousing;
@@ -27,42 +27,42 @@ public class CircuitGarden extends BinnieCircuit {
acidity = ph;
String info = "";
if (moisture == EnumMoisture.Dry) {
if (moisture == EnumMoisture.DRY) {
info += EnumChatFormatting.YELLOW
+ Binnie.I18N.localise(Botany.instance, "moisture.dry")
+ I18N.localise(Botany.instance, "moisture.dry")
+ EnumChatFormatting.RESET;
}
if (moisture == EnumMoisture.Damp) {
if (moisture == EnumMoisture.DAMP) {
info += EnumChatFormatting.YELLOW
+ Binnie.I18N.localise(Botany.instance, "moisture.damp")
+ I18N.localise(Botany.instance, "moisture.damp")
+ EnumChatFormatting.RESET;
}
if (acidity == EnumAcidity.Acid) {
if (acidity == EnumAcidity.ACID) {
if (info.length() > 0) {
info += ", ";
}
info += EnumChatFormatting.RED
+ Binnie.I18N.localise(Botany.instance, "ph.acid")
+ I18N.localise(Botany.instance, "ph.acid")
+ EnumChatFormatting.RESET;
}
if (acidity == EnumAcidity.Neutral) {
if (acidity == EnumAcidity.NEUTRAL) {
if (info.length() > 0) {
info += ", ";
}
info += EnumChatFormatting.GREEN
+ Binnie.I18N.localise(Botany.instance, "ph.neutral")
+ I18N.localise(Botany.instance, "ph.neutral")
+ EnumChatFormatting.RESET;
}
if (acidity == EnumAcidity.Alkaline) {
if (acidity == EnumAcidity.ALKALINE) {
if (info.length() > 0) {
info += ", ";
}
info += EnumChatFormatting.AQUA
+ Binnie.I18N.localise(Botany.instance, "ph.alkaline")
+ I18N.localise(Botany.instance, "ph.alkaline")
+ EnumChatFormatting.RESET;
}
@@ -84,7 +84,7 @@ public class CircuitGarden extends BinnieCircuit {
}
GardenLogic logic = new GardenLogic((IFarmHousing) tile);
logic.setData(moisture, acidity, isManual, isFertilised, icon, Binnie.I18N.localise(getName()));
logic.setData(moisture, acidity, isManual, isFertilised, icon, I18N.localise(getName()));
((IFarmHousing) tile).setFarmLogic(FarmDirection.values()[slot], logic);
}
@@ -174,7 +174,7 @@ public class GardenLogic extends FarmLogic {
isEnclosed = false;
}
isEnclosed = (isEnclosed || moisture != EnumMoisture.Damp);
isEnclosed = (isEnclosed || moisture != EnumMoisture.DAMP);
if (isEnclosed) {
return trySetWater(position);
}
@@ -185,15 +185,15 @@ public class GardenLogic extends FarmLogic {
private ItemStack getAvailableLoam() {
EnumMoisture[] moistures;
if (moisture == EnumMoisture.Damp) {
moistures = new EnumMoisture[]{EnumMoisture.Damp, EnumMoisture.Normal, EnumMoisture.Dry};
} else if (moisture == EnumMoisture.Dry) {
moistures = new EnumMoisture[]{EnumMoisture.Dry, EnumMoisture.Damp, EnumMoisture.Dry};
if (moisture == EnumMoisture.DAMP) {
moistures = new EnumMoisture[]{EnumMoisture.DAMP, EnumMoisture.NORMAL, EnumMoisture.DRY};
} else if (moisture == EnumMoisture.DRY) {
moistures = new EnumMoisture[]{EnumMoisture.DRY, EnumMoisture.DAMP, EnumMoisture.DRY};
} else {
moistures = new EnumMoisture[]{EnumMoisture.Dry, EnumMoisture.Normal, EnumMoisture.Damp};
moistures = new EnumMoisture[]{EnumMoisture.DRY, EnumMoisture.NORMAL, EnumMoisture.DAMP};
}
EnumAcidity[] acidities = {EnumAcidity.Neutral, EnumAcidity.Acid, EnumAcidity.Alkaline};
EnumAcidity[] acidities = {EnumAcidity.NEUTRAL, EnumAcidity.ACID, EnumAcidity.ALKALINE};
for (EnumMoisture moist : moistures) {
for (EnumAcidity acid : acidities) {
for (Block type : new Block[]{Botany.flowerbed, Botany.loam, Botany.soil}) {
@@ -230,7 +230,7 @@ public class GardenLogic extends FarmLogic {
private boolean trySetWater(Vect position) {
FluidStack water = Binnie.Liquid.getLiquidStack("water", 1000);
if (moisture == EnumMoisture.Damp) {
if (moisture == EnumMoisture.DAMP) {
if (!housing.hasLiquid(water)) {
return false;
}
@@ -240,7 +240,7 @@ public class GardenLogic extends FarmLogic {
return true;
}
if (moisture != EnumMoisture.Dry) {
if (moisture != EnumMoisture.DRY) {
return trySetSoil(position);
}
@@ -3,11 +3,18 @@ package binnie.botany.flower;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.api.*;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IFlower;
import binnie.botany.api.IFlowerColor;
import binnie.botany.api.IFlowerGenome;
import binnie.botany.api.IFlowerType;
import binnie.botany.core.BotanyCore;
import binnie.botany.genetics.EnumFlowerType;
import binnie.botany.genetics.Flower;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.genetics.IIndividual;
@@ -74,7 +81,7 @@ public abstract class ItemBotany extends Item {
}
IFlower individual = (IFlower) getIndividual(itemstack);
if (individual == null) {
tooltip.add(Binnie.I18N.localise(Botany.instance, "item.tooltip.bugged"));
tooltip.add(I18N.localise(Botany.instance, "item.tooltip.bugged"));
return;
}
@@ -88,10 +95,10 @@ public abstract class ItemBotany extends Item {
if (BinnieCore.proxy.isShiftDown()) {
individual.addTooltip(tooltip);
} else {
tooltip.add(EnumChatFormatting.GRAY + Binnie.I18N.localise(Botany.instance, "item.tooltip.holdMore"));
tooltip.add(EnumChatFormatting.GRAY + I18N.localise(Botany.instance, "item.tooltip.holdMore"));
}
} else {
tooltip.add(Binnie.I18N.localise(Botany.instance, "item.tooltip.unknownGenome"));
tooltip.add(I18N.localise(Botany.instance, "item.tooltip.unknownGenome"));
}
}
@@ -115,7 +122,7 @@ public abstract class ItemBotany extends Item {
@Override
public String getItemStackDisplayName(ItemStack itemstack) {
if (!itemstack.hasTagCompound()) {
return Binnie.I18N.localise(Botany.instance, "item.tooltip.unknown");
return I18N.localise(Botany.instance, "item.tooltip.unknown");
}
IIndividual individual = getIndividual(itemstack);
@@ -124,9 +131,9 @@ public abstract class ItemBotany extends Item {
if (tag == null || tag.isEmpty()) {
return individual.getDisplayName();
}
return Binnie.I18N.localise(Botany.instance, "item.botany.name", individual.getDisplayName(), tag);
return I18N.localise(Botany.instance, "item.botany.name", individual.getDisplayName(), tag);
}
return Binnie.I18N.localise(Botany.instance, "item.flowerCorrupted.name");
return I18N.localise(Botany.instance, "item.flowerCorrupted.name");
}
@Override
@@ -1,8 +1,8 @@
package binnie.botany.flower;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -71,7 +71,7 @@ public class ItemInsulatedTube extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
return Material.get(stack.getItemDamage()).getName() + " "
+ Binnie.I18N.localise(Botany.instance, "tube.name");
+ I18N.localise(Botany.instance, "tube.name");
}
@Override
@@ -112,7 +112,7 @@ public class ItemInsulatedTube extends Item {
}
public String getName() {
return Binnie.I18N.localise(Botany.instance, name);
return I18N.localise(Botany.instance, name);
}
}
@@ -141,7 +141,7 @@ public class ItemInsulatedTube extends Item {
}
public String getName() {
return Binnie.I18N.localise(Botany.instance, name);
return I18N.localise(Botany.instance, name);
}
public ItemStack getStack() {
@@ -1,8 +1,8 @@
package binnie.botany.flower;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.api.EnumFlowerStage;
import binnie.core.util.I18N;
public class ItemPollen extends ItemBotany {
public ItemPollen() {
@@ -16,6 +16,6 @@ public class ItemPollen extends ItemBotany {
@Override
public String getTag() {
return Binnie.I18N.localise(Botany.instance, "item.pollen.tag.name");
return I18N.localise(Botany.instance, "item.pollen.tag.name");
}
}
@@ -1,8 +1,8 @@
package binnie.botany.flower;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.api.EnumFlowerStage;
import binnie.core.util.I18N;
public class ItemSeed extends ItemBotany {
public ItemSeed() {
@@ -16,6 +16,6 @@ public class ItemSeed extends ItemBotany {
@Override
public String getTag() {
return Binnie.I18N.localise(Botany.instance, "item.germling.tag.name");
return I18N.localise(Botany.instance, "item.germling.tag.name");
}
}
@@ -1,6 +1,5 @@
package binnie.botany.gardening;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.api.EnumAcidity;
@@ -53,14 +52,6 @@ public class BlockSoil extends Block implements IBlockSoil {
return acid.ordinal() * 3 + moisture.ordinal();
}
public static String getPH(ItemStack stack) {
return Binnie.I18N.localise(EnumAcidity.values()[stack.getItemDamage() / 3]);
}
public static String getMoisture(ItemStack stack) {
return Binnie.I18N.localise(EnumMoisture.values()[stack.getItemDamage() % 3]);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
@@ -115,10 +106,10 @@ public class BlockSoil extends Block implements IBlockSoil {
EnumAcidity acidity = EnumAcidity.values()[meta / 3];
EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, x, y, z);
if (desiredMoisture.ordinal() > moisture.ordinal()) {
moisture = ((moisture == EnumMoisture.Dry) ? EnumMoisture.Normal : EnumMoisture.Damp);
moisture = ((moisture == EnumMoisture.DRY) ? EnumMoisture.NORMAL : EnumMoisture.DAMP);
}
if (desiredMoisture.ordinal() < moisture.ordinal()) {
moisture = ((moisture == EnumMoisture.Damp) ? EnumMoisture.Normal : EnumMoisture.Dry);
moisture = ((moisture == EnumMoisture.DAMP) ? EnumMoisture.NORMAL : EnumMoisture.DRY);
}
int meta2 = getMeta(acidity, moisture);
if (meta != meta2) {
@@ -70,17 +70,17 @@ public class Gardening {
}
if (bias <= -1.0f) {
return EnumMoisture.Dry;
return EnumMoisture.DRY;
}
return (bias >= 1.0f) ? EnumMoisture.Damp : EnumMoisture.Normal;
return (bias >= 1.0f) ? EnumMoisture.DAMP : EnumMoisture.NORMAL;
}
public static EnumAcidity getNaturalPH(World world, int x, int y, int z) {
float bias = getBiomePH(world.getBiomeGenForCoords(x, z), y);
if (bias <= -1.0f) {
return EnumAcidity.Acid;
return EnumAcidity.ACID;
}
return (bias >= 1.0f) ? EnumAcidity.Alkaline : EnumAcidity.Neutral;
return (bias >= 1.0f) ? EnumAcidity.ALKALINE : EnumAcidity.NEUTRAL;
}
public static float getBiomeMoisture(BiomeGenBase biome, int H) {
@@ -32,21 +32,21 @@ public class ItemSoil extends ItemBlock {
EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3];
String info = "";
if (moisture == EnumMoisture.Dry) {
if (moisture == EnumMoisture.DRY) {
info += EnumChatFormatting.YELLOW + "Dry" + EnumChatFormatting.RESET;
}
if (moisture == EnumMoisture.Damp) {
if (moisture == EnumMoisture.DAMP) {
info += EnumChatFormatting.YELLOW + "Damp" + EnumChatFormatting.RESET;
}
if (acidity == EnumAcidity.Acid) {
if (acidity == EnumAcidity.ACID) {
if (info.length() > 0) {
info += ", ";
}
info += EnumChatFormatting.RED + "Acidic" + EnumChatFormatting.RESET;
}
if (acidity == EnumAcidity.Alkaline) {
if (acidity == EnumAcidity.ALKALINE) {
if (info.length() > 0) {
info += ", ";
}
@@ -1,6 +1,5 @@
package binnie.botany.gardening;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.api.EnumAcidity;
@@ -41,14 +40,14 @@ public class ItemSoilMeter extends Item {
EnumMoisture moisture = soil.getMoisture(world, x, y, z);
EnumAcidity pH = soil.getPH(world, x, y, z);
// TODO remove hardcode strings ans localize
// TODO remove hardcoded strings ans localize
EnumChatFormatting[] colors = new EnumChatFormatting[]{
EnumChatFormatting.DARK_GRAY,
EnumChatFormatting.GOLD,
EnumChatFormatting.LIGHT_PURPLE,
};
String info = "Type: ";
info += colors[type.ordinal()] + Binnie.I18N.localise(type) + EnumChatFormatting.RESET;
info += colors[type.ordinal()] + type.getLocalisedName() + EnumChatFormatting.RESET;
colors = new EnumChatFormatting[]{
EnumChatFormatting.YELLOW,
@@ -56,7 +55,7 @@ public class ItemSoilMeter extends Item {
EnumChatFormatting.BLUE,
};
info += ", Moisture: ";
info += colors[moisture.ordinal()] + Binnie.I18N.localise(moisture) + EnumChatFormatting.RESET;
info += colors[moisture.ordinal()] + moisture.getLocalisedName() + EnumChatFormatting.RESET;
colors = new EnumChatFormatting[]{
EnumChatFormatting.RED,
@@ -64,7 +63,7 @@ public class ItemSoilMeter extends Item {
EnumChatFormatting.AQUA,
};
info += ", pH: ";
info += colors[pH.ordinal()] + Binnie.I18N.localise(pH) + EnumChatFormatting.RESET;
info += colors[pH.ordinal()] + pH.getLocalisedName() + EnumChatFormatting.RESET;
IChatComponent chat = new ChatComponentText(info);
player.addChatMessage(chat);
}
@@ -39,15 +39,9 @@ import java.util.HashMap;
import java.util.Map;
public class ModuleGardening implements IInitializable {
public static HashMap<ItemStack, Integer> queuedAcidFertilisers;
public static HashMap<ItemStack, Integer> queuedAlkalineFertilisers;
public static HashMap<ItemStack, Integer> queuedNutrientFertilisers;
static {
ModuleGardening.queuedAcidFertilisers = new HashMap<>();
ModuleGardening.queuedAlkalineFertilisers = new HashMap<>();
ModuleGardening.queuedNutrientFertilisers = new HashMap<>();
}
public static HashMap<ItemStack, Integer> queuedAcidFertilisers = new HashMap<>();
public static HashMap<ItemStack, Integer> queuedAlkalineFertilisers = new HashMap<>();
public static HashMap<ItemStack, Integer> queuedNutrientFertilisers = new HashMap<>();
@Override
public void preInit() {
@@ -112,15 +106,15 @@ public class ModuleGardening implements IInitializable {
for (boolean manual : new boolean[]{true, false}) {
for (boolean fertilised : new boolean[]{true, false}) {
for (EnumMoisture moist : EnumMoisture.values()) {
ItemStack icon = (moist == EnumMoisture.Dry) ? yellow : ((moist == EnumMoisture.Normal) ? red : blue);
ItemStack icon = (moist == EnumMoisture.DRY) ? yellow : ((moist == EnumMoisture.NORMAL) ? red : blue);
int insulate = 2 - moist.ordinal();
if (fertilised) {
insulate += 3;
}
new CircuitGarden(moist, null, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 0 + 128 * insulate), icon);
new CircuitGarden(moist, EnumAcidity.Acid, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 1 + 128 * insulate), icon);
new CircuitGarden(moist, EnumAcidity.Neutral, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 2 + 128 * insulate), icon);
new CircuitGarden(moist, EnumAcidity.Alkaline, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 3 + 128 * insulate), icon);
new CircuitGarden(moist, EnumAcidity.ACID, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 1 + 128 * insulate), icon);
new CircuitGarden(moist, EnumAcidity.NEUTRAL, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 2 + 128 * insulate), icon);
new CircuitGarden(moist, EnumAcidity.ALKALINE, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 3 + 128 * insulate), icon);
}
}
}
@@ -102,8 +102,8 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
FlowerSpecies(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor primaryColor, EnumFlowerColor secondaryColor) {
stemColor = EnumFlowerColor.Green;
temperature = EnumTemperature.NORMAL;
pH = EnumAcidity.Neutral;
moisture = EnumMoisture.Normal;
pH = EnumAcidity.NEUTRAL;
moisture = EnumMoisture.NORMAL;
tempTolerance = EnumTolerance.BOTH_1;
pHTolerance = EnumTolerance.NONE;
moistureTolerance = EnumTolerance.NONE;
@@ -164,139 +164,139 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
FlowerSpecies.Penstemon.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Low);
FlowerSpecies.Delphinium.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Longer, ForestryAllele.Sappiness.Low);
FlowerSpecies.Hollyhock.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.High);
FlowerSpecies.Dandelion.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Dandelion.setMoisture(EnumMoisture.Normal, EnumTolerance.BOTH_1);
FlowerSpecies.Poppy.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Poppy.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Dandelion.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Dandelion.setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1);
FlowerSpecies.Poppy.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Poppy.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Poppy.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2);
FlowerSpecies.Orchid.setPH(EnumAcidity.Acid, EnumTolerance.NONE);
FlowerSpecies.Orchid.setMoisture(EnumMoisture.Normal, EnumTolerance.BOTH_1);
FlowerSpecies.Allium.setPH(EnumAcidity.Alkaline, EnumTolerance.DOWN_1);
FlowerSpecies.Allium.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Bluet.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Bluet.setMoisture(EnumMoisture.Damp, EnumTolerance.NONE);
FlowerSpecies.Tulip.setMoisture(EnumMoisture.Normal, EnumTolerance.BOTH_1);
FlowerSpecies.Daisy.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Daisy.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Orchid.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Orchid.setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1);
FlowerSpecies.Allium.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Allium.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Bluet.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Bluet.setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE);
FlowerSpecies.Tulip.setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1);
FlowerSpecies.Daisy.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Daisy.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Daisy.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2);
FlowerSpecies.Cornflower.setMutation(FlowerSpecies.Dandelion, FlowerSpecies.Tulip, 10);
FlowerSpecies.Cornflower.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Cornflower.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Pansy.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Viola, 5);
FlowerSpecies.Pansy.setPH(EnumAcidity.Acid, EnumTolerance.NONE);
FlowerSpecies.Pansy.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Pansy.setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1);
FlowerSpecies.Iris.setMutation(FlowerSpecies.Orchid, FlowerSpecies.Viola, 10);
FlowerSpecies.Iris.setPH(EnumAcidity.Acid, EnumTolerance.NONE);
FlowerSpecies.Iris.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Iris.setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1);
FlowerSpecies.Lavender.setMutation(FlowerSpecies.Allium, FlowerSpecies.Viola, 10);
FlowerSpecies.Lavender.setPH(EnumAcidity.Neutral, EnumTolerance.UP_1);
FlowerSpecies.Lavender.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Lavender.setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1);
FlowerSpecies.Lavender.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Lavender.setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1);
FlowerSpecies.Viola.setMutation(FlowerSpecies.Orchid, FlowerSpecies.Poppy, 15);
FlowerSpecies.Viola.setPH(EnumAcidity.Acid, EnumTolerance.NONE);
FlowerSpecies.Viola.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Viola.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Viola.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Daffodil.setMutation(FlowerSpecies.Dandelion, FlowerSpecies.Poppy, 10);
FlowerSpecies.Daffodil.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Daffodil.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Aster.setMutation(FlowerSpecies.Daisy, FlowerSpecies.Tulip, 10);
FlowerSpecies.Aster.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Lilac.setPH(EnumAcidity.Alkaline, EnumTolerance.DOWN_1);
FlowerSpecies.Rose.setPH(EnumAcidity.Acid, EnumTolerance.UP_1);
FlowerSpecies.Peony.setPH(EnumAcidity.Alkaline, EnumTolerance.DOWN_1);
FlowerSpecies.Peony.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Aster.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Lilac.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Rose.setPH(EnumAcidity.ACID, EnumTolerance.UP_1);
FlowerSpecies.Peony.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Peony.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Marigold.setMutation(FlowerSpecies.Daisy, FlowerSpecies.Dandelion, 10);
FlowerSpecies.Marigold.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Marigold.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Marigold.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Marigold.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Marigold.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2);
FlowerSpecies.Hydrangea.setMutation(FlowerSpecies.Peony, FlowerSpecies.Bluet, 10);
FlowerSpecies.Hydrangea.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Hydrangea.setMoisture(EnumMoisture.Damp, EnumTolerance.NONE);
FlowerSpecies.Hydrangea.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Hydrangea.setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE);
FlowerSpecies.Foxglove.setMutation(FlowerSpecies.Lilac, FlowerSpecies.Zinnia, 5);
FlowerSpecies.Foxglove.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Foxglove.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Foxglove.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Foxglove.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Dahlia.setMutation(FlowerSpecies.Daisy, FlowerSpecies.Allium, 15);
FlowerSpecies.Dahlia.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Dahlia.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Dahlia.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Dahlia.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Dahlia.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2);
FlowerSpecies.Chrysanthemum.setMutation(FlowerSpecies.Geranium, FlowerSpecies.Rose, 10);
FlowerSpecies.Chrysanthemum.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Chrysanthemum.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Chrysanthemum.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Chrysanthemum.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Carnation.setMutation(FlowerSpecies.Dianthus, FlowerSpecies.Rose, 5);
FlowerSpecies.Carnation.setPH(EnumAcidity.Alkaline, EnumTolerance.DOWN_1);
FlowerSpecies.Carnation.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Zinnia.setMutation(FlowerSpecies.Dahlia, FlowerSpecies.Marigold, 5);
FlowerSpecies.Zinnia.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Zinnia.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Zinnia.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Zinnia.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Zinnia.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2);
FlowerSpecies.Primrose.setMutation(FlowerSpecies.Chrysanthemum, FlowerSpecies.Auricula, 5);
FlowerSpecies.Primrose.setPH(EnumAcidity.Acid, EnumTolerance.UP_1);
FlowerSpecies.Primrose.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Primrose.setPH(EnumAcidity.ACID, EnumTolerance.UP_1);
FlowerSpecies.Primrose.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Azalea.setMutation(FlowerSpecies.Orchid, FlowerSpecies.Geranium, 5);
FlowerSpecies.Azalea.setPH(EnumAcidity.Acid, EnumTolerance.NONE);
FlowerSpecies.Azalea.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Geranium.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Orchid, 15);
FlowerSpecies.Geranium.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Geranium.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Geranium.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1);
FlowerSpecies.Lily.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Chrysanthemum, 5);
FlowerSpecies.Lily.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Lily.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Lily.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1);
FlowerSpecies.Yarrow.setMutation(FlowerSpecies.Dandelion, FlowerSpecies.Orchid, 10);
FlowerSpecies.Yarrow.setPH(EnumAcidity.Acid, EnumTolerance.UP_1);
FlowerSpecies.Yarrow.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Yarrow.setPH(EnumAcidity.ACID, EnumTolerance.UP_1);
FlowerSpecies.Yarrow.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Petunia.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Dahlia, 5);
FlowerSpecies.Petunia.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Petunia.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Petunia.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Petunia.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Petunia.setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1);
FlowerSpecies.Agapanthus.setMutation(FlowerSpecies.Allium, FlowerSpecies.Geranium, 5);
FlowerSpecies.Agapanthus.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Agapanthus.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Agapanthus.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Agapanthus.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Agapanthus.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1);
FlowerSpecies.Fuchsia.setMutation(FlowerSpecies.Foxglove, FlowerSpecies.Dahlia, 5);
FlowerSpecies.Fuchsia.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Fuchsia.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Fuchsia.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Fuchsia.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Fuchsia.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1);
FlowerSpecies.Dianthus.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Poppy, 15);
FlowerSpecies.Dianthus.setPH(EnumAcidity.Alkaline, EnumTolerance.DOWN_1);
FlowerSpecies.Dianthus.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Dianthus.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Dianthus.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Dianthus.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2);
FlowerSpecies.Forget.setMutation(FlowerSpecies.Orchid, FlowerSpecies.Bluet, 10);
FlowerSpecies.Forget.setPH(EnumAcidity.Acid, EnumTolerance.NONE);
FlowerSpecies.Forget.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Forget.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Forget.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Forget.setTemperature(EnumTemperature.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Anemone.setMutation(FlowerSpecies.Aquilegia, FlowerSpecies.Rose, 5);
FlowerSpecies.Anemone.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Anemone.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Anemone.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Anemone.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Aquilegia.setMutation(FlowerSpecies.Iris, FlowerSpecies.Poppy, 5);
FlowerSpecies.Aquilegia.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Aquilegia.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Edelweiss.setMutation(FlowerSpecies.Peony, FlowerSpecies.Bluet, 5);
FlowerSpecies.Edelweiss.setPH(EnumAcidity.Alkaline, EnumTolerance.DOWN_1);
FlowerSpecies.Edelweiss.setMoisture(EnumMoisture.Normal, EnumTolerance.DOWN_1);
FlowerSpecies.Edelweiss.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Edelweiss.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Edelweiss.setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Scabious.setMutation(FlowerSpecies.Allium, FlowerSpecies.Cornflower, 5);
FlowerSpecies.Scabious.setPH(EnumAcidity.Neutral, EnumTolerance.UP_1);
FlowerSpecies.Scabious.setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1);
FlowerSpecies.Scabious.setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Coneflower.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Cornflower, 5);
FlowerSpecies.Coneflower.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Coneflower.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Gaillardia.setMutation(FlowerSpecies.Dandelion, FlowerSpecies.Marigold, 5);
FlowerSpecies.Gaillardia.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Gaillardia.setMoisture(EnumMoisture.Damp, EnumTolerance.DOWN_1);
FlowerSpecies.Gaillardia.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Gaillardia.setMoisture(EnumMoisture.DAMP, EnumTolerance.DOWN_1);
FlowerSpecies.Gaillardia.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2);
FlowerSpecies.Auricula.setMutation(FlowerSpecies.Poppy, FlowerSpecies.Geranium, 10);
FlowerSpecies.Auricula.setPH(EnumAcidity.Acid, EnumTolerance.UP_1);
FlowerSpecies.Auricula.setMoisture(EnumMoisture.Normal, EnumTolerance.UP_1);
FlowerSpecies.Auricula.setPH(EnumAcidity.ACID, EnumTolerance.UP_1);
FlowerSpecies.Auricula.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Camellia.setMutation(FlowerSpecies.Hydrangea, FlowerSpecies.Rose, 5);
FlowerSpecies.Camellia.setPH(EnumAcidity.Acid, EnumTolerance.NONE);
FlowerSpecies.Camellia.setMoisture(EnumMoisture.Damp, EnumTolerance.NONE);
FlowerSpecies.Camellia.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Camellia.setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE);
FlowerSpecies.Camellia.setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1);
FlowerSpecies.Goldenrod.setMutation(FlowerSpecies.Lilac, FlowerSpecies.Marigold, 10);
FlowerSpecies.Goldenrod.setPH(EnumAcidity.Neutral, EnumTolerance.BOTH_1);
FlowerSpecies.Goldenrod.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Althea.setMutation(FlowerSpecies.Hydrangea, FlowerSpecies.Iris, 5);
FlowerSpecies.Althea.setPH(EnumAcidity.Neutral, EnumTolerance.DOWN_1);
FlowerSpecies.Althea.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Althea.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1);
FlowerSpecies.Penstemon.setMutation(FlowerSpecies.Peony, FlowerSpecies.Lilac, 5);
FlowerSpecies.Penstemon.setMoisture(EnumMoisture.Dry, EnumTolerance.UP_1);
FlowerSpecies.Penstemon.setMoisture(EnumMoisture.DRY, EnumTolerance.UP_1);
FlowerSpecies.Penstemon.setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1);
FlowerSpecies.Delphinium.setMutation(FlowerSpecies.Lilac, FlowerSpecies.Bluet, 5);
FlowerSpecies.Delphinium.setMoisture(EnumMoisture.Damp, EnumTolerance.DOWN_1);
FlowerSpecies.Delphinium.setMoisture(EnumMoisture.DAMP, EnumTolerance.DOWN_1);
FlowerSpecies.Delphinium.setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Hollyhock.setMutation(FlowerSpecies.Delphinium, FlowerSpecies.Lavender, 5);
FlowerSpecies.Hollyhock.setPH(EnumAcidity.Neutral, EnumTolerance.UP_1);
FlowerSpecies.Hollyhock.setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1);
FlowerSpecies.Dandelion.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Poppy.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Orchid.setStemColor(EnumFlowerColor.Green);
@@ -1,9 +1,9 @@
package binnie.botany.items;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -37,7 +37,7 @@ public class ItemClay extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
return Binnie.I18N.localise(Botany.instance, "item.clay.name");
return I18N.localise(Botany.instance, "item.clay.name");
}
@Override
@@ -1,9 +1,9 @@
package binnie.botany.items;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -37,7 +37,7 @@ public class ItemPigment extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
return Binnie.I18N.localise(Botany.instance, "item.pigment.name");
return I18N.localise(Botany.instance, "item.pigment.name");
}
@Override
@@ -1,7 +1,7 @@
package binnie.core.circuits;
import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.util.I18N;
import forestry.api.circuits.ChipsetManager;
import forestry.api.circuits.CircuitSocketType;
import forestry.api.circuits.ICircuitLayout;
@@ -24,12 +24,12 @@ public class BinnieCircuitLayout implements ICircuitLayout {
@Override
public String getName() {
return Binnie.I18N.localise(mod, "circuit.layout." + uid.toLowerCase());
return I18N.localise(mod, "circuit.layout." + uid.toLowerCase());
}
@Override
public String getUsage() {
return Binnie.I18N.localise(mod, "circuit.layout." + uid.toLowerCase() + ".usage");
return I18N.localise(mod, "circuit.layout." + uid.toLowerCase() + ".usage");
}
@Override
@@ -20,6 +20,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.craftgui.resource.minecraft.PaddedTexture;
import binnie.core.craftgui.resource.minecraft.StandardTexture;
import binnie.core.machines.inventory.SlotValidator;
import binnie.core.util.I18N;
import binnie.extrabees.core.ExtraBeeTexture;
import binnie.extrabees.gui.punnett.ExtraBeeGUITexture;
import binnie.genetics.gui.ControlChromosome;
@@ -194,8 +195,8 @@ public class WindowFieldKit extends Window {
List<String> infos = new ArrayList<>();
int i = 0;
for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; Binnie.I18N.canLocalise(pref + i); ++i) {
infos.add(Binnie.I18N.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);
@@ -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.I18N.localise(mod, "gui.database.tab." + unloc);
return I18N.localise(mod, "gui.database.tab." + unloc);
}
@Override
public void getHelpTooltip(Tooltip tooltip) {
tooltip.add(Binnie.I18N.localiseOrBlank(mod, "gui.database.tab." + unloc + ".help"));
tooltip.add(I18N.localiseOrBlank(mod, "gui.database.tab." + unloc + ".help"));
}
}
@@ -2,6 +2,7 @@ package binnie.core.genetics;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import binnie.extrabees.ExtraBees;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
@@ -56,16 +57,16 @@ class BeeBreedingSystem extends BreedingSystem {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (chromosome == EnumBeeChromosome.FERTILITY) {
if (allele.getUID().contains("Low")) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.low");
return I18N.localise(BinnieCore.instance, "allele.fertility.low");
}
if (allele.getUID().contains("Normal")) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.normal");
return I18N.localise(BinnieCore.instance, "allele.fertility.normal");
}
if (allele.getUID().contains("High")) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.high");
return I18N.localise(BinnieCore.instance, "allele.fertility.high");
}
if (allele.getUID().contains("Maximum")) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
return I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
}
}
return super.getAlleleName(chromosome, allele);
@@ -3,6 +3,7 @@ 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;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -421,11 +422,11 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (allele instanceof IAlleleBoolean) {
return ((IAlleleBoolean) allele).getValue() ?
Binnie.I18N.localise(BinnieCore.instance, "allele.true") :
Binnie.I18N.localise(BinnieCore.instance, "allele.false");
I18N.localise(BinnieCore.instance, "allele.true") :
I18N.localise(BinnieCore.instance, "allele.false");
}
if (allele.getName() == "for.gui.maximum") {
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
if (allele.getName().equals("for.gui.maximum")) {
return I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
}
return allele.getName();
}
@@ -1,7 +1,7 @@
package binnie.core.genetics;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
public enum EnumBeeModifier {
Territory,
@@ -12,6 +12,6 @@ public enum EnumBeeModifier {
GeneticDecay;
public String getName() {
return Binnie.I18N.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase());
return I18N.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase());
}
}
@@ -8,6 +8,7 @@ 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 forestry.api.genetics.IAllele;
import forestry.api.genetics.IBreedingTracker;
@@ -50,16 +51,16 @@ class FlowerBreedingSystem extends BreedingSystem {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (chromosome == EnumFlowerChromosome.FERTILITY) {
if (allele.getUID().contains("Low")) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.low");
return I18N.localise(BinnieCore.instance, "allele.fertility.low");
}
if (allele.getUID().contains("Normal")) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.normal");
return I18N.localise(BinnieCore.instance, "allele.fertility.normal");
}
if (allele.getUID().contains("High")) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.high");
return I18N.localise(BinnieCore.instance, "allele.fertility.high");
}
if (allele.getUID().contains("Maximum")) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
return I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
}
}
return super.getAlleleName(chromosome, allele);
@@ -1,7 +1,7 @@
package binnie.core.genetics;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IClassification;
@@ -35,7 +35,7 @@ interface IBreedingMessage {
@Override
public String getTitle() {
return Binnie.I18N.localise(BinnieCore.instance, "gui.breedingmessage.species");
return I18N.localise(BinnieCore.instance, "gui.breedingmessage.species");
}
@Override
@@ -70,7 +70,7 @@ interface IBreedingMessage {
@Override
public String getTitle() {
return Binnie.I18N.localise(BinnieCore.instance, "gui.breedingmessage.branch");
return I18N.localise(BinnieCore.instance, "gui.breedingmessage.branch");
}
@Override
@@ -95,7 +95,7 @@ interface IBreedingMessage {
@Override
public String getTitle() {
return Binnie.I18N.localise(BinnieCore.instance, "gui.breedingmessage.epithet");
return I18N.localise(BinnieCore.instance, "gui.breedingmessage.epithet");
}
@Override
@@ -2,6 +2,7 @@ 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;
import forestry.api.genetics.IAlleleInteger;
@@ -49,24 +50,24 @@ class MothBreedingSystem extends BreedingSystem {
if (chromosome == EnumButterflyChromosome.METABOLISM) {
int metabolism = ((IAlleleInteger) allele).getValue();
if (metabolism >= 19) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.highest");
return I18N.localise(BinnieCore.instance, "allele.metabolism.highest");
}
if (metabolism >= 16) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.higher");
return I18N.localise(BinnieCore.instance, "allele.metabolism.higher");
}
if (metabolism >= 13) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.high");
return I18N.localise(BinnieCore.instance, "allele.metabolism.high");
}
if (metabolism >= 10) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.normal");
return I18N.localise(BinnieCore.instance, "allele.metabolism.normal");
}
if (metabolism >= 7) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.slow");
return I18N.localise(BinnieCore.instance, "allele.metabolism.slow");
}
if (metabolism >= 4) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.slower");
return I18N.localise(BinnieCore.instance, "allele.metabolism.slower");
}
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.slowest");
return I18N.localise(BinnieCore.instance, "allele.metabolism.slowest");
}
if (chromosome == EnumButterflyChromosome.FERTILITY) {
return ((IAlleleInteger) allele).getValue() + "x";
@@ -2,6 +2,7 @@ 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;
import binnie.extratrees.FakeWorld;
@@ -87,24 +88,24 @@ public class TreeBreedingSystem extends BreedingSystem {
if (chromosome == EnumTreeChromosome.PLANT) {
EnumSet<EnumPlantType> types = ((IAllelePlantType) allele).getPlantTypes();
return types.isEmpty() ?
Binnie.I18N.localise(BinnieCore.instance, "allele.none") :
types.iterator().next().toString();
return types.isEmpty()
? I18N.localise(BinnieCore.instance, "allele.none")
: types.iterator().next().toString();
}
if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) {
IFruitProvider provider = ((IAlleleFruit) allele).getProvider();
return (provider.getProducts().length == 0) ?
Binnie.I18N.localise(BinnieCore.instance, "allele.none") :
provider.getProducts()[0].getDisplayName();
return (provider.getProducts().length == 0)
? I18N.localise(BinnieCore.instance, "allele.none")
: provider.getProducts()[0].getDisplayName();
}
if (chromosome == EnumTreeChromosome.GROWTH) {
if (allele.getUID().contains("Tropical")) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.growth.tropical");
return I18N.localise(BinnieCore.instance, "allele.growth.tropical");
}
if (allele.getUID().contains("Lightlevel")) {
return Binnie.I18N.localise(BinnieCore.instance, "allele.growth.lightlevel");
return I18N.localise(BinnieCore.instance, "allele.growth.lightlevel");
}
}
return super.getAlleleName(chromosome, allele);
@@ -1,57 +0,0 @@
package binnie.core.language;
import binnie.core.AbstractMod;
import binnie.core.ManagerBase;
import net.minecraft.util.StatCollector;
import java.util.HashMap;
import java.util.Map;
public class ManagerLanguage extends ManagerBase {
private Map<Object, String> objNames;
public ManagerLanguage() {
objNames = new HashMap<>();
}
public void addObjectName(Object obj, String name) {
objNames.put(obj, name);
}
public String unlocalised(AbstractMod mod, String id) {
return mod.getModID() + "." + id;
}
public String localise(Object key) {
String loc = StatCollector.translateToLocal(key.toString());
if (loc.equals(key.toString())) {
if (objNames.containsKey(key)) {
return localise(objNames.get(key));
}
return key.toString();
}
return loc;
}
public String localise(AbstractMod mod, String id) {
return localise(unlocalised(mod, id));
}
public String localiseOrBlank(AbstractMod mod, String id) {
return localiseOrBlank(unlocalised(mod, id));
}
public String localise(AbstractMod mod, String id, Object... objs) {
return String.format(localise(mod, id), objs);
}
public String localiseOrBlank(Object key) {
String trans = localise(key);
return trans.equals(key) ? "" : trans;
}
public boolean canLocalise(Object key) {
String trans = localise(key);
return !trans.equals(key);
}
}
@@ -1,6 +1,6 @@
package binnie.core.machines;
import binnie.Binnie;
import binnie.core.util.I18N;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.tileentity.TileEntity;
@@ -27,7 +27,7 @@ public abstract class MachinePackage {
public abstract TileEntity createTileEntity();
public String getDisplayName() {
return Binnie.I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID());
return I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID());
}
public Integer getMetadata() {
@@ -57,6 +57,6 @@ public abstract class MachinePackage {
}
public String getInformation() {
return Binnie.I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID() + ".info");
return I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID() + ".info");
}
}
@@ -1,7 +1,7 @@
package binnie.core.machines.inventory;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -92,7 +92,7 @@ public class InventorySlot extends BaseSlot<ItemStack> {
@Override
public String getName() {
return Binnie.I18N.localise(BinnieCore.instance, "gui.slot." + unlocName);
return I18N.localise(BinnieCore.instance, "gui.slot." + unlocName);
}
public enum Type {
@@ -1,7 +1,7 @@
package binnie.core.machines.inventory;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
@@ -48,6 +48,6 @@ public class TankSlot extends BaseSlot<FluidStack> {
@Override
public String getName() {
return Binnie.I18N.localise(BinnieCore.instance, "gui.slot." + unlocName);
return I18N.localise(BinnieCore.instance, "gui.slot." + unlocName);
}
}
@@ -1,10 +1,10 @@
package binnie.core.proxy;
import binnie.Binnie;
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;
@@ -60,10 +60,10 @@ public class BinnieModProxy implements IBinnieModProxy {
}
public String localise(String string) {
return Binnie.I18N.localise(mod, string);
return I18N.localise(mod, string);
}
public String localiseOrBlank(String string) {
return Binnie.I18N.localiseOrBlank(mod, string);
return I18N.localiseOrBlank(mod, string);
}
}
+35
View File
@@ -0,0 +1,35 @@
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());
}
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 localiseOrBlank(String key) {
String trans = localise(key);
return trans.equals(key) ? "" : trans;
}
public static boolean canLocalise(String key) {
return !localise(key).equals(key);
}
}
@@ -115,15 +115,11 @@ public class FakeWorld extends World {
/**
* Creating objects without calling constructors.
*/
public static <T> T create(Class<T> clazz,
Class<? super T> parent) {
public static <T> T create(Class<T> clazz, Class<? super T> parent) {
try {
ReflectionFactory rf =
ReflectionFactory.getReflectionFactory();
ReflectionFactory rf = ReflectionFactory.getReflectionFactory();
Constructor objDef = parent.getDeclaredConstructor();
Constructor intConstr = rf.newConstructorForSerialization(
clazz, objDef
);
Constructor intConstr = rf.newConstructorForSerialization(clazz, objDef);
return clazz.cast(intConstr.newInstance());
} catch (RuntimeException e) {
throw e;
@@ -1,6 +1,6 @@
package binnie.extratrees.alcohol;
import binnie.Binnie;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
@@ -41,7 +41,7 @@ public enum Glassware {
if (liquid == null) {
return ExtraTrees.proxy.localise("item.glassware." + name().toLowerCase());
}
return Binnie.I18N.localise(ExtraTrees.instance, "item.glassware." + name().toLowerCase() + ".usage", liquid);
return I18N.localise(ExtraTrees.instance, "item.glassware." + name().toLowerCase() + ".usage", liquid);
}
public int getCapacity() {
@@ -1,9 +1,9 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -194,9 +194,9 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
String typeName = getDoorType(meta).getName();
String woodName = WoodManager.getPlankType(meta & 0xFF).getName();
if (typeName.equals("")) {
return Binnie.I18N.localise(ExtraTrees.instance, "block.door.name", woodName);
return I18N.localise(ExtraTrees.instance, "block.door.name", woodName);
}
return Binnie.I18N.localise(ExtraTrees.instance, "block.door.name.adv", woodName, typeName);
return I18N.localise(ExtraTrees.instance, "block.door.name.adv", woodName, typeName);
}
@Override
@@ -1,9 +1,9 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -129,7 +129,7 @@ public class BlockETLog extends BlockLog implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.log.name", ILogType.ExtraTreeLog.values()[meta].getName());
return I18N.localise(ExtraTrees.instance, "block.log.name", ILogType.ExtraTreeLog.values()[meta].getName());
}
@Override
@@ -1,9 +1,9 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -74,7 +74,7 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName());
return I18N.localise(ExtraTrees.instance, "block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName());
}
@Override
@@ -1,9 +1,9 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -82,7 +82,7 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName());
return I18N.localise(ExtraTrees.instance, "block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName());
}
@Override
@@ -1,9 +1,9 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -106,7 +106,7 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName());
return I18N.localise(ExtraTrees.instance, "block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName());
}
@Override
@@ -1,10 +1,10 @@
package binnie.extratrees.block.decor;
import binnie.Binnie;
import binnie.core.Mods;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.IFenceProvider;
import binnie.extratrees.block.PlankType;
@@ -121,7 +121,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodfence.name", getDescription(meta).getPlankType().getName());
return I18N.localise(ExtraTrees.instance, "block.woodfence.name", getDescription(meta).getPlankType().getName());
}
@Override
@@ -1,9 +1,9 @@
package binnie.extratrees.block.decor;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.WoodManager;
@@ -104,7 +104,7 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName());
return I18N.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName());
}
@Override
@@ -1,8 +1,8 @@
package binnie.extratrees.block.decor;
import binnie.Binnie;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.PlankType;
@@ -40,6 +40,6 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata {
IPlankType type2 = getDescription(meta).getSecondaryPlankType();
boolean twoTypes = type1 != type2;
FenceType type3 = getDescription(meta).getFenceType();
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName());
return I18N.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName());
}
}
@@ -1,6 +1,6 @@
package binnie.extratrees.carpentry;
import binnie.Binnie;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.block.PlankType;
@@ -26,7 +26,7 @@ public class BlockCarpentry extends BlockDesign {
@Override
public String getBlockName(DesignBlock design) {
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName());
return I18N.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName());
}
}
@@ -1,8 +1,8 @@
package binnie.extratrees.carpentry;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -85,7 +85,7 @@ public class BlockCarpentryPanel extends BlockCarpentry {
@Override
public String getBlockName(ItemStack stack) {
DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName());
return I18N.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName());
}
@Override
@@ -1,7 +1,7 @@
package binnie.extratrees.carpentry;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IDesign;
import cpw.mods.fml.relauncher.Side;
@@ -59,6 +59,6 @@ public class BlockStainedDesign extends BlockDesign {
@Override
public String getBlockName(DesignBlock design) {
return Binnie.I18N.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName());
return I18N.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName());
}
}
@@ -1,6 +1,5 @@
package binnie.extratrees.craftgui.dictionary;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
@@ -16,6 +15,7 @@ import binnie.core.craftgui.geometry.IPoint;
import binnie.core.craftgui.minecraft.Window;
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;
@@ -144,7 +144,7 @@ public class ControlTileSelect extends Control implements IControlValue<IDesign>
@Override
public void getTooltip(Tooltip tooltip) {
tooltip.add(Binnie.I18N.localise(BinnieCore.instance, "gui.designer.pattern", getValue().getName()));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.designer.pattern", getValue().getName()));
}
@Override
@@ -1,6 +1,5 @@
package binnie.genetics.gui;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.api.EnumAcidity;
import binnie.botany.api.EnumMoisture;
@@ -24,7 +23,7 @@ import java.util.List;
public class AnalystPageSoil extends ControlAnalystPage {
public AnalystPageSoil(IWidget parent, IArea area, IFlower flower) {
super(parent, area);
setColor(6697728);
setColor(0x663300);
EnumMoisture moisture = flower.getGenome().getPrimary().getMoisture();
EnumTolerance moistureTol = flower.getGenome().getToleranceMoisture();
EnumAcidity pH = flower.getGenome().getPrimary().getPH();
@@ -42,40 +41,40 @@ public class AnalystPageSoil extends ControlAnalystPage {
y += 16;
new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Recommended Soil", TextJustification.MiddleCenter).setColor(getColor());
y += 12;
EnumMoisture recomMoisture = EnumMoisture.Normal;
boolean canTolNormal = Tolerance.canTolerate(moisture, EnumMoisture.Normal, moistureTol);
boolean canTolDamp = Tolerance.canTolerate(moisture, EnumMoisture.Damp, moistureTol);
boolean canTolDry = Tolerance.canTolerate(moisture, EnumMoisture.Dry, moistureTol);
EnumMoisture recomMoisture = EnumMoisture.NORMAL;
boolean canTolNormal = Tolerance.canTolerate(moisture, EnumMoisture.NORMAL, moistureTol);
boolean canTolDamp = Tolerance.canTolerate(moisture, EnumMoisture.DAMP, moistureTol);
boolean canTolDry = Tolerance.canTolerate(moisture, EnumMoisture.DRY, moistureTol);
if (canTolNormal) {
if (canTolDamp && !canTolDry) {
recomMoisture = EnumMoisture.Damp;
recomMoisture = EnumMoisture.DAMP;
} else if (canTolDry && !canTolDamp) {
recomMoisture = EnumMoisture.Dry;
recomMoisture = EnumMoisture.DRY;
}
} else {
if (canTolDamp) {
recomMoisture = EnumMoisture.Damp;
recomMoisture = EnumMoisture.DAMP;
}
if (canTolDry) {
recomMoisture = EnumMoisture.Dry;
recomMoisture = EnumMoisture.DRY;
}
}
EnumAcidity recomPH = EnumAcidity.Neutral;
boolean canTolNeutral = Tolerance.canTolerate(pH, EnumAcidity.Neutral, pHTol);
boolean canTolAcid = Tolerance.canTolerate(pH, EnumAcidity.Acid, pHTol);
boolean canTolAlkaline = Tolerance.canTolerate(pH, EnumAcidity.Alkaline, pHTol);
EnumAcidity recomPH = EnumAcidity.NEUTRAL;
boolean canTolNeutral = Tolerance.canTolerate(pH, EnumAcidity.NEUTRAL, pHTol);
boolean canTolAcid = Tolerance.canTolerate(pH, EnumAcidity.ACID, pHTol);
boolean canTolAlkaline = Tolerance.canTolerate(pH, EnumAcidity.ALKALINE, pHTol);
if (canTolNeutral) {
if (canTolAcid && !canTolAlkaline) {
recomPH = EnumAcidity.Acid;
recomPH = EnumAcidity.ACID;
} else if (canTolAlkaline && !canTolAcid) {
recomPH = EnumAcidity.Alkaline;
recomPH = EnumAcidity.ALKALINE;
}
} else {
if (canTolAcid) {
recomPH = EnumAcidity.Acid;
recomPH = EnumAcidity.ACID;
}
if (canTolAlkaline) {
recomPH = EnumAcidity.Alkaline;
recomPH = EnumAcidity.ALKALINE;
}
}
ItemStack stack = new ItemStack(Botany.soil, 1, BlockSoil.getMeta(recomPH, recomMoisture));
@@ -86,8 +85,8 @@ public class AnalystPageSoil extends ControlAnalystPage {
new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Other Soils", TextJustification.MiddleCenter).setColor(getColor());
y += 12;
List<ItemStack> stacks = new ArrayList<ItemStack>();
for (EnumAcidity a : EnumSet.range(EnumAcidity.Acid, EnumAcidity.Alkaline)) {
for (EnumMoisture b : EnumSet.range(EnumMoisture.Dry, EnumMoisture.Damp)) {
for (EnumAcidity a : EnumSet.range(EnumAcidity.ACID, EnumAcidity.ALKALINE)) {
for (EnumMoisture b : EnumSet.range(EnumMoisture.DRY, EnumMoisture.DAMP)) {
if (Tolerance.canTolerate(pH, a, pHTol) && Tolerance.canTolerate(moisture, b, moistureTol) && (a != recomPH || b != recomMoisture)) {
stacks.add(new ItemStack(Botany.soil, 1, BlockSoil.getMeta(a, b)));
}
@@ -107,7 +106,7 @@ public class AnalystPageSoil extends ControlAnalystPage {
new ControlToleranceBar<EnumMoisture>(parent, x, y, w, h, EnumMoisture.class) {
@Override
protected String getName(EnumMoisture value) {
return Binnie.I18N.localise(value);
return value.getLocalisedName();
}
@Override
@@ -121,12 +120,12 @@ public class AnalystPageSoil extends ControlAnalystPage {
new ControlToleranceBar<EnumAcidity>(parent, x, y, w, h, EnumAcidity.class) {
@Override
protected String getName(EnumAcidity value) {
return Binnie.I18N.localise(value);
return value.getLocalisedName();
}
@Override
protected int getColour(EnumAcidity value) {
return (new int[]{16711782, 65280, 26367})[value.ordinal()];
return (new int[]{0xff0066, 0x00ff00, 0x0066ff})[value.ordinal()];
}
}.setValues(value, tol);
}