diff --git a/binnie-mods-2.0(1.7.10)-pre15-ru-u8.zs b/binnie-mods-2.0(1.7.10)-pre15-ru-u8.zs index a2469b7b..544cefb8 100644 --- a/binnie-mods-2.0(1.7.10)-pre15-ru-u8.zs +++ b/binnie-mods-2.0(1.7.10)-pre15-ru-u8.zs @@ -64,10 +64,6 @@ NEI.overrideName(,"Аналитик"); -# Field Kit -NEI.overrideName(,"Полевая лаборатория"); -.addTooltip(format.darkGreen("Field Kit")); - # Master Carpentry Hammer NEI.overrideName(,"Плотницкий молоток мастера"); .addTooltip(format.darkGreen("Master Carpentry Hammer")); @@ -392,10 +388,6 @@ NEI.overrideName(,"Измельчённый компост"); NEI.overrideName(,"Известковый раствор"); .addTooltip(format.darkGreen("Mortar")); -# Weedkiller -NEI.overrideName(,"Средство от сорняков"); -.addTooltip(format.darkGreen("Weedkiller")); - # Clay Dust NEI.overrideName(,"Глиняная пыль"); .addTooltip(format.darkGreen("Clay Dust")); @@ -517,29 +509,6 @@ NEI.overrideName(,"Йеллориумовые зёрна"); .addTooltip(format.darkGreen("Yellorium Grains")); -# WEEDS - -# Weeds -NEI.overrideName(,"Сорняки"); -.addTooltip(format.darkGreen("Weeds")); - -# Long Weeds -NEI.overrideName(,"Большие Сорняки"); -.addTooltip(format.darkGreen("Long Weeds")); - -# Very Long Weeds -NEI.overrideName(,"Огромные Сорняки"); -.addTooltip(format.darkGreen("Very Long Weeds")); - -# Dead Flower -NEI.overrideName(,"Мёртвый цветок"); -.addTooltip(format.darkGreen("Dead Flower")); - -# Decaying Flower -NEI.overrideName(,"Ослабленный цветок"); -.addTooltip(format.darkGreen("Decaying Flower")); - - # Insulated Tubes diff --git a/src/main/java/binnie/botany/core/BotanyTexture.java b/src/main/java/binnie/botany/core/BotanyTexture.java deleted file mode 100644 index 354dbf14..00000000 --- a/src/main/java/binnie/botany/core/BotanyTexture.java +++ /dev/null @@ -1,25 +0,0 @@ -package binnie.botany.core; - -import binnie.Binnie; -import binnie.core.resource.BinnieResource; -import binnie.core.resource.IBinnieTexture; -import binnie.core.resource.ResourceType; -import binnie.extrabees.ExtraBees; - -// TODO unused class? -public enum BotanyTexture implements IBinnieTexture { - ; - - protected String texture; - protected ResourceType type; - - BotanyTexture(ResourceType base, String texture) { - this.texture = texture; - type = base; - } - - @Override - public BinnieResource getTexture() { - return Binnie.Resource.getPNG(ExtraBees.instance, type, texture); - } -} diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java b/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java index e46f0690..ddbb07c4 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java @@ -3,8 +3,6 @@ package binnie.botany.craftgui; import binnie.botany.api.IColourMix; import binnie.core.craftgui.controls.listbox.ControlList; import binnie.core.craftgui.controls.listbox.ControlOption; -import binnie.core.craftgui.database.WindowAbstractDatabase; -import binnie.core.genetics.BreedingSystem; public class ControlColorMixItem extends ControlOption { protected ControlColorDisplay itemWidget1; @@ -20,7 +18,7 @@ public class ControlColorMixItem extends ControlOption { itemWidget3 = new ControlColorDisplay(this, 104.0f, 4.0f); addSymbol = new ControlColourMixSymbol(this, 24, 4, 0); arrowSymbol = new ControlColourMixSymbol(this, 64, 4, 1); - BreedingSystem system = ((WindowAbstractDatabase) getSuperParent()).getBreedingSystem(); + if (getValue() != null) { itemWidget1.setValue(getValue().getColor1()); itemWidget2.setValue(getValue().getColor2()); diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index 6194d9a8..a0e75613 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -24,10 +24,6 @@ public class ItemInsulatedTube extends Item { setCreativeTab(CreativeTabBotany.instance); } - public static String getInsulate(ItemStack stack) { - return Insulate.get(stack.getItemDamage()).getName(); - } - public static ItemStack getInsulateStack(ItemStack stack) { return Insulate.get(stack.getItemDamage()).getStack(); } diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index 872b1c1a..e24c7fba 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -4,6 +4,7 @@ import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumSoilType; import binnie.botany.api.gardening.IBlockSoil; +import binnie.core.util.I18N; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -126,11 +127,11 @@ public class BlockPlant extends BlockBush { } public enum Type { - Weeds("Weeds"), - WeedsLong("Long Weeds"), - WeedsVeryLong("Very Long Weeds"), - DeadFlower("Dead Flower"), - DecayingFlower("Decaying Flower"); + Weeds("weeds"), + WeedsLong("longWeeds"), + WeedsVeryLong("veryLongWeeds"), + DeadFlower("deadFlower"), + DecayingFlower("decayingFlower"); public IIcon icon; @@ -149,7 +150,7 @@ public class BlockPlant extends BlockBush { } public String getName() { - return name; + return I18N.localise(Botany.instance, "plant." + name); } } } diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index b8db54fd..35dd674d 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -111,6 +111,7 @@ public class BlockSoil extends Block implements IBlockSoil { if (desiredMoisture.ordinal() < moisture.ordinal()) { moisture = ((moisture == EnumMoisture.DAMP) ? EnumMoisture.NORMAL : EnumMoisture.DRY); } + int meta2 = getMeta(acidity, moisture); if (meta != meta2) { world.setBlockMetadataWithNotify(x, y, z, meta2, 2); diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 66f5a507..484bc3bc 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -34,11 +34,8 @@ public class Gardening { } public static boolean isSoil(Item item) { - return item instanceof ItemBlock && isSoil(((ItemBlock) item).field_150939_a); - } - - public static boolean isSoil(ItemStack item) { - return isSoil(item.getItem()); + return item instanceof ItemBlock + && isSoil(((ItemBlock) item).field_150939_a); } public static EnumMoisture getNaturalMoisture(World world, int x, int y, int z) { diff --git a/src/main/java/binnie/botany/gardening/ItemSoil.java b/src/main/java/binnie/botany/gardening/ItemSoil.java index 901fcdb0..75030ac8 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoil.java +++ b/src/main/java/binnie/botany/gardening/ItemSoil.java @@ -1,8 +1,10 @@ package binnie.botany.gardening; +import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; +import binnie.core.util.I18N; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -12,9 +14,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import java.util.List; +import java.util.Locale; public class ItemSoil extends ItemBlock { - EnumSoilType type; + protected EnumSoilType type; + private boolean noWeed; public ItemSoil(Block block) { @@ -33,24 +37,32 @@ public class ItemSoil extends ItemBlock { String info = ""; if (moisture == EnumMoisture.DRY) { - info += EnumChatFormatting.YELLOW + "Dry" + EnumChatFormatting.RESET; + info += EnumChatFormatting.YELLOW + + I18N.localise(Botany.instance, "moisture.dry") + + EnumChatFormatting.RESET; } if (moisture == EnumMoisture.DAMP) { - info += EnumChatFormatting.YELLOW + "Damp" + EnumChatFormatting.RESET; + info += EnumChatFormatting.YELLOW + + I18N.localise(Botany.instance, "moisture.damp") + + EnumChatFormatting.RESET; } if (acidity == EnumAcidity.ACID) { if (info.length() > 0) { info += ", "; } - info += EnumChatFormatting.RED + "Acidic" + EnumChatFormatting.RESET; + info += EnumChatFormatting.YELLOW + + I18N.localise(Botany.instance, "ph.acid") + + EnumChatFormatting.RESET; } if (acidity == EnumAcidity.ALKALINE) { if (info.length() > 0) { info += ", "; } - info += EnumChatFormatting.AQUA + "Alkaline" + EnumChatFormatting.RESET; + info += EnumChatFormatting.YELLOW + + I18N.localise(Botany.instance, "ph.alkaline") + + EnumChatFormatting.RESET; } if (info.length() > 0) { @@ -58,13 +70,14 @@ public class ItemSoil extends ItemBlock { } if (noWeed) { - tooltip.add("Weedkiller"); + tooltip.add(I18N.localise(Botany.instance, "soil.weedkiller")); } } @Override public String getItemStackDisplayName(ItemStack stack) { - return type.name().substring(0, 1) + type.name().toLowerCase().substring(1); + String soilName = type.name().toLowerCase(Locale.ENGLISH); + return I18N.localise(Botany.instance, "soil." + soilName); } @Override diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index 2cd86b68..5902f2c3 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -30,8 +30,8 @@ public class ItemTrowel extends Item { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister p_94581_1_) { - itemIcon = Botany.proxy.getIcon(p_94581_1_, "tools/" + locName); + public void registerIcons(IIconRegister register) { + itemIcon = Botany.proxy.getIcon(register, "tools/" + locName); } @Override @@ -64,8 +64,4 @@ public class ItemTrowel extends Item { public boolean isFull3D() { return true; } - - public String getToolMaterialName() { - return theToolMaterial.toString(); - } } diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/botany/items/ItemFieldKit.java similarity index 69% rename from src/main/java/binnie/core/item/ItemFieldKit.java rename to src/main/java/binnie/botany/items/ItemFieldKit.java index 4dc4c769..2249641c 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/botany/items/ItemFieldKit.java @@ -1,8 +1,10 @@ -package binnie.core.item; +package binnie.botany.items; +import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; +import binnie.core.util.I18N; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -30,10 +32,10 @@ public class ItemFieldKit extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { - fieldKit0 = BinnieCore.proxy.getIcon(register, "fieldKit"); - fieldKit1 = BinnieCore.proxy.getIcon(register, "fieldKit1"); - fieldKit2 = BinnieCore.proxy.getIcon(register, "fieldKit2"); - fieldKit3 = BinnieCore.proxy.getIcon(register, "fieldKit3"); + fieldKit0 = Botany.proxy.getIcon(register, "fieldKit"); + fieldKit1 = Botany.proxy.getIcon(register, "fieldKit1"); + fieldKit2 = Botany.proxy.getIcon(register, "fieldKit2"); + fieldKit3 = Botany.proxy.getIcon(register, "fieldKit3"); itemIcon = fieldKit0; } @@ -65,15 +67,19 @@ public class ItemFieldKit extends Item { public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { int i = getMaxDamage() - itemStack.getItemDamage(); if (i == 0) { - tooltip.add("No paper"); + tooltip.add(I18N.localise(Botany.instance, "item.fieldKit.tooltip.noPaper")); } else { - tooltip.add("" + i + " sheet" + ((i > 1) ? "s" : "") + " of paper"); + if (i > 1) { + tooltip.add(I18N.localise(Botany.instance, "item.fieldKit.tooltip.sheetsOfPaper", i)); + } else { + tooltip.add(I18N.localise(Botany.instance, "item.fieldKit.tooltip.sheetOfPaper", i)); + } } super.addInformation(itemStack, player, tooltip, advanced); } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { - return "Field Kit"; + public String getItemStackDisplayName(ItemStack stack) { + return I18N.localise(Botany.instance, "item.fieldKit.name"); } } diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 3b9d3228..6f39e94a 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -7,7 +7,7 @@ import binnie.core.craftgui.minecraft.ModuleCraftGUI; import binnie.core.gui.BinnieCoreGUI; import binnie.core.gui.BinnieGUIHandler; import binnie.core.gui.IBinnieGUID; -import binnie.core.item.ItemFieldKit; +import binnie.botany.items.ItemFieldKit; import binnie.core.item.ItemGenesis; import binnie.core.item.ModuleItems; import binnie.core.liquid.FluidContainer; diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index 2de8a190..b3998a31 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -46,9 +46,9 @@ public abstract class BreedingSystem implements IItemStackRepresentative { protected BinnieIcon iconUndiscovered; protected BinnieIcon iconDiscovered; + protected List allActiveSpecies = new ArrayList<>(); private List allBranches = new ArrayList<>(); - private List allActiveSpecies = new ArrayList<>(); private List allMutations = new ArrayList<>(); private Map> resultantMutations = new HashMap<>(); private Map> furtherMutations = new HashMap<>(); diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index c9301b39..8dcd4bfa 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -3,6 +3,7 @@ package binnie.core.item; import binnie.botany.Botany; import binnie.botany.api.IFlower; import binnie.botany.flower.TileEntityFlower; +import binnie.botany.items.ItemFieldKit; import binnie.botany.network.PacketID; import binnie.core.BinnieCore; import binnie.core.IInitializable; diff --git a/src/main/resources/assets/botany/lang/en_GB.lang b/src/main/resources/assets/botany/lang/en_GB.lang index 8cf00d27..3827bee6 100644 --- a/src/main/resources/assets/botany/lang/en_GB.lang +++ b/src/main/resources/assets/botany/lang/en_GB.lang @@ -21,9 +21,16 @@ botany.moisture.dry=Dry botany.moisture.normal=Normal botany.moisture.damp=Damp +botany.plant.weeds=Weeds +botany.plant.longWeeds=Long Weeds +botany.plant.veryLongWeeds=Very Long Weeds +botany.plant.deadFlower=Dead Flower +botany.plant.decayingFlower=Decaying Flower + botany.soil.soil=Soil botany.soil.loam=Loam botany.soil.flowerbed=Flowerbed +botany.soil.weedkiller=Weedkiller botany.item.tooltip.holdMore= botany.item.tooltip.bugged=This item is bugged. Destroy it! @@ -38,6 +45,10 @@ botany.item.tooltip.fertility=Fertility: %dx botany.item.tooltip.flowerColor1=%1$s, %2$s Stem botany.item.tooltip.flowerColor2=%1$s and %2$s, %3$s Stem +botany.item.fieldKit.tooltip.noPaper=No paper +botany.item.fieldKit.tooltip.sheetsOfPaper=%d sheets of paper +botany.item.fieldKit.tooltip.sheetOfPaper=%d sheet of paper + botany.item.soilMeter.name=Soil Meter botany.item.pigment.name=Pigment botany.item.clay.name=Clay @@ -47,6 +58,7 @@ botany.item.germling.tag.name=Germling botany.item.flowerCorrupted.name=Corrupted Flower botany.item.botanistDatabase.0.name=Botanist Database botany.item.botanistDatabase.1.name=Master Botanist Database +botany.item.fieldKit.name=Field Kit item.trowelWood.name=Wooden Trowel item.trowelStone.name=Stone Trowel diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index 5728cb90..ca68ceeb 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -21,9 +21,16 @@ botany.moisture.dry=Dry botany.moisture.normal=Normal botany.moisture.damp=Damp +botany.plant.weeds=Weeds +botany.plant.longWeeds=Long Weeds +botany.plant.veryLongWeeds=Very Long Weeds +botany.plant.deadFlower=Dead Flower +botany.plant.decayingFlower=Decaying Flower + botany.soil.soil=Soil botany.soil.loam=Loam botany.soil.flowerbed=Flowerbed +botany.soil.weedkiller=Weedkiller botany.item.tooltip.holdMore= botany.item.tooltip.bugged=This item is bugged. Destroy it! @@ -38,6 +45,10 @@ botany.item.tooltip.fertility=Fertility: %dx botany.item.tooltip.flowerColor1=%1$s, %2$s Stem botany.item.tooltip.flowerColor2=%1$s and %2$s, %3$s Stem +botany.item.fieldKit.tooltip.noPaper=No paper +botany.item.fieldKit.tooltip.sheetsOfPaper=%d sheets of paper +botany.item.fieldKit.tooltip.sheetOfPaper=%d sheet of paper + botany.item.soilMeter.name=Soil Meter botany.item.pigment.name=Pigment botany.item.clay.name=Clay @@ -47,6 +58,7 @@ botany.item.germling.tag.name=Germling botany.item.flowerCorrupted.name=Corrupted Flower botany.item.botanistDatabase.0.name=Botanist Database botany.item.botanistDatabase.1.name=Master Botanist Database +botany.item.fieldKit.name=Field Kit item.trowelWood.name=Wooden Trowel item.trowelStone.name=Stone Trowel diff --git a/src/main/resources/assets/botany/lang/ru_RU.lang b/src/main/resources/assets/botany/lang/ru_RU.lang index de1e70c9..891e185e 100644 --- a/src/main/resources/assets/botany/lang/ru_RU.lang +++ b/src/main/resources/assets/botany/lang/ru_RU.lang @@ -21,9 +21,16 @@ botany.moisture.dry=Сухой botany.moisture.normal=Обычный botany.moisture.damp=Влажный +botany.plant.weeds=Маленький сорняк +botany.plant.longWeeds=Сорняк +botany.plant.veryLongWeeds=Высокий сорняк +botany.plant.deadFlower=Засохший цветок +botany.plant.decayingFlower=Увядающий цветок + botany.soil.soil=Почва botany.soil.loam=Суглинок botany.soil.flowerbed=Цветник +botany.soil.weedkiller=Средство от сорняков botany.item.tooltip.holdMore=<Зажмите SHIFT для подробностей> botany.item.tooltip.bugged=Предмет содержит ошибки. Уничтожь его! @@ -38,6 +45,10 @@ botany.item.tooltip.fertility=Плодовитость: %dx botany.item.tooltip.flowerColor1=%1$s, %2$s стебель botany.item.tooltip.flowerColor2=%1$s и %2$s, %3$s стебель +botany.item.fieldKit.tooltip.noPaper=Отсутствует бумага +botany.item.fieldKit.tooltip.sheetsOfPaper=%d бумаги +botany.item.fieldKit.tooltip.sheetOfPaper=%d бумага + botany.item.soilMeter.name=Измеритель почвы botany.item.pigment.name=Краситель botany.item.clay.name=Глиняный порошок @@ -47,6 +58,7 @@ botany.item.germling.tag.name=Росток цветка botany.item.flowerCorrupted.name=Поврежденный цветок botany.item.botanistDatabase.0.name=База данных ботаника botany.item.botanistDatabase.1.name=База данных мастера-ботаника +botany.item.fieldKit.name=Полевая лаборатория item.trowelWood.name=Деревянный совок item.trowelStone.name=Каменный совок diff --git a/src/main/resources/assets/binniecore/textures/items/fieldKit.png b/src/main/resources/assets/botany/textures/items/fieldKit.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/fieldKit.png rename to src/main/resources/assets/botany/textures/items/fieldKit.png diff --git a/src/main/resources/assets/binniecore/textures/items/fieldKit1.png b/src/main/resources/assets/botany/textures/items/fieldKit1.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/fieldKit1.png rename to src/main/resources/assets/botany/textures/items/fieldKit1.png diff --git a/src/main/resources/assets/binniecore/textures/items/fieldKit2.png b/src/main/resources/assets/botany/textures/items/fieldKit2.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/fieldKit2.png rename to src/main/resources/assets/botany/textures/items/fieldKit2.png diff --git a/src/main/resources/assets/binniecore/textures/items/fieldKit3.png b/src/main/resources/assets/botany/textures/items/fieldKit3.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/fieldKit3.png rename to src/main/resources/assets/botany/textures/items/fieldKit3.png