diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruitDefinition.java b/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruitDefinition.java index 212b4cd13..72b70bc43 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruitDefinition.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruitDefinition.java @@ -243,10 +243,10 @@ protected void addProducts() { addProduct(Food.CASHEW.get(1), 1.0f); } }, - Avacado("avacado", 10, 10272370, 2170640, FruitSprite.PEAR, JUNGLE){ + Avocado("avocado", 10, 10272370, 2170640, FruitSprite.PEAR, JUNGLE){ @Override protected void addProducts() { - addProduct(Food.AVACADO.get(1), 1.0f); + addProduct(Food.AVOCADO.get(1), 1.0f); } }, Nutmeg("nutmeg", 9, 14861101, 11305813, FruitSprite.TINY, JUNGLE){ diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 79fa794f2..05d9edf2c 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -1836,7 +1836,7 @@ protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Avacado("persea", "americana", EnumLeafType.JUNGLE, new Color(0x96A375), new Color(0x96A375), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { + Avocado("persea", "americana", EnumLeafType.JUNGLE, new Color(0x96A375), new Color(0x96A375), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLazy.Tree(tree); @@ -1844,7 +1844,7 @@ public WorldGenerator getWorldGenerator(ITreeGenData tree) { @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, AlleleETFruitDefinition.Avacado.getAllele()); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruitDefinition.Avocado.getAllele()); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); } diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index d98ca44d0..070bb0ed9 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -139,7 +139,7 @@ public static void init() { new ExtraTreeMutation(getVanilla("Teak"), ETTreeDefinition.Rosewood.getSpecies(), ETTreeDefinition.Cinnamon.getSpecies(), 10); new ExtraTreeMutation(getVanilla("Balsa"), ETTreeDefinition.Brazilnut.getSpecies(), ETTreeDefinition.Coconut.getSpecies(), 10); new ExtraTreeMutation(getVanilla("Teak"), getVanilla("Oak"), ETTreeDefinition.Cashew.getSpecies(), 10); - new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Oak"), ETTreeDefinition.Avacado.getSpecies(), 10); + new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Oak"), ETTreeDefinition.Avocado.getSpecies(), 10); new ExtraTreeMutation(getVanilla("Teak"), ETTreeDefinition.Clove.getSpecies(), ETTreeDefinition.Nutmeg.getSpecies(), 10); new ExtraTreeMutation(getVanilla("Teak"), ETTreeDefinition.Clove.getSpecies(), ETTreeDefinition.Allspice.getSpecies(), 10); new ExtraTreeMutation(ETTreeDefinition.Allspice.getSpecies(), ETTreeDefinition.Clove.getSpecies(), ETTreeDefinition.StarAnise.getSpecies(), 10); diff --git a/extratrees/src/main/java/binnie/extratrees/items/Food.java b/extratrees/src/main/java/binnie/extratrees/items/Food.java index 3bf230d65..38ebf9a73 100644 --- a/extratrees/src/main/java/binnie/extratrees/items/Food.java +++ b/extratrees/src/main/java/binnie/extratrees/items/Food.java @@ -274,7 +274,7 @@ protected void registerOreDictEntries() { GOLDEN_RASPBERRY(2), COCONUT(2), CASHEW(0), - AVACADO(2), + AVOCADO(2), NUTMEG(0), ALLSPICE(0), CHILLI(2), diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleCore.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleCore.java index 8aeb91054..3eed66909 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleCore.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleCore.java @@ -152,7 +152,7 @@ public void doInit() { Food.CLOVE.addOil(10, 25, 2); Food.COCONUT.addOil(20, 300, 25); Food.CASHEW.addJuice(10, 150, 15); - Food.AVACADO.addJuice(10, 300, 15); + Food.AVOCADO.addJuice(10, 300, 15); Food.NUTMEG.addOil(20, 50, 10); Food.ALLSPICE.addOil(20, 50, 10); Food.CHILLI.addJuice(10, 100, 10); diff --git a/extratrees/src/main/resources/assets/extratrees/blockstates/germlings.json b/extratrees/src/main/resources/assets/extratrees/blockstates/germlings.json index e9b265d20..77d924de0 100644 --- a/extratrees/src/main/resources/assets/extratrees/blockstates/germlings.json +++ b/extratrees/src/main/resources/assets/extratrees/blockstates/germlings.json @@ -102,7 +102,7 @@ "tree=cinnamon": { "model": "extratrees:saplings/tree_default" }, "tree=coconut": { "model": "extratrees:saplings/tree_default" }, "tree=cashew": { "model": "extratrees:saplings/tree_default" }, - "tree=avacado": { "model": "extratrees:saplings/tree_default" }, + "tree=avocado": { "model": "extratrees:saplings/tree_default" }, "tree=nutmeg": { "model": "extratrees:saplings/tree_default" }, "tree=allspice": { "model": "extratrees:saplings/tree_default" }, "tree=chilli": { "model": "extratrees:saplings/tree_default" }, diff --git a/extratrees/src/main/resources/assets/extratrees/lang/en_GB.lang b/extratrees/src/main/resources/assets/extratrees/lang/en_GB.lang index 78eed8456..b47fbc408 100644 --- a/extratrees/src/main/resources/assets/extratrees/lang/en_GB.lang +++ b/extratrees/src/main/resources/assets/extratrees/lang/en_GB.lang @@ -6,9 +6,9 @@ extratrees.species.floweringcrabapple.name=Flowering Crab Apple extratrees.species.prairiecrabapple.name=Prairie Crab Apple extratrees.species.manderin.name=Mandarin extratrees.species.osange_orange.name=Osage-Orange -extratrees.species.avacado.name=Avocado +extratrees.species.avocado.name=Avocado extratrees.item.food.crabapple=Crab Apple extratrees.item.food.buddha_hand=Buddha’s Hand extratrees.item.food.manderin=Mandarin -extratrees.item.food.avacado=Avocado +extratrees.item.food.avocado=Avocado diff --git a/extratrees/src/main/resources/assets/extratrees/lang/en_US.lang b/extratrees/src/main/resources/assets/extratrees/lang/en_US.lang index 7b7ed8d36..db6bfbde9 100644 --- a/extratrees/src/main/resources/assets/extratrees/lang/en_US.lang +++ b/extratrees/src/main/resources/assets/extratrees/lang/en_US.lang @@ -385,7 +385,7 @@ extratrees.species.goldenraspberry.name=Golden Raspberry extratrees.species.cinnamon.name=Cinnamon extratrees.species.coconut.name=Coconut extratrees.species.cashew.name=Cashew -extratrees.species.avacado.name=Avacado +extratrees.species.avocado.name=Avocado extratrees.species.nutmeg.name=Nutmeg extratrees.species.allspice.name=Allspice extratrees.species.chilli.name=Chilli Pepper @@ -433,7 +433,7 @@ extratrees.fruits.platain=Platain extratrees.fruits.coffee=Coffee extratrees.fruits.coconut=Coconut extratrees.fruits.cashew=Cashew -extratrees.fruits.avacado=Avacado +extratrees.fruits.avocado=Avocado extratrees.fruits.nutmeg=Nutmeg extratrees.fruits.allspice=Allspice extratrees.fruits.chilli=Chilli @@ -549,7 +549,7 @@ extratrees.item.food.gooseberry=Gooseberry extratrees.item.food.golden_raspberry=Golden Raspberry extratrees.item.food.coconut=Coconut extratrees.item.food.cashew=Cashew -extratrees.item.food.avacado=Avacado +extratrees.item.food.avocado=Avocado extratrees.item.food.nutmeg=Nutmeg extratrees.item.food.allspice=Allspice extratrees.item.food.chilli=Chilli diff --git a/extratrees/src/main/resources/assets/extratrees/lang/ru_RU.lang b/extratrees/src/main/resources/assets/extratrees/lang/ru_RU.lang index e98c035d3..ff99aed82 100644 --- a/extratrees/src/main/resources/assets/extratrees/lang/ru_RU.lang +++ b/extratrees/src/main/resources/assets/extratrees/lang/ru_RU.lang @@ -385,7 +385,7 @@ extratrees.species.goldenraspberry.name=Золотая малина extratrees.species.cinnamon.name=Корица extratrees.species.coconut.name=Кокос extratrees.species.cashew.name=Кешью -extratrees.species.avacado.name=Авокадо +extratrees.species.avocado.name=Авокадо extratrees.species.nutmeg.name=Мускатный орех extratrees.species.allspice.name=Ямайский перец extratrees.species.chilli.name=Перец чили @@ -433,7 +433,7 @@ extratrees.fruits.platain=Подорожник extratrees.fruits.coffee=Кофе extratrees.fruits.coconut=Кокос extratrees.fruits.cashew=Кешью -extratrees.fruits.avacado=Авокадо +extratrees.fruits.avocado=Авокадо extratrees.fruits.nutmeg=Мускатный орех extratrees.fruits.allspice=Ямайский перец extratrees.fruits.chilli=Чили @@ -549,7 +549,7 @@ extratrees.item.food.gooseberry=Крыжовник extratrees.item.food.golden_raspberry=Золотая малина extratrees.item.food.coconut=Кокос extratrees.item.food.cashew=Кешью -extratrees.item.food.avacado=Авокадо +extratrees.item.food.avocado=Авокадо extratrees.item.food.nutmeg=Мускатный орех extratrees.item.food.allspice=Ямайский перец extratrees.item.food.chilli=Чили diff --git a/extratrees/src/main/resources/assets/extratrees/lang/zh_CN.lang b/extratrees/src/main/resources/assets/extratrees/lang/zh_CN.lang index b50655a9b..1a7b6b9b6 100644 --- a/extratrees/src/main/resources/assets/extratrees/lang/zh_CN.lang +++ b/extratrees/src/main/resources/assets/extratrees/lang/zh_CN.lang @@ -385,7 +385,7 @@ extratrees.species.goldenraspberry.name=金树莓 extratrees.species.cinnamon.name=肉桂 extratrees.species.coconut.name=椰子 extratrees.species.cashew.name=腰果 -extratrees.species.avacado.name=鳄梨 +extratrees.species.avocado.name=鳄梨 extratrees.species.nutmeg.name=肉豆蔻 extratrees.species.allspice.name=多香果 extratrees.species.chilli.name=辣椒 @@ -433,7 +433,7 @@ extratrees.fruits.platain=芭蕉 extratrees.fruits.coffee=咖啡 extratrees.fruits.coconut=椰子 extratrees.fruits.cashew=腰果 -extratrees.fruits.avacado=鳄梨 +extratrees.fruits.avocado=鳄梨 extratrees.fruits.nutmeg=肉豆蔻 extratrees.fruits.allspice=多香果 extratrees.fruits.chilli=辣椒 @@ -549,7 +549,7 @@ extratrees.item.food.gooseberry=鹅莓 extratrees.item.food.golden_raspberry=金树莓 extratrees.item.food.coconut=椰子 extratrees.item.food.cashew=腰果 -extratrees.item.food.avacado=鳄梨 +extratrees.item.food.avocado=鳄梨 extratrees.item.food.nutmeg=肉豆蔻 extratrees.item.food.allspice=多香果 extratrees.item.food.chilli=辣椒 diff --git a/extratrees/src/main/resources/assets/extratrees/models/item/foods/avacado.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/avocado.json similarity index 54% rename from extratrees/src/main/resources/assets/extratrees/models/item/foods/avacado.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/avocado.json index 3101280c6..e70b6ae02 100644 --- a/extratrees/src/main/resources/assets/extratrees/models/item/foods/avacado.json +++ b/extratrees/src/main/resources/assets/extratrees/models/item/foods/avocado.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extratrees:items/food/avacado" + "layer0": "extratrees:items/food/avocado" } } diff --git a/extratrees/src/main/resources/assets/extratrees/textures/items/food/avacado.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/avocado.png similarity index 100% rename from extratrees/src/main/resources/assets/extratrees/textures/items/food/avacado.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/avocado.png