Merge pull request #113 from KorDum/feature/refatoring

[1.7.10] Added some localization
This commit is contained in:
Alexander Kornilov authored and GitHub committed 2017-06-11 11:43:10 +03:00
commit 43211303bb
41 files changed
+244 -596

No files matched your search

-40
View File
@@ -20,18 +20,6 @@ import mods.nei.NEI;
# DATABASES
# Arborist Database
NEI.overrideName(<ExtraTrees:database:0>,"База данных лесовода");
<ExtraTrees:database:0>.addTooltip(format.darkGreen("Arborist Database"));
# Master Arborist Database
NEI.overrideName(<ExtraTrees:database:1>,"База данных лесовода-мастера");
<ExtraTrees:database:1>.addTooltip(format.darkGreen("Master Arborist Database"));
# Lepidopterist Database
NEI.overrideName(<ExtraTrees:databaseMoth:0>,"База данных бабочковеда");
<ExtraTrees:databaseMoth:0>.addTooltip(format.darkGreen("Lepidopterist Database"));
# Master Lepidopterist Database
NEI.overrideName(<ExtraTrees:databaseMoth:1>,"База данных бабочковеда-мастера");
<ExtraTrees:databaseMoth:1>.addTooltip(format.darkGreen("Master Lepidopterist Database"));
# Gene Database
NEI.overrideName(<Genetics:database:0>,"Генная база данных");
<Genetics:database:0>.addTooltip(format.darkGreen("Gene Database"));
@@ -48,34 +36,6 @@ NEI.overrideName(<Genetics:masterRegistry:0>,"Картотека мастера"
NEI.overrideName(<Genetics:analyst:0>,"Аналитик");
<Genetics:analyst:0>.addTooltip(format.darkGreen("Analyst"));
# FLUIDS
NEI.overrideName(<BinnieCore:containerCan:128>,"Банка живицы");
NEI.overrideName(<BinnieCore:containerCapsule:128>,"Капсула живицы");
NEI.overrideName(<BinnieCore:containerBucket:128>,"Ведро живицы");
NEI.overrideName(<BinnieCore:containerCylinder:128>,"Баллон живицы");
NEI.overrideName(<BinnieCore:containerCan:129>,"Банка смолы");
NEI.overrideName(<BinnieCore:containerCapsule:129>,"Капсула смолы");
NEI.overrideName(<BinnieCore:containerBucket:129>,"Ведро смолы");
NEI.overrideName(<BinnieCore:containerCylinder:129>,"Баллон смолы");
NEI.overrideName(<BinnieCore:containerCan:130>,"Банка латекса");
NEI.overrideName(<BinnieCore:containerCapsule:130>,"Капсула латекса");
NEI.overrideName(<BinnieCore:containerBucket:130>,"Ведро латекса");
NEI.overrideName(<BinnieCore:containerCylinder:130>,"Баллон латекса");
NEI.overrideName(<BinnieCore:containerCan:131>,"Банка скипидара");
NEI.overrideName(<BinnieCore:containerCapsule:131>,"Капсула скипидара");
NEI.overrideName(<BinnieCore:containerBucket:131>,"Ведро скипидара");
NEI.overrideName(<BinnieCore:containerCylinder:131>,"Баллон скипидара");
NEI.overrideName(<BinnieCore:containerCylinder:768>,"Баллон Питательной среды");
NEI.overrideName(<BinnieCore:containerCylinder:769>,"Баллон Бактерии");
NEI.overrideName(<BinnieCore:containerCylinder:770>,"Баллон Полимеризованной Бактерии");
NEI.overrideName(<BinnieCore:containerCylinder:771>,"Баллон Жидкой ДНК");
NEI.overrideName(<BinnieCore:containerCylinder:772>,"Баллон Бактерии Вектор");
# Gen.Machines energy cost tooltips
# Isolator
@@ -69,7 +69,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
if (icon.hasOutline()) {
iTexture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline);
iTexture = iTexture.crop(position, 8.0f);
CraftGUI.Render.colour(icon.getOutlineColour());
CraftGUI.Render.color(icon.getOutlineColour());
CraftGUI.Render.texture(iTexture, area.inset(2));
}
}
@@ -28,7 +28,7 @@ class ControlBreedingProgress extends Control {
CraftGUI.Render.texture(CraftGUITexture.PanelBlack, getArea());
IArea area = getArea().inset(1);
area.setSize(new IPoint(area.size().x() * percentage, area.size().y()));
CraftGUI.Render.colour(colour);
CraftGUI.Render.color(colour);
CraftGUI.Render.texture(ControlBreedingProgress.Progress, area);
}
}
@@ -392,7 +392,7 @@ public class GuiCraftGUI extends GuiContainer {
GL11.glEnable(3042);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
RenderHelper.disableStandardItemLighting();
CraftGUI.Render.colour(-1);
CraftGUI.Render.color(-1);
GL11.glEnable(32826);
GL11.glPopMatrix();
}
@@ -211,14 +211,14 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
@Override
public void onRenderBackground() {
CraftGUI.Render.colour(0xffffff);
CraftGUI.Render.color(0xffffff);
if (getBackground1() != null) {
CraftGUI.Render.texture(getBackground1(), IPoint.ZERO);
}
if (getBackground2() != null) {
CraftGUI.Render.texture(getBackground2(), new IPoint(256.0f, 0.0f));
}
CraftGUI.Render.colour(getColor());
CraftGUI.Render.color(getColor());
CraftGUI.Render.texture(CraftGUITexture.Window, getArea());
}
@@ -87,7 +87,7 @@ public class ControlEnergyBar extends Control implements ITooltip {
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.EnergyBarBack, getArea());
float percentage = getPercentage() / 100.0f;
CraftGUI.Render.colour(getColourFromPercentage(percentage));
CraftGUI.Render.color(getColourFromPercentage(percentage));
IArea area = getArea();
switch (direction) {
@@ -121,11 +121,11 @@ public class ControlEnergyBar extends Control implements ITooltip {
public void onRenderForeground() {
if (isMouseOver() && Window.get(this).getGui().isHelpMode()) {
IArea area = getArea();
CraftGUI.Render.colour(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.Render.color(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
} else if (ControlEnergyBar.isError) {
IArea area = getArea();
CraftGUI.Render.colour(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.Render.color(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
}
}
@@ -125,13 +125,13 @@ public class ControlLiquidTank extends Control implements ITooltip {
CraftGUI.Render.texture(horizontal ? CraftGUITexture.HorizontalLiquidTankOverlay : CraftGUITexture.LiquidTankOverlay, IPoint.ZERO);
if (isMouseOver() && Window.get(this).getGui().isHelpMode()) {
IArea area = getArea();
CraftGUI.Render.colour(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.Render.color(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
}
if (ControlLiquidTank.tankError.contains(tankID)) {
IArea area = getArea();
CraftGUI.Render.colour(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.Render.color(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
}
}
@@ -123,7 +123,7 @@ public class ControlSlot extends ControlSlotBase {
area = getParent().getArea();
area.setPosition(IPoint.ZERO.sub(getPosition()));
}
CraftGUI.Render.colour(c);
CraftGUI.Render.color(c);
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
}
}
@@ -30,7 +30,7 @@ public class Renderer {
public void preRender(IWidget widget) {
GL11.glPushMatrix();
GL11.glTranslatef(widget.getPosition().x(), widget.getPosition().y(), 0.0f);
colour(widget.getColor());
color(widget.getColor());
if (widget.isCroppedWidet()) {
IWidget cropRelative = (widget.getCropWidget() != null) ? widget.getCropWidget() : widget;
IPoint pos = cropRelative.getAbsolutePosition();
@@ -50,7 +50,7 @@ public class Renderer {
GL11.glPopMatrix();
}
public void colour(int hex) {
public void color(int hex) {
currentColour = hex;
int a = (hex & 0xFF000000) >> 24;
int r = (hex & 0xFF0000) >> 16;
@@ -78,7 +78,7 @@ public class Renderer {
if (texture != currentTexture && texture != null) {
BinnieCore.proxy.bindTexture(texture.getFilename());
}
colour(currentColour);
color(currentColour);
}
public void texture(Object texture, IPoint position) {
@@ -58,7 +58,7 @@ class MothBreedingSystem extends BreedingSystem {
return I18N.localise("binniecore.allele.metabolism.high");
}
if (metabolism >= 10) {
return I18N.localise("binniecore.allele.metabolism.normal");
return I18N.localise("binniecore.allele.metabolism.average");
}
if (metabolism >= 7) {
return I18N.localise("binniecore.allele.metabolism.slow");
@@ -54,6 +54,10 @@ public enum FluidContainer {
return I18N.localise("binniecore.item.container." + name().toLowerCase());
}
public String getName(String fluid) {
return I18N.localise("binniecore.item.container." + name().toLowerCase() + "." + fluid);
}
public boolean isActive() {
return getEmpty() != null;
}
@@ -71,7 +71,7 @@ public class ItemFluidContainer extends ItemFood {
if (fluid == null) {
return I18N.localise("binniecore.item.fluidContainer.missed");
}
return fluid.getFluid().getLocalizedName(fluid) + " " + container.getName();
return container.getName(fluid.getFluid().getName());
}
@Override
@@ -159,7 +159,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
@Override
public void onRenderForeground() {
Texture iTexture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline);
CraftGUI.Render.colour(getTab(panels.get(this)).getColor().getColour());
CraftGUI.Render.color(getTab(panels.get(this)).getColor().getColour());
CraftGUI.Render.texture(iTexture, getArea().inset(3));
}
};
@@ -321,7 +321,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
ControlScrollableContent<IWidget> scroll = new ControlScrollableContent<IWidget>(this, 124.0f, 16.0f, 116.0f, 92.0f, 6.0f) {
@Override
public void onRenderBackground() {
CraftGUI.Render.colour(11184810);
CraftGUI.Render.color(11184810);
CraftGUI.Render.texture(CraftGUITexture.Outline, getArea().inset(new IBorder(0.0f, 6.0f, 0.0f, 0.0f)));
}
};
@@ -154,7 +154,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
@Override
public String getName() {
return I18N.localise("extrabees.effect." + name().toLowerCase() + ".name");
return I18N.localise("extrabees.effect." + name().toLowerCase().replace("_", "") + ".name");
}
@Override
@@ -15,8 +15,6 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.Locale;
public interface ILogType {
void placeBlock(World p0, int p1, int p2, int p3);
@@ -25,46 +23,46 @@ public interface ILogType {
int getColour();
enum ExtraTreeLog implements ILogType {
Apple("Apple", 0x7b7a7b, PlankType.ExtraTreePlanks.Apple),
Fig("Fig", 0x807357, PlankType.ExtraTreePlanks.Fig),
Butternut("Butternut", 0xb7ada0, PlankType.ExtraTreePlanks.Butternut),
Cherry("Cherry", 0x716850, PlankType.ForestryPlanks.CHERRY),
Whitebeam("Whitebeam", 0x786a6d, PlankType.ExtraTreePlanks.Whitebeam),
Rowan("Rowan", 0xb6b09b, PlankType.ExtraTreePlanks.Rowan),
Hemlock("Hemlock", 0xada39b, PlankType.ExtraTreePlanks.Hemlock),
Ash("Ash", 0x898982, PlankType.ExtraTreePlanks.Ash),
Alder("Alder", 0xc6c0b8, PlankType.ExtraTreePlanks.Alder),
Beech("Beech", 0xb2917e, PlankType.ExtraTreePlanks.Beech),
Hawthorn("Hawthorn", 0x5f5745, PlankType.ExtraTreePlanks.Hawthorn),
Banana("Banana", 0x85924f),
Yew("Yew", 0xd1bbc1, PlankType.ExtraTreePlanks.Yew),
Cypress("Cypress", 0x9a8483, PlankType.ExtraTreePlanks.Cypress),
Fir("Fir", 0x828382, PlankType.ExtraTreePlanks.Fir),
Hazel("Hazel", 0xaa986f, PlankType.ExtraTreePlanks.Hazel),
Hickory("Hickory", 0x3e3530, PlankType.ExtraTreePlanks.Hickory),
Elm("Elm", 0x848386, PlankType.ExtraTreePlanks.Elm),
Elder("Elder", 0xd8b874, PlankType.ExtraTreePlanks.Elder),
Holly("Holly", 0xb5aa85, PlankType.ExtraTreePlanks.Holly),
Hornbeam("Hornbeam", 0xa39276, PlankType.ExtraTreePlanks.Hornbeam),
Cedar("Cedar", 0xad764f, PlankType.ExtraTreePlanks.Cedar),
Olive("Olive", 0x7b706a, PlankType.ExtraTreePlanks.Olive),
Sweetgum("Sweetgum", 0xa1a19c, PlankType.ExtraTreePlanks.Sweetgum),
Locust("Locust", 0xadacbc, PlankType.ExtraTreePlanks.Locust),
Pear("Pear", 0xa89779, PlankType.ExtraTreePlanks.Pear),
Maclura("Maclura", 0x8b5734, PlankType.ExtraTreePlanks.Maclura),
Brazilwood("Brazilwood", 0x9e8068, PlankType.ExtraTreePlanks.Brazilwood),
Logwood("Logwood", 0xf9e2d2, PlankType.ExtraTreePlanks.Logwood),
Rosewood("Rosewood", 0x998666, PlankType.ExtraTreePlanks.Rosewood),
Purpleheart("Purpleheart", 0x9392a2, PlankType.ExtraTreePlanks.Purpleheart),
Iroko("Iroko", 0x605c5b, PlankType.ExtraTreePlanks.Iroko),
Gingko("Gingko", 0xadae9c, PlankType.ExtraTreePlanks.Gingko),
Eucalyptus("Eucalyptus", 0xeadeda, PlankType.ExtraTreePlanks.Eucalyptus),
Eucalyptus2("Eucalyptus", 0x867e65, PlankType.ExtraTreePlanks.Eucalyptus),
Box("Box", 0xab6f57, PlankType.ExtraTreePlanks.Box),
Syzgium("Syzgium", 0xab6f57, PlankType.ExtraTreePlanks.Syzgium),
Eucalyptus3("Eucalyptus", 0x6cb03f, PlankType.ExtraTreePlanks.Eucalyptus),
Cinnamon("Cinnamon", 0x86583c, PlankType.VanillaPlanks.JUNGLE),
PinkIvory("Pink Ivory", 0x7f6554, PlankType.ExtraTreePlanks.PinkIvory);
Apple("apple", 0x7b7a7b, PlankType.ExtraTreePlanks.Apple),
Fig("fig", 0x807357, PlankType.ExtraTreePlanks.Fig),
Butternut("butternut", 0xb7ada0, PlankType.ExtraTreePlanks.Butternut),
Cherry("cherry", 0x716850, PlankType.ForestryPlanks.CHERRY),
Whitebeam("whitebeam", 0x786a6d, PlankType.ExtraTreePlanks.Whitebeam),
Rowan("rowan", 0xb6b09b, PlankType.ExtraTreePlanks.Rowan),
Hemlock("hemlock", 0xada39b, PlankType.ExtraTreePlanks.Hemlock),
Ash("ash", 0x898982, PlankType.ExtraTreePlanks.Ash),
Alder("alder", 0xc6c0b8, PlankType.ExtraTreePlanks.Alder),
Beech("beech", 0xb2917e, PlankType.ExtraTreePlanks.Beech),
Hawthorn("hawthorn", 0x5f5745, PlankType.ExtraTreePlanks.Hawthorn),
Banana("banana", 0x85924f),
Yew("yew", 0xd1bbc1, PlankType.ExtraTreePlanks.Yew),
Cypress("cypress", 0x9a8483, PlankType.ExtraTreePlanks.Cypress),
Fir("fir", 0x828382, PlankType.ExtraTreePlanks.Fir),
Hazel("hazel", 0xaa986f, PlankType.ExtraTreePlanks.Hazel),
Hickory("hickory", 0x3e3530, PlankType.ExtraTreePlanks.Hickory),
Elm("elm", 0x848386, PlankType.ExtraTreePlanks.Elm),
Elder("elder", 0xd8b874, PlankType.ExtraTreePlanks.Elder),
Holly("holly", 0xb5aa85, PlankType.ExtraTreePlanks.Holly),
Hornbeam("hornbeam", 0xa39276, PlankType.ExtraTreePlanks.Hornbeam),
Cedar("cedar", 0xad764f, PlankType.ExtraTreePlanks.Cedar),
Olive("olive", 0x7b706a, PlankType.ExtraTreePlanks.Olive),
Sweetgum("sweetgum", 0xa1a19c, PlankType.ExtraTreePlanks.Sweetgum),
Locust("locust", 0xadacbc, PlankType.ExtraTreePlanks.Locust),
Pear("pear", 0xa89779, PlankType.ExtraTreePlanks.Pear),
Maclura("maclura", 0x8b5734, PlankType.ExtraTreePlanks.Maclura),
Brazilwood("brazilwood", 0x9e8068, PlankType.ExtraTreePlanks.Brazilwood),
Logwood("logwood", 0xf9e2d2, PlankType.ExtraTreePlanks.Logwood),
Rosewood("rosewood", 0x998666, PlankType.ExtraTreePlanks.Rosewood),
Purpleheart("purpleheart", 0x9392a2, PlankType.ExtraTreePlanks.Purpleheart),
Iroko("iroko", 0x605c5b, PlankType.ExtraTreePlanks.Iroko),
Gingko("gingko", 0xadae9c, PlankType.ExtraTreePlanks.Gingko),
Eucalyptus("eucalyptus", 0xeadeda, PlankType.ExtraTreePlanks.Eucalyptus),
Eucalyptus2("eucalyptus", 0x867e65, PlankType.ExtraTreePlanks.Eucalyptus),
Box("box", 0xab6f57, PlankType.ExtraTreePlanks.Box),
Syzgium("syzgium", 0xab6f57, PlankType.ExtraTreePlanks.Syzgium),
Eucalyptus3("eucalyptus", 0x6cb03f, PlankType.ExtraTreePlanks.Eucalyptus),
Cinnamon("cinnamon", 0x86583c, PlankType.VanillaPlanks.JUNGLE),
PinkIvory("pinkivory", 0x7f6554, PlankType.ExtraTreePlanks.PinkIvory);
protected String name;
protected int color;
@@ -92,7 +90,7 @@ public interface ILogType {
}
public String getName() {
return I18N.localise("extratrees.block.planks." + name.toLowerCase(Locale.ENGLISH));
return I18N.localise("extratrees.block.planks." + name);
}
public void addRecipe() {
@@ -40,7 +40,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies {
Wall("wall", "Lasiommata megera", new Color(0xefae1e)),
CrimsonRose("crimsonRose", "Atrophaneura hector", new Color(0xff627b)),
KaiserIHind("kaiserIHind", "Teinopalpus imperialis", new Color(0x77a040)),
GoldenBirdwing("Golden Birdwing", "Troides aeacus", new Color(0xf9dc1e)),
GoldenBirdwing("goldenBirdwing", "Troides aeacus", new Color(0xf9dc1e)),
MarshFritillary("marshFritillary", "Euphydryas aurinia",new Color(0xff8c00)),
PearlBorderedFritillary("pearlBorderedFritillary", "Boloria euphrosyne", new Color(0xff8b03)),
QueenOfSpainFritillary("queenOfSpainFritillary", "Issoria lathonia", new Color(0xffd13f)),
@@ -3,16 +3,17 @@ package binnie.extratrees.item;
import binnie.Binnie;
import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.ILiquidType;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraftforge.fluids.FluidStack;
public enum ExtraTreeLiquid implements ILiquidType {
Sap("Sap", "sap", 12481858),
Resin("Resin", "resin", 13199360),
Latex("Latex", "latex", 14212041),
Turpentine("Turpentine", "turpentine", 7951162);
Sap("sap", 0xbe7542),
Resin("resin", 0xc96800),
Latex("latex", 0xd8dbc9),
Turpentine("turpentine", 0x79533a);
public String name;
@@ -20,10 +21,9 @@ public enum ExtraTreeLiquid implements ILiquidType {
protected IIcon icon;
protected int color;
ExtraTreeLiquid(String name, String ident, int color) {
this.name = "";
ExtraTreeLiquid(String name, int color) {
this.name = name;
this.ident = ident;
this.ident = name;
this.color = color;
}
@@ -39,7 +39,7 @@ public enum ExtraTreeLiquid implements ILiquidType {
@Override
public String getName() {
return name;
return I18N.localise("extratrees.fluid." + name);
}
@Override
@@ -5,7 +5,6 @@ import binnie.core.Mods;
import binnie.core.item.IItemMisc;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.alcohol.Juice;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
@@ -172,17 +171,6 @@ public enum Food implements IItemMisc {
// ignored
}
// TODO unused method?
public void addJuice(Juice juice, int time, int amount, int mulch) {
RecipeManagers.squeezerManager.addRecipe(
time,
new ItemStack[]{get(1)},
Binnie.Liquid.getLiquidStack("juice", amount),
Mods.forestry.stack("mulch"),
mulch
);
}
public void addJuice(int time, int amount, int mulch) {
RecipeManagers.squeezerManager.addRecipe(
time,
@@ -1,5 +1,6 @@
package binnie.extratrees.item;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.core.ExtraTreesGUID;
import cpw.mods.fml.relauncher.Side;
@@ -39,10 +40,10 @@ public class ItemDictionary extends Item {
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
if (par1ItemStack.getItemDamage() > 0) {
par3List.add("Sengir-in-a-can");
public void addInformation(ItemStack stack, EntityPlayer player, List toltip, boolean advanced) {
super.addInformation(stack, player, toltip, advanced);
if (stack.getItemDamage() > 0) {
toltip.add(I18N.localise("extratrees.item.database.tooltip"));
}
}
@@ -66,7 +67,7 @@ public class ItemDictionary extends Item {
@Override
public String getItemStackDisplayName(ItemStack i) {
return (i.getItemDamage() == 0) ?
"Arborist Database" :
"Master Arborist Database";
I18N.localise("extratrees.item.database") :
I18N.localise("extratrees.item.masterDatabase");
}
}
@@ -1,5 +1,6 @@
package binnie.extratrees.item;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.core.ExtraTreesGUID;
import cpw.mods.fml.relauncher.Side;
@@ -42,7 +43,7 @@ public class ItemMothDatabase extends Item {
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced);
if (stack.getItemDamage() > 0) {
tooltip.add("Binnie's Emporium of Lepidopterans");
tooltip.add(I18N.localise("extratrees.item.mothDatabase.tooltip"));
}
}
@@ -66,7 +67,7 @@ public class ItemMothDatabase extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
return (stack.getItemDamage() == 0) ?
"Lepidopterist Database" :
"Master Lepidopterist Database";
I18N.localise("extratrees.item.mothDatabase") :
I18N.localise("extratrees.item.mothMasterDatabase");
}
}
@@ -1,51 +0,0 @@
package binnie.extratrees.item;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IToolHammer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
// TODO unused class?
public class ItemSetSquare extends Item implements IToolHammer {
EnumSetSquareMode mode;
public ItemSetSquare(EnumSetSquareMode mode) {
this.mode = EnumSetSquareMode.Rotate;
this.mode = mode;
setCreativeTab(CreativeTabs.tabTools);
setUnlocalizedName("setSquare" + mode);
setMaxStackSize(1);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
itemIcon = ExtraTrees.proxy.getIcon(register, "setSquare" + mode.ordinal());
}
@Override
public String getItemStackDisplayName(ItemStack i) {
return "Set Square";
}
@Override
public boolean isActive(ItemStack stack) {
return mode == EnumSetSquareMode.Rotate;
}
@Override
public void onHammerUsed(ItemStack stack, EntityPlayer player) {
// ignored
}
public enum EnumSetSquareMode {
Rotate,
Edit,
Swap
}
}
@@ -27,7 +27,6 @@ public enum ExtraTreeMachine implements IMachineType {
Lumbermill(LumbermillPackage.class),
Woodworker(WoodworkerPackage.class),
Panelworker(PanelworkerPackage.class),
Nursery(Nursery.PackageNursery.class),
Press(Press.PackagePress.class),
Brewery(Brewery.PackageBrewery.class),
Distillery(Distillery.PackageDistillery.class),
@@ -50,7 +49,7 @@ public enum ExtraTreeMachine implements IMachineType {
if (this == ExtraTreeMachine.Tileworker) {
return BinnieCore.isBotanyActive();
}
return this != ExtraTreeMachine.Nursery;
return true;
}
public ItemStack get(int i) {
@@ -1,31 +0,0 @@
package binnie.extratrees.machines;
import binnie.core.BinnieCore;
import binnie.core.resource.BinnieResource;
import binnie.core.resource.ResourceType;
import binnie.extratrees.ExtraTrees;
import net.minecraftforge.client.model.IModelCustom;
import org.lwjgl.opengl.GL11;
public class MachineRendererNursery {
public static MachineRendererNursery instance = new MachineRendererNursery();
protected BinnieResource texture;
private IModelCustom casinoMachine;
private ModelNursery model;
public MachineRendererNursery() {
model = new ModelNursery();
}
public void renderMachine(BinnieResource texture, double x, double y, double z, float var8) {
this.texture = texture;
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5, y, z + 0.5);
GL11.glScaled(0.05, 0.05, 0.05);
BinnieCore.proxy.bindTexture(new BinnieResource(ExtraTrees.instance, ResourceType.Tile, "test.png"));
casinoMachine.renderAll();
GL11.glPopMatrix();
}
}
@@ -1,142 +0,0 @@
package binnie.extratrees.machines;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelNursery extends ModelBase {
private ModelRenderer shape1;
private ModelRenderer shape2;
private ModelRenderer shape3;
private ModelRenderer shape4;
private ModelRenderer shape5;
private ModelRenderer shape6;
private ModelRenderer shape7;
private ModelRenderer shape8;
private ModelRenderer shape9;
private ModelRenderer shape10;
private ModelRenderer shape11;
private ModelRenderer shape12;
private ModelRenderer shape13;
public ModelNursery() {
textureWidth = 64;
textureHeight = 64;
shape1 = new ModelRenderer(this, 0, 0);
shape1.addBox(-5.0f, -5.0f, -5.0f, 10, 10, 10);
shape1.setRotationPoint(0.0f, 16.0f, 0.0f);
shape1.setTextureSize(64, 64);
shape1.mirror = true;
setRotation(shape1, 0.0f, 0.0f, 0.0f);
shape2 = new ModelRenderer(this, 0, 20);
shape2.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape2.setRotationPoint(-5.0f, 16.0f, -5.0f);
shape2.setTextureSize(64, 64);
shape2.mirror = true;
setRotation(shape2, 0.0f, 0.0f, 0.0f);
shape3 = new ModelRenderer(this, 0, 20);
shape3.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape3.setRotationPoint(-5.0f, 16.0f, 5.0f);
shape3.setTextureSize(64, 64);
shape3.mirror = true;
setRotation(shape3, 0.0f, 0.0f, 0.0f);
shape4 = new ModelRenderer(this, 0, 20);
shape4.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape4.setRotationPoint(5.0f, 16.0f, -5.0f);
shape4.setTextureSize(64, 64);
shape4.mirror = true;
setRotation(shape4, 0.0f, 0.0f, 0.0f);
shape5 = new ModelRenderer(this, 0, 20);
shape5.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape5.setRotationPoint(5.0f, 16.0f, 5.0f);
shape5.setTextureSize(64, 64);
shape5.mirror = true;
setRotation(shape5, 0.0f, 0.0f, 0.0f);
shape6 = new ModelRenderer(this, 0, 20);
shape6.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape6.setRotationPoint(5.0f, 21.0f, 0.0f);
shape6.setTextureSize(64, 64);
shape6.mirror = true;
setRotation(shape6, 1.570796f, 0.0f, 0.0f);
shape7 = new ModelRenderer(this, 0, 20);
shape7.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape7.setRotationPoint(5.0f, 11.0f, 0.0f);
shape7.setTextureSize(64, 64);
shape7.mirror = true;
setRotation(shape7, 1.570796f, 0.0f, 0.0f);
shape8 = new ModelRenderer(this, 0, 20);
shape8.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape8.setRotationPoint(-5.0f, 21.0f, 0.0f);
shape8.setTextureSize(64, 64);
shape8.mirror = true;
setRotation(shape8, 1.570796f, 0.0f, 0.0f);
shape9 = new ModelRenderer(this, 0, 20);
shape9.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape9.setRotationPoint(-5.0f, 11.0f, 0.0f);
shape9.setTextureSize(64, 64);
shape9.mirror = true;
setRotation(shape9, 1.570796f, 0.0f, 0.0f);
shape10 = new ModelRenderer(this, 0, 20);
shape10.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape10.setRotationPoint(0.0f, 11.0f, 5.0f);
shape10.setTextureSize(64, 64);
shape10.mirror = true;
setRotation(shape10, 0.0f, 0.0f, 1.570796f);
shape11 = new ModelRenderer(this, 0, 20);
shape11.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape11.setRotationPoint(0.0f, 21.0f, -5.0f);
shape11.setTextureSize(64, 64);
shape11.mirror = true;
setRotation(shape11, 0.0f, 0.0f, 1.570796f);
shape12 = new ModelRenderer(this, 0, 20);
shape12.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape12.setRotationPoint(0.0f, 21.0f, 5.0f);
shape12.setTextureSize(64, 64);
shape12.mirror = true;
setRotation(shape12, 0.0f, 0.0f, 1.570796f);
shape13 = new ModelRenderer(this, 0, 20);
shape13.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape13.setRotationPoint(0.0f, 11.0f, -5.0f);
shape13.setTextureSize(64, 64);
shape13.mirror = true;
setRotation(shape13, 0.0f, 0.0f, 1.570796f);
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
shape1.render(f5);
shape2.render(f5);
shape3.render(f5);
shape4.render(f5);
shape5.render(f5);
shape6.render(f5);
shape7.render(f5);
shape8.render(f5);
shape9.render(f5);
shape10.render(f5);
shape11.render(f5);
shape12.render(f5);
shape13.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z) {
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
}
@@ -1,6 +1,5 @@
package binnie.extratrees.machines;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.core.machines.MachineGroup;
@@ -19,7 +18,6 @@ public class ModuleMachine implements IInitializable {
MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "machine", "machine", ExtraTreeMachine.values());
machineGroup.setCreativeTab(Tabs.tabArboriculture);
ExtraTrees.blockMachine = machineGroup.getBlock();
BinnieCore.proxy.registerTileEntity(TileEntityNursery.class, "binnie.tile.nursery", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
}
@Override
@@ -1,33 +0,0 @@
package binnie.extratrees.machines;
import binnie.core.machines.Machine;
import binnie.core.machines.inventory.ComponentInventorySlots;
import binnie.extratrees.core.ExtraTreeTexture;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.tileentity.TileEntity;
public class Nursery {
public static int slotCaterpillar = 0;
public static class PackageNursery extends ExtraTreeMachine.PackageExtraTreeMachine {
public PackageNursery() {
super("nursery", ExtraTreeTexture.Nursery.getTexture(), false);
}
@Override
public void createMachine(Machine machine) {
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
inventory.addSlot(Nursery.slotCaterpillar, "caterpillar");
}
@Override
public TileEntity createTileEntity() {
return new TileEntityNursery(this);
}
@Override
public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) {
// ignored
}
}
}
@@ -1,115 +0,0 @@
package binnie.extratrees.machines;
import binnie.core.machines.TileEntityMachine;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.IErrorState;
import forestry.api.genetics.IIndividual;
import forestry.api.lepidopterology.IButterfly;
import forestry.api.lepidopterology.IButterflyNursery;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import java.util.HashSet;
import java.util.Set;
public class TileEntityNursery extends TileEntityMachine implements IButterflyNursery {
public TileEntityNursery(Nursery.PackageNursery pack) {
super(pack);
}
IButterflyNursery getNursery() {
return getMachine().getInterface(IButterflyNursery.class);
}
boolean hasNursery() {
return getNursery() != null;
}
public World getWorld() {
return worldObj;
}
public int getXCoord() {
return xCoord;
}
public int getYCoord() {
return yCoord;
}
public int getZCoord() {
return zCoord;
}
public EnumTemperature getTemperature() {
return null;
}
public EnumHumidity getHumidity() {
return null;
}
public boolean addProduct(ItemStack product, boolean all) {
return false;
}
@Override
public IButterfly getCaterpillar() {
return hasNursery() ? getNursery().getCaterpillar() : null;
}
@Override
public void setCaterpillar(IButterfly butterfly) {
if (hasNursery()) {
getNursery().setCaterpillar(butterfly);
}
}
@Override
public IIndividual getNanny() {
return null;
}
@Override
public boolean canNurse(IButterfly butterfly) {
return getCaterpillar() == null;
}
public BiomeGenBase getBiome() {
return getWorld().getBiomeGenForCoords(xCoord, zCoord);
}
public void setErrorState(IErrorState state) {
}
public IErrorState getErrorState() {
return null;
}
public void setErrorState(int state) {
}
public boolean setErrorCondition(boolean condition, IErrorState errorState) {
return false;
}
public Set<IErrorState> getErrorStates() {
return new HashSet<>();
}
public int getBiomeId() {
return 0;
}
public int getErrorOrdinal() {
return 0;
}
@Override
public ChunkCoordinates getCoordinates() {
return new ChunkCoordinates(xCoord, yCoord, zCoord);
}
}
@@ -23,20 +23,7 @@ public class ControlGene extends Control implements IControlValue<IGene>, IToolt
protected ControlGene(IWidget parent, float x, float y) {
super(parent, x, y, 16.0f, 16.0f);
addAttribute(WidgetAttribute.MOUSE_OVER);
addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(EventMouse.Down event) {
if (!canFill(Window.get(getWidget()).getHeldItemStack())) {
return;
}
NBTTagCompound action = new NBTTagCompound();
NBTTagCompound geneNBT = new NBTTagCompound();
getValue().writeToNBT(geneNBT);
action.setTag("gene", geneNBT);
Window.get(getWidget()).sendClientAction("gene-select", action);
}
});
addSelfEventHandler(new MouseDownHandler());
}
@Override
@@ -84,7 +71,22 @@ public class ControlGene extends Control implements IControlValue<IGene>, IToolt
CraftGUI.Render.solid(getArea().inset(1), 0xff444444);
}
CraftGUI.Render.colour(-1);
CraftGUI.Render.color(0xffffffff);
CraftGUI.Render.iconItem(IPoint.ZERO, GeneticsTexture.dnaIcon.getIcon());
}
private class MouseDownHandler extends EventMouse.Down.Handler {
@Override
public void onEvent(EventMouse.Down event) {
if (!canFill(Window.get(getWidget()).getHeldItemStack())) {
return;
}
NBTTagCompound action = new NBTTagCompound();
NBTTagCompound geneNBT = new NBTTagCompound();
getValue().writeToNBT(geneNBT);
action.setTag("gene", geneNBT);
Window.get(getWidget()).sendClientAction("gene-select", action);
}
}
}
@@ -41,19 +41,19 @@ public class AnalystPageAppearance extends ControlAnalystPage {
float scale = w / 16.0f;
float dy = (sections > 1) ? 16.0f : 0.0f;
GL11.glScalef(scale, scale, 1.0f);
CraftGUI.Render.colour(ind.getGenome().getStemColor().getColor(false));
CraftGUI.Render.color(ind.getGenome().getStemColor().getColor(false));
if (sections > 1) {
CraftGUI.Render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 1));
}
CraftGUI.Render.iconBlock(new IPoint(0.0f, dy), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 0));
CraftGUI.Render.colour(ind.getGenome().getPrimaryColor().getColor(false));
CraftGUI.Render.color(ind.getGenome().getPrimaryColor().getColor(false));
if (sections > 1) {
CraftGUI.Render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 1));
}
CraftGUI.Render.iconBlock(new IPoint(0.0f, dy), ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 0));
CraftGUI.Render.colour(ind.getGenome().getSecondaryColor().getColor(false));
CraftGUI.Render.color(ind.getGenome().getSecondaryColor().getColor(false));
if (sections > 1) {
CraftGUI.Render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getVariantIcon(EnumFlowerStage.FLOWER, true, 1));
}
@@ -63,9 +63,9 @@ public class AnalystPageDatabase extends ControlAnalystPage {
@Override
public void onRenderBackground() {
CraftGUI.Render.colour(5592405);
CraftGUI.Render.color(5592405);
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().inset(1));
CraftGUI.Render.colour(AnalystPageDatabase.this.getColor());
CraftGUI.Render.color(AnalystPageDatabase.this.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea());
super.renderTextField();
}
@@ -143,12 +143,12 @@ public class AnalystPageDatabase extends ControlAnalystPage {
public void onRenderBackground() {
WindowAnalyst window = (WindowAnalyst) AnalystPageDatabase.this.getSuperParent();
if (window.getIndividual() != null && window.getIndividual().getGenome().getPrimary() == species) {
CraftGUI.Render.colour(15658734);
CraftGUI.Render.color(15658734);
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(1));
CraftGUI.Render.colour(AnalystPageDatabase.this.getColor());
CraftGUI.Render.color(AnalystPageDatabase.this.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().outset(1));
} else if (calculateIsMouseOver()) {
CraftGUI.Render.colour(15658734);
CraftGUI.Render.color(15658734);
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(1));
}
super.onRenderBackground();
@@ -135,12 +135,12 @@ public class AnalystPageMutations extends ControlAnalystPage {
CraftGUI.Render.item(new IPoint(0.0f, 0.0f), system.getDefaultMember(mutation.getAllele0().getUID()));
CraftGUI.Render.item(new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getAllele1().getUID()));
if (specificChance != mutation.getBaseChance()) {
CraftGUI.Render.colour(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd0.getIcon());
CraftGUI.Render.colour(getMutationColour(specificChance).getColour());
CraftGUI.Render.color(getMutationColour(specificChance).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd1.getIcon());
} else {
CraftGUI.Render.colour(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd.getIcon());
}
}
@@ -192,14 +192,14 @@ public class AnalystPageMutations extends ControlAnalystPage {
public void onRenderBackground() {
CraftGUI.Render.item(new IPoint(0.0f, 0.0f), system.getDefaultMember(speciesComb.getUID()));
CraftGUI.Render.item(new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getTemplate()[0].getUID()));
CraftGUI.Render.colour(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
if (specificChance2 != mutation.getBaseChance()) {
CraftGUI.Render.colour(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow0.getIcon());
CraftGUI.Render.colour(getMutationColour(specificChance2).getColour());
CraftGUI.Render.color(getMutationColour(specificChance2).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow1.getIcon());
} else {
CraftGUI.Render.colour(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow.getIcon());
}
}
@@ -142,11 +142,11 @@ public class WindowAnalyst extends Window {
@Override
public void onRenderBackground() {
CraftGUI.Render.colour(syst.getColor());
CraftGUI.Render.color(syst.getColor());
int outset = (getSystem() == syst) ? 1 : 0;
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().outset(outset));
if (getSystem() == syst) {
CraftGUI.Render.colour(1140850688 + syst.getColor());
CraftGUI.Render.color(1140850688 + syst.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(outset));
}
CraftGUI.Render.item(new IPoint(2.0f, 2.0f), syst.getItemStackRepresentative());
@@ -179,7 +179,7 @@ public class WindowAnalyst extends Window {
if (getContent() == null) {
return;
}
CraftGUI.Render.colour(getContent().getColor());
CraftGUI.Render.color(getContent().getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea());
}
};
@@ -202,7 +202,7 @@ public class WindowAnalyst extends Window {
if (getContent() == null) {
return;
}
CraftGUI.Render.colour(getContent().getColor());
CraftGUI.Render.color(getContent().getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea());
}
};
@@ -343,9 +343,9 @@ public class WindowAnalyst extends Window {
@Override
public void onRenderBackground() {
boolean active = value == leftPage.getContent() || value == rightPage.getContent();
CraftGUI.Render.colour((active ? 0xff000000 : 0x44000000) + value.getColor());
CraftGUI.Render.color((active ? 0xff000000 : 0x44000000) + value.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().inset(1));
CraftGUI.Render.colour(value.getColor());
CraftGUI.Render.color(value.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().inset(1));
super.onRenderBackground();
}
@@ -8,3 +8,5 @@ binniecore.allele.extrabees.effect.gravity.desc=Pulls entities towards the hive
binniecore.allele.extrabees.effect.hunger.desc=Causes players to be hungry
binniecore.allele.forestry.effectMycophilic.desc=Spreads mushrooms and mycelium
binniecore.allele.forestry.effectNone.desc=No discernible effects
binniecore.item.container.cylinder.binnie.bacteriapoly=Polymerised Bacteria Cylinder
@@ -198,6 +198,44 @@ binniecore.item.container.bucket=Bucket
binniecore.item.container.glass=Bottle
binniecore.item.container.cylinder=Cylinder
binniecore.item.container.capsule.acid=Acid Capsule
binniecore.item.container.capsule.poison=Poison Capsule
binniecore.item.container.capsule.liquidnitrogen=Nitrogen Capsule
binniecore.item.container.capsule.sap=Sap Capsule
binniecore.item.container.capsule.resin=Resin Capsule
binniecore.item.container.capsule.latex=Latex Capsule
binniecore.item.container.capsule.turpentine=Turpentine Capsule
binniecore.item.container.refractory.acid=Acid Capsule
binniecore.item.container.refractory.poison=Poison Capsule
binniecore.item.container.refractory.liquidnitrogen=Nitrogen Capsule
binniecore.item.container.refractory.sap=Sap Capsule
binniecore.item.container.refractory.resin=Resin Capsule
binniecore.item.container.refractory.latex=Latex Capsule
binniecore.item.container.refractory.turpentine=Turpentine Capsule
binniecore.item.container.can.acid=Acid Can
binniecore.item.container.can.poison=Poison Can
binniecore.item.container.can.liquidnitrogen=Nitrogen Can
binniecore.item.container.can.sap=Sap Can
binniecore.item.container.can.resin=Resin Can
binniecore.item.container.can.latex=Latex Can
binniecore.item.container.can.turpentine=Turpentine Can
binniecore.item.container.bucket.acid=Acid Bukket
binniecore.item.container.bucket.poison=Poison Bukket
binniecore.item.container.bucket.liquidnitrogen=Nitrogen Bukket
binniecore.item.container.bucket.sap=Sap Bukket
binniecore.item.container.bucket.resin=Resin Bukket
binniecore.item.container.bucket.latex=Latex Bukket
binniecore.item.container.bucket.turpentine=Turpentine Bukket
binniecore.item.container.cylinder.binnie.growthmedium=Growth Medium Cylinder
binniecore.item.container.cylinder.binnie.bacteria=Bacteria Cylinder
binniecore.item.container.cylinder.binnie.bacteriapoly=Polymerized Bacteria Cylinder
binniecore.item.container.cylinder.binnie.dna.raw=Raw DNA Cylinder
binniecore.item.container.cylinder.binnie.bacteriavector=Bacteria Vector Cylinder
binniecore.machine.error.noItem=No Item
binniecore.machine.error.invalidItem=Invalid Item
binniecore.machine.error.noSpace=No Space
@@ -198,6 +198,44 @@ binniecore.item.container.bucket=Ведро
binniecore.item.container.glass=Бутыль
binniecore.item.container.cylinder=Баллон
binniecore.item.container.capsule.acid=Капсула растфорителя
binniecore.item.container.capsule.poison=Капсула яда
binniecore.item.container.capsule.liquidnitrogen=Капсула нитрогена
binniecore.item.container.capsule.sap=Капсула живицы
binniecore.item.container.capsule.resin=Капсула смолы
binniecore.item.container.capsule.latex=Капсула резины
binniecore.item.container.capsule.turpentine=Капсула скипидара
binniecore.item.container.refractory.acid=Капсула растфорителя
binniecore.item.container.refractory.poison=Капсула яда
binniecore.item.container.refractory.liquidnitrogen=Капсула нитрогена
binniecore.item.container.refractory.sap=Капсула живицы
binniecore.item.container.refractory.resin=Капсула смолы
binniecore.item.container.refractory.latex=Капсула резины
binniecore.item.container.refractory.turpentine=Капсула скипидара
binniecore.item.container.can.acid=Банка растфорителя
binniecore.item.container.can.poison=Банка яда
binniecore.item.container.can.liquidnitrogen=Банка нитрогена
binniecore.item.container.can.sap=Банка живицы
binniecore.item.container.can.resin=Банка смолы
binniecore.item.container.can.latex=Банка резины
binniecore.item.container.can.turpentine=Банка скипидара
binniecore.item.container.bucket.acid=Ведро растворителя
binniecore.item.container.bucket.poison=Ведро яда
binniecore.item.container.bucket.liquidnitrogen=Ведро нитрогена
binniecore.item.container.bucket.sap=Ведро живицы
binniecore.item.container.bucket.resin=Ведро смолы
binniecore.item.container.bucket.latex=Ведро резины
binniecore.item.container.bucket.turpentine=Ведро скипидара
binniecore.item.container.cylinder.binnie.growthmedium=Баллон с питательной средой
binniecore.item.container.cylinder.binnie.bacteria=Баллон бактерии
binniecore.item.container.cylinder.binnie.bacteriapoly=Баллон полимеризированной бактерии
binniecore.item.container.cylinder.binnie.dna.raw=Баллон сырой ДНК
binniecore.item.container.cylinder.binnie.bacteriavector=Баллон бактерией вектор
binniecore.machine.error.noItem=Нет предметов
binniecore.machine.error.invalidItem=Неподходяий предмет
binniecore.machine.error.noSpace=Нет места
@@ -457,9 +457,9 @@ extrabees.species.mystical.name=Mystical
extrabees.effect.ectoplasm.name=Ectoplasm
extrabees.effect.acid.name=Acidic
extrabees.effect.spawn_zombie.name=Zombies
extrabees.effect.spawn_skeleton.name=Skeletons
extrabees.effect.spawn_creeper.name=Creepers
extrabees.effect.spawnzombie.name=Zombies
extrabees.effect.spawnskeleton.name=Skeletons
extrabees.effect.spawncreeper.name=Creepers
extrabees.effect.lightning.name=Lightning
extrabees.effect.radioactive.name=Unstable
extrabees.effect.meteor.name=Meteor
@@ -515,7 +515,6 @@ extrabees.species.tempered.desc=Необычная мутация генов а
extrabees.species.volcanic.name=Огнедышащая
extrabees.species.volcanic.desc=В какой-то момент во время их эволюции, они, кажется, приобрели черты от ифритов.|Руководство пчеловода
extrabees.species.glowstone.name=Сердитая
extrabees.species.glowstone.desc=
# Яростные голодные пчёлы (АВТОР ЕЁ УДАЛИЛ)
extrabees.species.angry.name=Яростные голодные пчёлы
@@ -523,27 +522,18 @@ extrabees.species.angry.desc=Повышение уровня ярости выз
# Заразная ветвь
extrabees.species.malicious.name=Вредоносная
extrabees.species.malicious.desc=
extrabees.species.infectious.name=Заразная
extrabees.species.infectious.desc=
extrabees.species.virulent.name=Ядовитая
extrabees.species.virulent.desc=
# Вязкая ветвь
extrabees.species.viscous.name=Вязкая
extrabees.species.viscous.desc=
extrabees.species.glutinous.name=Клейкая
extrabees.species.glutinous.desc=
extrabees.species.sticky.name=Липкая
extrabees.species.sticky.desc=
# Едкая ветвь
extrabees.species.corrosive.name=Едкая
extrabees.species.corrosive.desc=
extrabees.species.caustic.name=Едко-щелочная
extrabees.species.caustic.desc=
extrabees.species.acidic.name=Едко-кислотная
extrabees.species.acidic.desc=
# Энергетическая ветвь
extrabees.species.excited.name=Возбуждённая
@@ -555,17 +545,12 @@ extrabees.species.ecstatic.desc=После накопления чрезмерн
# Зимняя ветвь
extrabees.species.artic.name=Бесстрастная
extrabees.species.artic.desc=
extrabees.species.freezing.name=Самовластная
extrabees.species.freezing.desc=
# Тёмная ветвь
extrabees.species.shadow.name=Омрачённая
extrabees.species.shadow.desc=
extrabees.species.darkened.name=Потемневшая
extrabees.species.darkened.desc=
extrabees.species.abyss.name=Глубинная
extrabees.species.abyss.desc=
# Первичная ветвь
extrabees.species.red.name=Тёмно-бордовая
@@ -577,37 +562,24 @@ extrabees.species.blue.desc="Не унывайте, пчела. Вы ищете
extrabees.species.green.name=Зелёная
extrabees.species.green.desc=Возможно, это попытка маскировки, но эти пчелы начали производить красители, которые соответствуют цвету листьев и травы.|Руководство пчеловода
extrabees.species.black.name=Черномазая
extrabees.species.black.desc=
extrabees.species.white.name=Отбелённая
extrabees.species.white.desc=
# Вторичная ветвь
extrabees.species.brown.name=Коричневая
extrabees.species.brown.desc=
extrabees.species.orange.name=Оранжевая
extrabees.species.orange.desc=
extrabees.species.cyan.name=Бирюзовая
extrabees.species.cyan.desc=
extrabees.species.purple.name=Фиолетовая
extrabees.species.purple.desc=
extrabees.species.gray.name=Серая
extrabees.species.gray.desc=
extrabees.species.lightblue.name=Голубая
extrabees.species.lightblue.desc=
extrabees.species.pink.name=Розовая
extrabees.species.pink.desc=
extrabees.species.limegreen.name=Лаймовая
extrabees.species.limegreen.desc=
# Третичная ветвь
extrabees.species.magenta.name=Пурпурная
extrabees.species.magenta.desc=
extrabees.species.lightgray.name=Светло-серая
extrabees.species.lightgray.desc=
# Праздничная ветвь
extrabees.species.celebratory.name=Праздничная
extrabees.species.celebratory.desc=
# Мерзкая ветвь
extrabees.species.jaded.name=Изнурённая
@@ -615,26 +587,21 @@ extrabees.species.jaded.desc=Я разводил этих пчёл и всё, ч
# Суровая ветвь
extrabees.species.hazardous.name=Опасная
extrabees.species.hazardous.desc=
# Квантовая ветвь
extrabees.species.quantum.name=Квантовая
extrabees.species.quantum.desc=
extrabees.species.spatial.name=Пространственная
extrabees.species.spatial.desc=
extrabees.species.unusual.name=Аномальная
extrabees.species.unusual.desc=
# Мистическая ветвь
extrabees.species.mystical.name=Мистическая
extrabees.species.mystical.desc=
# Наименование эффектов
extrabees.effect.ectoplasm.name=Эктоплазма
extrabees.effect.acid.name=Кислота
extrabees.effect.spawn_zombie.name=Зомби
extrabees.effect.spawn_skeleton.name=Скелеты
extrabees.effect.spawn_creeper.name=Криперы
extrabees.effect.spawnzombie.name=Зомби
extrabees.effect.spawnskeleton.name=Скелеты
extrabees.effect.spawncreeper.name=Криперы
extrabees.effect.lightning.name=Молния
extrabees.effect.radioactive.name=Нестабильность
extrabees.effect.meteor.name=Метеор
@@ -439,9 +439,9 @@ extrabees.species.mystical.name=神秘
extrabees.effect.ectoplasm.name=胶化
extrabees.effect.acid.name=酸液
extrabees.effect.spawn_zombie.name=僵尸刷怪笼
extrabees.effect.spawn_skeleton.name=骷髅刷怪笼
extrabees.effect.spawn_creeper.name=爬行者刷怪笼
extrabees.effect.spawnzombie.name=僵尸刷怪笼
extrabees.effect.spawnskeleton.name=骷髅刷怪笼
extrabees.effect.spawncreeper.name=爬行者刷怪笼
extrabees.effect.lightning.name=雷公助我
extrabees.effect.radioactive.name=辐射
extrabees.effect.meteor.name=流星
@@ -326,7 +326,7 @@ extratrees.item.grainBarley=Barley Grain
extratrees.item.grainRye=Rye Grain
extratrees.item.grainCorn=Corn Grain
extratrees.item.grainRoasted=Roasted Grain
extratrees.item.glassware.glassFitting=Glass Fittings
extratrees.item.glassFitting=Glass Fittings
extratrees.item.food.apple=Apple
extratrees.item.food.crabapple=Crabapple
@@ -421,6 +421,19 @@ extratrees.item.glassware.shot.usage=%1$s Shot
extratrees.item.glassware.sherry.usage=Glass of %1$s
extratrees.item.glassware.coupe.usage=Glass of %1$s
extratrees.item.database=Arborist Database
extratrees.item.masterDatabase=Master Arborist Database
extratrees.item.database.tooltip=Sengir-in-a-can
extratrees.item.mothDatabase=Lepidopterist Database
extratrees.item.mothMasterDatabase=Master Lepidopterist Database
extratrees.item.mothDatabase.tooltip=Binnie's Emporium of Lepidopterans
extratrees.fluid.sap=Sap
extratrees.fluid.resin=Resin
extratrees.fluid.latex=Latex
extratrees.fluid.turpentine=Turpentine
extratrees.fluid.alcohol.apple=Cider
extratrees.fluid.alcohol.apricot=Apricot Wine
extratrees.fluid.alcohol.banana=Banana Wine
@@ -321,8 +321,6 @@ extratrees.genetics.unknown=<Неизвестно>
extratrees.genetics.discoveredBy=Изучено игроком %s
extratrees.genetics.complexity=Сложность: %d
extratrees.item.carpentryHammer=Плотницкий молоток
extratrees.item.masterCarpentryHammer=Плотницкий молоток мастера
extratrees.item.sawdust=Опилки
extratrees.item.bark=Кора
extratrees.item.provenGear=Проверенная шестерня
@@ -330,12 +328,12 @@ extratrees.item.woodWax=Полироль
extratrees.item.hops=Хмель
extratrees.item.yeast=Дрожжи
extratrees.item.yeastLager=Пивоваренные дрожжи
extratrees.item.wheat=Гранулы пшеницы
extratrees.item.barley=Зерна ячменя
extratrees.item.rye=Ржаное зерно
extratrees.item.corn=Зерна кукурузы
extratrees.item.roasted=Жареные зерна
extratrees.item.glassware.glassFitting=Glass Fittings
extratrees.item.grainWheat=Гранулы пшеницы
extratrees.item.grainBarley=Зерна ячменя
extratrees.item.grainRye=Ржаное зерно
extratrees.item.grainCorn=Зерна кукурузы
extratrees.item.grainRoasted=Жареные зерна
extratrees.item.glassFitting=Стеклянные фитинги
# ПРОДУКТЫ САДОВОДСТВА
extratrees.item.food.osangeosange=Плод маклюра
@@ -434,6 +432,19 @@ extratrees.item.glassware.shot.usage=%1$s Shot
extratrees.item.glassware.sherry.usage=Стакан %1$s
extratrees.item.glassware.coupe.usage=Стакан %1$s
extratrees.item.database=База данных лесовода
extratrees.item.masterDatabase=База данных лесовода-мастера
extratrees.item.database.tooltip=Sengir-в-банке
extratrees.item.mothDatabase=База данных бабочковеда
extratrees.item.mothMasterDatabase=База данных бабочковеда-мастера
extratrees.item.mothDatabase.tooltip=Эмпиум Binnie о чешуекрылых
extratrees.fluid.sap=Живица
extratrees.fluid.resin=Смола
extratrees.fluid.latex=Резина
extratrees.fluid.turpentine=Скипидар
extratrees.fluid.alcohol.apple=сидр
extratrees.fluid.alcohol.apricot=абрикосовое вино
extratrees.fluid.alcohol.banana=банановое вино
@@ -313,7 +313,7 @@ extratrees.item.grainBarley=大麦粉
extratrees.item.grainRye=黑麦粉
extratrees.item.grainCorn=玉米粉
extratrees.item.grainRoasted=烤过的面粉
extratrees.item.glassware.glassFitting=玻璃配件
extratrees.item.glassFitting=玻璃配件
extratrees.item.food.apple=苹果
extratrees.item.food.crabapple=海棠果