diff --git a/.gitignore b/.gitignore index 0f6eb1ea..dc9c8a02 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /run /eclipse /out +/classes .idea *.iml *.ipr diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java index b7b12758..98a1e668 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java @@ -313,7 +313,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { @Override public String getDescription() { - return I18N.localise("extratrees.item.food." + name().toLowerCase()); + return "extratrees.item.food." + name().toLowerCase(); } @Override @@ -418,7 +418,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { @Override public String getName() { - return getDescription(); + return I18N.localise("for." + getDescription()); } public String getNameOfFruit() { diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index 270761ea..93ebe4e1 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -148,7 +148,7 @@ public enum Food implements IItemMisc { @Override public String getName(ItemStack itemStack) { - return I18N.localise("extratrees.item.food." + name().toLowerCase()); + return I18N.localise("for.extratrees.item.food." + name().toLowerCase()); } @Override diff --git a/src/main/resources/assets/extratrees/lang/en_US.lang b/src/main/resources/assets/extratrees/lang/en_US.lang index ffa9fdc1..08038fcc 100644 --- a/src/main/resources/assets/extratrees/lang/en_US.lang +++ b/src/main/resources/assets/extratrees/lang/en_US.lang @@ -320,67 +320,67 @@ extratrees.item.provenGear=Proven Gear extratrees.item.woodWax=Wood Polish extratrees.item.glassFitting=Glass Fittings -extratrees.item.food.apple=Apple -extratrees.item.food.crabapple=Crabapple -extratrees.item.food.orange=Orange -extratrees.item.food.kumquat=Kumquat -extratrees.item.food.lime=Lime -extratrees.item.food.wildcherry=Wild Cherry -extratrees.item.food.sourcherry=Sour Cherry -extratrees.item.food.blackcherry=Black Cherry -extratrees.item.food.blackthorn=Blackthorn -extratrees.item.food.cherryplum=Cherry Plum -extratrees.item.food.almond=Almond -extratrees.item.food.apricot=Apricot -extratrees.item.food.grapefruit=Grapefruit -extratrees.item.food.peach=Peach -extratrees.item.food.satsuma=Satsuma -extratrees.item.food.buddhahand=Buddhas Hand -extratrees.item.food.citron=Citron -extratrees.item.food.fingerlime=Finger Lime -extratrees.item.food.keylime=Key Lime -extratrees.item.food.manderin=Manderin -extratrees.item.food.nectarine=Nectarine -extratrees.item.food.pomelo=Pomelo -extratrees.item.food.tangerine=Tangerine -extratrees.item.food.pear=Pear -extratrees.item.food.sandpear=Sand Pear -extratrees.item.food.hazelnut=Hazelnut -extratrees.item.food.butternut=Butternut -extratrees.item.food.beechnut=Beechnut -extratrees.item.food.pecan=Pecan Nut -extratrees.item.food.banana=Banana -extratrees.item.food.redbanana=Red Banana -extratrees.item.food.plantain=Plantain -extratrees.item.food.brazilnut=Brazil Nut -extratrees.item.food.fig=Fig -extratrees.item.food.acorn=Acorn -extratrees.item.food.elderberry=Elderberry -extratrees.item.food.olive=Olive -extratrees.item.food.gingkonut=Gingko Nut -extratrees.item.food.coffee=Coffee -extratrees.item.food.osangeorange=Osange Orange -extratrees.item.food.clove=Clove -extratrees.item.food.papayimar=Papayimar -extratrees.item.food.blackcurrant=Blackcurrant -extratrees.item.food.redcurrant=Redcurrant -extratrees.item.food.blackberry=Blackberry -extratrees.item.food.raspberry=Raspberry -extratrees.item.food.blueberry=Blueberry -extratrees.item.food.cranberry=Cranberry -extratrees.item.food.juniper=Juniper -extratrees.item.food.gooseberry=Gooseberry -extratrees.item.food.goldenraspberry=Golden Raspberry -extratrees.item.food.coconut=Coconut -extratrees.item.food.cashew=Cashew -extratrees.item.food.avacado=Avacado -extratrees.item.food.nutmeg=Nutmeg -extratrees.item.food.allspice=Allspice -extratrees.item.food.chilli=Chilli -extratrees.item.food.staranise=Star Anise -extratrees.item.food.mango=Mango -extratrees.item.food.starfruit=Starfruit -extratrees.item.food.candlenut=Candlenut +for.extratrees.item.food.apple=Apple +for.extratrees.item.food.crabapple=Crabapple +for.extratrees.item.food.orange=Orange +for.extratrees.item.food.kumquat=Kumquat +for.extratrees.item.food.lime=Lime +for.extratrees.item.food.wildcherry=Wild Cherry +for.extratrees.item.food.sourcherry=Sour Cherry +for.extratrees.item.food.blackcherry=Black Cherry +for.extratrees.item.food.blackthorn=Blackthorn +for.extratrees.item.food.cherryplum=Cherry Plum +for.extratrees.item.food.almond=Almond +for.extratrees.item.food.apricot=Apricot +for.extratrees.item.food.grapefruit=Grapefruit +for.extratrees.item.food.peach=Peach +for.extratrees.item.food.satsuma=Satsuma +for.extratrees.item.food.buddhahand=Buddhas Hand +for.extratrees.item.food.citron=Citron +for.extratrees.item.food.fingerlime=Finger Lime +for.extratrees.item.food.keylime=Key Lime +for.extratrees.item.food.manderin=Manderin +for.extratrees.item.food.nectarine=Nectarine +for.extratrees.item.food.pomelo=Pomelo +for.extratrees.item.food.tangerine=Tangerine +for.extratrees.item.food.pear=Pear +for.extratrees.item.food.sandpear=Sand Pear +for.extratrees.item.food.hazelnut=Hazelnut +for.extratrees.item.food.butternut=Butternut +for.extratrees.item.food.beechnut=Beechnut +for.extratrees.item.food.pecan=Pecan Nut +for.extratrees.item.food.banana=Banana +for.extratrees.item.food.redbanana=Red Banana +for.extratrees.item.food.plantain=Plantain +for.extratrees.item.food.brazilnut=Brazil Nut +for.extratrees.item.food.fig=Fig +for.extratrees.item.food.acorn=Acorn +for.extratrees.item.food.elderberry=Elderberry +for.extratrees.item.food.olive=Olive +for.extratrees.item.food.gingkonut=Gingko Nut +for.extratrees.item.food.coffee=Coffee +for.extratrees.item.food.osangeorange=Osange Orange +for.extratrees.item.food.clove=Clove +for.extratrees.item.food.papayimar=Papayimar +for.extratrees.item.food.blackcurrant=Blackcurrant +for.extratrees.item.food.redcurrant=Redcurrant +for.extratrees.item.food.blackberry=Blackberry +for.extratrees.item.food.raspberry=Raspberry +for.extratrees.item.food.blueberry=Blueberry +for.extratrees.item.food.cranberry=Cranberry +for.extratrees.item.food.juniper=Juniper +for.extratrees.item.food.gooseberry=Gooseberry +for.extratrees.item.food.goldenraspberry=Golden Raspberry +for.extratrees.item.food.coconut=Coconut +for.extratrees.item.food.cashew=Cashew +for.extratrees.item.food.avacado=Avacado +for.extratrees.item.food.nutmeg=Nutmeg +for.extratrees.item.food.allspice=Allspice +for.extratrees.item.food.chilli=Chilli +for.extratrees.item.food.staranise=Star Anise +for.extratrees.item.food.mango=Mango +for.extratrees.item.food.starfruit=Starfruit +for.extratrees.item.food.candlenut=Candlenut extratrees.item.database=Arborist Database extratrees.item.masterDatabase=Master Arborist Database diff --git a/src/main/resources/assets/extratrees/lang/ru_RU.lang b/src/main/resources/assets/extratrees/lang/ru_RU.lang index 42266d53..6b43bff7 100644 --- a/src/main/resources/assets/extratrees/lang/ru_RU.lang +++ b/src/main/resources/assets/extratrees/lang/ru_RU.lang @@ -327,68 +327,68 @@ extratrees.item.woodWax=Полироль extratrees.item.glassFitting=Стеклянные фитинги # ПРОДУКТЫ САДОВОДСТВА -extratrees.item.food.osangeosange=Плод маклюра -extratrees.item.food.apple=Яблоко -extratrees.item.food.crabapple=Яблоко-дичка -extratrees.item.food.orange=Апельсин -extratrees.item.food.kumquat=Кумкват -extratrees.item.food.lime=Лайм -extratrees.item.food.wildcherry=Вишня дикая -extratrees.item.food.sourcherry=Вишня кислая -extratrees.item.food.blackcherry=Черёмуха поздняя -extratrees.item.food.blackthorn=Тёрен -extratrees.item.food.cherryplum=Алыча -extratrees.item.food.almond=Миндаль -extratrees.item.food.apricot=Абрикос -extratrees.item.food.grapefruit=Грейпфрут -extratrees.item.food.peach=Персик -extratrees.item.food.satsuma=Мандарин уншиу -extratrees.item.food.buddhahand=Цитрон пальчатый -extratrees.item.food.citron=Цитрон -extratrees.item.food.fingerlime=Лайм пальчиковый -extratrees.item.food.keylime=Лайм дикий -extratrees.item.food.manderin=Мандарин -extratrees.item.food.nectarine=Нектарин -extratrees.item.food.pomelo=Помело -extratrees.item.food.tangerine=Танжерин -extratrees.item.food.pear=Груша -extratrees.item.food.sandpear=Груша грушелистная -extratrees.item.food.hazelnut=Фундук -extratrees.item.food.butternut=Орех серый -extratrees.item.food.beechnut=Буковый орешек -extratrees.item.food.pecan=Пекан обыкновенный -extratrees.item.food.banana=Банан -extratrees.item.food.redbanana=Банан красный -extratrees.item.food.plantain=Плантан -extratrees.item.food.brazilnut=Бразильский орех -extratrees.item.food.fig=Инжир -extratrees.item.food.acorn=Жёлудь -extratrees.item.food.elderberry=Бузина -extratrees.item.food.olive=Олива -extratrees.item.food.gingkonut=Семена Гинкго -extratrees.item.food.coffee=Кофейные зёрна -extratrees.item.food.osangeorange=Плод маклюра -extratrees.item.food.clove=Гвоздика (пряность) -extratrees.item.food.papayimar=Папайя -extratrees.item.food.blackcurrant=Смородина чёрная -extratrees.item.food.redcurrant=Смородина красная -extratrees.item.food.blackberry=Ежевика -extratrees.item.food.raspberry=Малина -extratrees.item.food.blueberry=Голубика -extratrees.item.food.cranberry=Клюква -extratrees.item.food.juniper=Семяна Можжевельника -extratrees.item.food.gooseberry=Крыжовник -extratrees.item.food.goldenraspberry=Малина золотая -extratrees.item.food.coconut=Кокос -extratrees.item.food.cashew=Кешью -extratrees.item.food.avacado=Авокадо -extratrees.item.food.nutmeg=Мускатный орех -extratrees.item.food.allspice=Перец душистый -extratrees.item.food.chilli=Перец красный -extratrees.item.food.staranise=Анис звёздчатый -extratrees.item.food.mango=Манго -extratrees.item.food.starfruit=Карамбола -extratrees.item.food.candlenut=Лумбанг +for.extratrees.item.food.osangeosange=Плод маклюра +for.extratrees.item.food.apple=Яблоко +for.extratrees.item.food.crabapple=Яблоко-дичка +for.extratrees.item.food.orange=Апельсин +for.extratrees.item.food.kumquat=Кумкват +for.extratrees.item.food.lime=Лайм +for.extratrees.item.food.wildcherry=Вишня дикая +for.extratrees.item.food.sourcherry=Вишня кислая +for.extratrees.item.food.blackcherry=Черёмуха поздняя +for.extratrees.item.food.blackthorn=Тёрен +for.extratrees.item.food.cherryplum=Алыча +for.extratrees.item.food.almond=Миндаль +for.extratrees.item.food.apricot=Абрикос +for.extratrees.item.food.grapefruit=Грейпфрут +for.extratrees.item.food.peach=Персик +for.extratrees.item.food.satsuma=Мандарин уншиу +for.extratrees.item.food.buddhahand=Цитрон пальчатый +for.extratrees.item.food.citron=Цитрон +for.extratrees.item.food.fingerlime=Лайм пальчиковый +for.extratrees.item.food.keylime=Лайм дикий +for.extratrees.item.food.manderin=Мандарин +for.extratrees.item.food.nectarine=Нектарин +for.extratrees.item.food.pomelo=Помело +for.extratrees.item.food.tangerine=Танжерин +for.extratrees.item.food.pear=Груша +for.extratrees.item.food.sandpear=Груша грушелистная +for.extratrees.item.food.hazelnut=Фундук +for.extratrees.item.food.butternut=Орех серый +for.extratrees.item.food.beechnut=Буковый орешек +for.extratrees.item.food.pecan=Пекан обыкновенный +for.extratrees.item.food.banana=Банан +for.extratrees.item.food.redbanana=Банан красный +for.extratrees.item.food.plantain=Плантан +for.extratrees.item.food.brazilnut=Бразильский орех +for.extratrees.item.food.fig=Инжир +for.extratrees.item.food.acorn=Жёлудь +for.extratrees.item.food.elderberry=Бузина +for.extratrees.item.food.olive=Олива +for.extratrees.item.food.gingkonut=Семена Гинкго +for.extratrees.item.food.coffee=Кофейные зёрна +for.extratrees.item.food.osangeorange=Плод маклюра +for.extratrees.item.food.clove=Гвоздика (пряность) +for.extratrees.item.food.papayimar=Папайя +for.extratrees.item.food.blackcurrant=Смородина чёрная +for.extratrees.item.food.redcurrant=Смородина красная +for.extratrees.item.food.blackberry=Ежевика +for.extratrees.item.food.raspberry=Малина +for.extratrees.item.food.blueberry=Голубика +for.extratrees.item.food.cranberry=Клюква +for.extratrees.item.food.juniper=Семяна Можжевельника +for.extratrees.item.food.gooseberry=Крыжовник +for.extratrees.item.food.goldenraspberry=Малина золотая +for.extratrees.item.food.coconut=Кокос +for.extratrees.item.food.cashew=Кешью +for.extratrees.item.food.avacado=Авокадо +for.extratrees.item.food.nutmeg=Мускатный орех +for.extratrees.item.food.allspice=Перец душистый +for.extratrees.item.food.chilli=Перец красный +for.extratrees.item.food.staranise=Анис звёздчатый +for.extratrees.item.food.mango=Манго +for.extratrees.item.food.starfruit=Карамбола +for.extratrees.item.food.candlenut=Лумбанг extratrees.item.database=База данных лесовода extratrees.item.masterDatabase=База данных лесовода-мастера diff --git a/src/main/resources/assets/extratrees/lang/zh_CN.lang b/src/main/resources/assets/extratrees/lang/zh_CN.lang index 75b7f082..04baa35e 100644 --- a/src/main/resources/assets/extratrees/lang/zh_CN.lang +++ b/src/main/resources/assets/extratrees/lang/zh_CN.lang @@ -320,67 +320,67 @@ extratrees.item.provenGear=标定齿轮 extratrees.item.woodWax=Wood Polish extratrees.item.glassFitting=玻璃配件 -extratrees.item.food.apple=苹果 -extratrees.item.food.crabapple=海棠果 -extratrees.item.food.orange=橙子 -extratrees.item.food.kumquat=金橘 -extratrees.item.food.lime=酸橙 -extratrees.item.food.wildcherry=野樱桃 -extratrees.item.food.sourcherry=欧洲酸樱桃 -extratrees.item.food.blackcherry=黑樱桃 -extratrees.item.food.blackthorn=黑刺李 -extratrees.item.food.cherryplum=樱桃李 -extratrees.item.food.almond=扁桃 -extratrees.item.food.apricot=杏子 -extratrees.item.food.grapefruit=西柚 -extratrees.item.food.peach=桃 -extratrees.item.food.satsuma=温州蜜柑 -extratrees.item.food.buddhahand=佛手柑 -extratrees.item.food.citron=枸橼 -extratrees.item.food.fingerlime=指橙 -extratrees.item.food.keylime=墨西哥莱檬 -extratrees.item.food.manderin=橘子 -extratrees.item.food.nectarine=油桃 -extratrees.item.food.pomelo=柚子 -extratrees.item.food.tangerine=瓯柑 -extratrees.item.food.pear=梨 -extratrees.item.food.sandpear=沙梨 -extratrees.item.food.hazelnut=榛子 -extratrees.item.food.butternut=灰核桃 -extratrees.item.food.beechnut=山毛榉坚果 -extratrees.item.food.pecan=长山核桃 -extratrees.item.food.banana=香蕉 -extratrees.item.food.redbanana=红香蕉 -extratrees.item.food.plantain=大蕉 -extratrees.item.food.brazilnut=巴西栗 -extratrees.item.food.fig=无花果 -extratrees.item.food.acorn=橡果 -extratrees.item.food.elderberry=接骨木浆果 -extratrees.item.food.olive=橄榄 -extratrees.item.food.gingkonut=白果 -extratrees.item.food.coffee=咖啡 -extratrees.item.food.osangeorange=桑橙 -extratrees.item.food.clove=丁香 -extratrees.item.food.papayimar=Pahimar牌木瓜 -extratrees.item.food.blackcurrant=黑加仑 -extratrees.item.food.redcurrant=红加仑 -extratrees.item.food.blackberry=黑莓 -extratrees.item.food.raspberry=树莓 -extratrees.item.food.blueberry=蓝莓 -extratrees.item.food.cranberry=蔓越莓 -extratrees.item.food.juniper=杜松子 -extratrees.item.food.gooseberry=鹅莓 -extratrees.item.food.goldenraspberry=金树莓 -extratrees.item.food.coconut=椰子 -extratrees.item.food.cashew=腰果 -extratrees.item.food.avacado=鳄梨 -extratrees.item.food.nutmeg=肉豆蔻 -extratrees.item.food.allspice=多香果 -extratrees.item.food.chilli=辣椒 -extratrees.item.food.staranise=八角 -extratrees.item.food.mango=芒果 -extratrees.item.food.starfruit=杨桃 -extratrees.item.food.candlenut=石栗 +for.extratrees.item.food.apple=苹果 +for.extratrees.item.food.crabapple=海棠果 +for.extratrees.item.food.orange=橙子 +for.extratrees.item.food.kumquat=金橘 +for.extratrees.item.food.lime=酸橙 +for.extratrees.item.food.wildcherry=野樱桃 +for.extratrees.item.food.sourcherry=欧洲酸樱桃 +for.extratrees.item.food.blackcherry=黑樱桃 +for.extratrees.item.food.blackthorn=黑刺李 +for.extratrees.item.food.cherryplum=樱桃李 +for.extratrees.item.food.almond=扁桃 +for.extratrees.item.food.apricot=杏子 +for.extratrees.item.food.grapefruit=西柚 +for.extratrees.item.food.peach=桃 +for.extratrees.item.food.satsuma=温州蜜柑 +for.extratrees.item.food.buddhahand=佛手柑 +for.extratrees.item.food.citron=枸橼 +for.extratrees.item.food.fingerlime=指橙 +for.extratrees.item.food.keylime=墨西哥莱檬 +for.extratrees.item.food.manderin=橘子 +for.extratrees.item.food.nectarine=油桃 +for.extratrees.item.food.pomelo=柚子 +for.extratrees.item.food.tangerine=瓯柑 +for.extratrees.item.food.pear=梨 +for.extratrees.item.food.sandpear=沙梨 +for.extratrees.item.food.hazelnut=榛子 +for.extratrees.item.food.butternut=灰核桃 +for.extratrees.item.food.beechnut=山毛榉坚果 +for.extratrees.item.food.pecan=长山核桃 +for.extratrees.item.food.banana=香蕉 +for.extratrees.item.food.redbanana=红香蕉 +for.extratrees.item.food.plantain=大蕉 +for.extratrees.item.food.brazilnut=巴西栗 +for.extratrees.item.food.fig=无花果 +for.extratrees.item.food.acorn=橡果 +for.extratrees.item.food.elderberry=接骨木浆果 +for.extratrees.item.food.olive=橄榄 +for.extratrees.item.food.gingkonut=白果 +for.extratrees.item.food.coffee=咖啡 +for.extratrees.item.food.osangeorange=桑橙 +for.extratrees.item.food.clove=丁香 +for.extratrees.item.food.papayimar=Pahimar牌木瓜 +for.extratrees.item.food.blackcurrant=黑加仑 +for.extratrees.item.food.redcurrant=红加仑 +for.extratrees.item.food.blackberry=黑莓 +for.extratrees.item.food.raspberry=树莓 +for.extratrees.item.food.blueberry=蓝莓 +for.extratrees.item.food.cranberry=蔓越莓 +for.extratrees.item.food.juniper=杜松子 +for.extratrees.item.food.gooseberry=鹅莓 +for.extratrees.item.food.goldenraspberry=金树莓 +for.extratrees.item.food.coconut=椰子 +for.extratrees.item.food.cashew=腰果 +for.extratrees.item.food.avacado=鳄梨 +for.extratrees.item.food.nutmeg=肉豆蔻 +for.extratrees.item.food.allspice=多香果 +for.extratrees.item.food.chilli=辣椒 +for.extratrees.item.food.staranise=八角 +for.extratrees.item.food.mango=芒果 +for.extratrees.item.food.starfruit=杨桃 +for.extratrees.item.food.candlenut=石栗 extratrees.item.database=林业员数据库 extratrees.item.masterDatabase=林业员大师数据库