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

@@ -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) {