Rename "Gingko" to "Ginkgo" (#105)

src/main/java/binnie/extratrees/block/ILogType.java

@@ -58,7 +58,7 @@ public interface ILogType {
         Rosewood("rosewood", 0x998666, PlankType.ExtraTreePlanks.Rosewood),
         Purpleheart("purpleheart", 0x9392a2, PlankType.ExtraTreePlanks.Purpleheart),
         Iroko("iroko", 0x605c5b, PlankType.ExtraTreePlanks.Iroko),
-        Gingko("gingko", 0xadae9c, PlankType.ExtraTreePlanks.Gingko),
+        Ginkgo("ginkgo", 0xadae9c, PlankType.ExtraTreePlanks.Ginkgo),
         Eucalyptus("eucalyptus", 0xeadeda, PlankType.ExtraTreePlanks.Eucalyptus),
         Eucalyptus2("eucalyptus", 0x867e65, PlankType.ExtraTreePlanks.Eucalyptus),
         Box("box", 0xab6f57, PlankType.ExtraTreePlanks.Box),

src/main/java/binnie/extratrees/block/PlankType.java

@@ -67,7 +67,7 @@ public class PlankType {
         Olive(0xb0ad88),
         Sweetgum(0xd59658),
         Rosewood(0x761500),
-        Gingko(0xf4e7ba),
+        Ginkgo(0xf4e7ba),
         PinkIvory(0xec8ca0);
 
         /**

src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java

@@ -69,7 +69,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
     Acorn(6, 0x72b226, 0xad6a1d, FruitSprite.Tiny),
     Elderberry(9, 0x71975d, 0x515b43, FruitSprite.Tiny),
     Olive(9, 0x879e35, 0x62572a, FruitSprite.Small),
-    GingkoNut(7, 0x8c975b, 0xe5daad, FruitSprite.Tiny),
+    GinkgoNut(7, 0x8c975b, 0xe5daad, FruitSprite.Tiny),
     Coffee(8, 0x716d1d, 0xf84f66, FruitSprite.Tiny),
     Pear(10, 0x9f8f51, 0x9fd551, FruitSprite.Pear),
     OsangeOsange(10, 0x979752, 0xa2bf27, FruitSprite.Larger),
@@ -205,8 +205,8 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
         ExtraTreeFruitGene.Elderberry.setFamily(familyPrune);
         ExtraTreeFruitGene.Olive.addProduct(Food.Olive.get(1), 1.0f);
         ExtraTreeFruitGene.Olive.setFamily(familyPrune);
-        ExtraTreeFruitGene.GingkoNut.addProduct(Food.GingkoNut.get(1), 1.0f);
+        ExtraTreeFruitGene.GinkgoNut.addProduct(Food.GinkgoNut.get(1), 1.0f);
-        ExtraTreeFruitGene.GingkoNut.setFamily(familyNuts);
+        ExtraTreeFruitGene.GinkgoNut.setFamily(familyNuts);
         ExtraTreeFruitGene.Coffee.addProduct(Food.Coffee.get(1), 1.0f);
         ExtraTreeFruitGene.Coffee.setFamily(familyJungle);
         ExtraTreeFruitGene.Pear.addProduct(Food.Pear.get(1), 1.0f);

src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java

@@ -125,7 +125,7 @@ public class ExtraTreeMutation implements ITreeMutation {
         new ExtraTreeMutation(ExtraTreeSpecies.Brazilwood, getVanilla("Kapok"), ExtraTreeSpecies.Purpleheart, 10);
         new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ExtraTreeSpecies.Rosewood, 10);
         new ExtraTreeMutation(ExtraTreeSpecies.Rosewood, getVanilla("Kapok"), ExtraTreeSpecies.Logwood, 10);
-        new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Lime"), ExtraTreeSpecies.Gingko, 10);
+        new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Lime"), ExtraTreeSpecies.Ginkgo, 10);
         new ExtraTreeMutation(ExtraTreeSpecies.Beech, getVanilla("Jungle"), ExtraTreeSpecies.Brazilnut, 10);
         new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Jungle"), ExtraTreeSpecies.RoseGum, 10);
         new ExtraTreeMutation(ExtraTreeSpecies.RoseGum, getVanilla("Mahogony"), ExtraTreeSpecies.SwampGum, 10);
@@ -165,8 +165,8 @@ public class ExtraTreeMutation implements ITreeMutation {
         new ExtraTreeMutation(ExtraTreeSpecies.Allspice, ExtraTreeSpecies.Clove, ExtraTreeSpecies.StarAnise, 10);
         new ExtraTreeMutation(getVanilla("Jungle"), ExtraTreeSpecies.Orange, ExtraTreeSpecies.Mango, 10);
         new ExtraTreeMutation(ExtraTreeSpecies.StarAnise, ExtraTreeSpecies.Mango, ExtraTreeSpecies.Starfruit, 10);
-        new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Gingko, ExtraTreeSpecies.Candlenut, 10);
+        new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Ginkgo, ExtraTreeSpecies.Candlenut, 10);
-        new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Gingko, ExtraTreeSpecies.Chilli, 10);
+        new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Ginkgo, ExtraTreeSpecies.Chilli, 10);
         new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Alder, ExtraTreeSpecies.DwarfHazel, 10);
     }
 

src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java

@@ -187,7 +187,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
     Rosewood("dalbergia", "latifolia", 0x879b22, ILogType.ExtraTreeLog.Rosewood, null, WorldGenRosewood.class),
     Purpleheart("peltogyne", "spp.", 0x778f55, ILogType.ExtraTreeLog.Purpleheart, null, WorldGenPurpleheart.class),
     Iroko("milicia", "excelsa", 0xafc86c, ILogType.ExtraTreeLog.Iroko, null, WorldGenIroko.class),
-    Gingko("ginkgo", "biloba", 0x719651, ILogType.ExtraTreeLog.Gingko, ExtraTreeFruitGene.GingkoNut,
+    Ginkgo("ginkgo", "biloba", 0x719651, ILogType.ExtraTreeLog.Ginkgo, ExtraTreeFruitGene.GinkgoNut,
             WorldGenGingko.class),
     Brazilnut("bertholletia", "excelsa", 0x7c8f7b, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.BrazilNut,
             WorldGenBrazilNut.class),
@@ -548,7 +548,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
         ExtraTreeSpecies.Iroko.addFamily(familyNuts).addFamily(familyJungle).setHeight(EnumAllele.Height.AVERAGE)
                 .setFertility(EnumAllele.Saplings.LOW);
 
-        ExtraTreeSpecies.Gingko.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE)
+        ExtraTreeSpecies.Ginkgo.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE)
                 .setHeight(EnumAllele.Height.LARGE).setYield(EnumAllele.Yield.LOWER)
                 .setSappiness(EnumAllele.Sappiness.LOW);
 

src/main/java/binnie/extratrees/item/Food.java

@@ -54,7 +54,7 @@ public enum Food implements IItemMisc {
     Acorn(0),
     Elderberry(1),
     Olive(1),
-    GingkoNut(1),
+    GinkgoNut(1),
     Coffee(0),
     OsangeOrange(1),
     Clove(0),
@@ -129,7 +129,7 @@ public enum Food implements IItemMisc {
         Food.Acorn.ore("Acorn");
         Food.Elderberry.ore("Elderberry");
         Food.Olive.ore("Olive");
-        Food.GingkoNut.ore("GingkoNut");
+        Food.GinkgoNut.ore("GinkgoNut");
         Food.Coffee.ore("Coffee");
         Food.OsangeOrange.ore("OsangeOrange");
         Food.Clove.ore("Clove");

src/main/java/binnie/extratrees/item/ModuleItems.java

@@ -84,7 +84,7 @@ public class ModuleItems implements IInitializable {
         Food.Acorn.addOil(20, 50, 3);
         Food.Elderberry.addJuice(10, 100, 5);
         Food.Olive.addOil(20, 50, 3);
-        Food.GingkoNut.addOil(20, 50, 5);
+        Food.GinkgoNut.addOil(20, 50, 5);
         Food.Coffee.addOil(15, 20, 2);
         Food.OsangeOrange.addJuice(10, 300, 15);
         Food.Clove.addOil(10, 25, 2);

src/main/resources/assets/extratrees/lang/en_GB.lang

@@ -68,7 +68,7 @@ extratrees.block.planks.holly=Holly
 extratrees.block.planks.olive=Olive
 extratrees.block.planks.sweetgum=Sweetgum
 extratrees.block.planks.rosewood=Rosewood
-extratrees.block.planks.gingko=Gingko
+extratrees.block.planks.ginkgo=Ginkgo
 extratrees.block.planks.pinkivory=Pink Ivory
 extratrees.block.planks.cherry=Cherry
 extratrees.block.planks.banana=Banana
@@ -147,7 +147,7 @@ extratrees.block.planks.holly.desc=The whitest wood available, just avoid the po
 extratrees.block.planks.olive.desc=Coloured in the same way as its fruits, an attractive subdued green.|Lumber Jack
 extratrees.block.planks.sweetgum.desc=Yet another average wood, but has a certain character.|Lumber Jack
 extratrees.block.planks.rosewood.desc=Used to make chess pieces, this is another strongly hued wood.|Lumber Jack
-extratrees.block.planks.gingko.desc=Similar to Boxwood, Gingko wood is very pale.|Lumber Jack
+extratrees.block.planks.ginkgo.desc=Similar to Boxwood, Ginkgo wood is very pale.|Lumber Jack
 extratrees.block.planks.pinkivory.desc=What can I say. It's very pink.|Lumber Jack
 
 extratrees.block.tooltip.twoColors=%s and %s
@@ -244,7 +244,7 @@ extratrees.species.logwood.name=Logwood
 extratrees.species.rosewood.name=Rosewood
 extratrees.species.purpleheart.name=Purpleheart
 extratrees.species.iroko.name=Iroko
-extratrees.species.gingko.name=Ginkgo
+extratrees.species.ginkgo.name=Ginkgo
 extratrees.species.brazilnut.name=Brazil Nut
 extratrees.species.rosegum.name=Rose Gum
 extratrees.species.swampgum.name=Swamp Gum
@@ -349,7 +349,7 @@ 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.ginkgonut=Ginkgo Nut
 for.extratrees.item.food.coffee=Coffee
 for.extratrees.item.food.osangeosange=Osange Orange
 for.extratrees.item.food.osangeorange=Osange Orange

src/main/resources/assets/extratrees/lang/en_US.lang

@@ -72,7 +72,7 @@ extratrees.block.planks.holly=Holly
 extratrees.block.planks.olive=Olive
 extratrees.block.planks.sweetgum=Sweetgum
 extratrees.block.planks.rosewood=Rosewood
-extratrees.block.planks.gingko=Gingko
+extratrees.block.planks.ginkgo=Ginkgo
 extratrees.block.planks.pinkivory=Pink Ivory
 extratrees.block.planks.cherry=Cherry
 extratrees.block.planks.banana=Banana
@@ -151,7 +151,7 @@ extratrees.block.planks.holly.desc=The whitest wood available, just avoid the po
 extratrees.block.planks.olive.desc=Coloured in the same way as its fruits, an attractive subdued green.|Lumber Jack
 extratrees.block.planks.sweetgum.desc=Yet another average wood, but has a certain character.|Lumber Jack
 extratrees.block.planks.rosewood.desc=Used to make chess pieces, this is another strongly hued wood.|Lumber Jack
-extratrees.block.planks.gingko.desc=Similar to Boxwood, Gingko wood is very pale.|Lumber Jack
+extratrees.block.planks.ginkgo.desc=Similar to Boxwood, Ginkgo wood is very pale.|Lumber Jack
 extratrees.block.planks.pinkivory.desc=What can I say. It's very pink.|Lumber Jack
 
 extratrees.block.tooltip.twoColors=%s and %s
@@ -260,7 +260,7 @@ extratrees.species.logwood.name=Logwood
 extratrees.species.rosewood.name=Rosewood
 extratrees.species.purpleheart.name=Purpleheart
 extratrees.species.iroko.name=Iroko
-extratrees.species.gingko.name=Ginkgo
+extratrees.species.ginkgo.name=Ginkgo
 extratrees.species.brazilnut.name=Brazil Nut
 extratrees.species.rosegum.name=Rose Gum
 extratrees.species.swampgum.name=Swamp Gum
@@ -369,7 +369,7 @@ 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.ginkgonut=Ginkgo Nut
 for.extratrees.item.food.coffee=Coffee
 for.extratrees.item.food.osangeosange=Osange Orange
 for.extratrees.item.food.osangeorange=Osange Orange

src/main/resources/assets/extratrees/lang/ru_RU.lang

@@ -69,7 +69,7 @@ extratrees.block.planks.holly=остролиста
 extratrees.block.planks.olive=оливы
 extratrees.block.planks.sweetgum=ликвидамбара смолоносного
 extratrees.block.planks.rosewood=розового дерева
-extratrees.block.planks.gingko=гинкго двулопастного
+extratrees.block.planks.ginkgo=гинкго двулопастного
 extratrees.block.planks.pinkivory=умнини
 extratrees.block.planks.cherry=вишни
 extratrees.block.planks.banana=банана
@@ -151,7 +151,7 @@ extratrees.block.planks.holly.desc=Белейшее дерево доступн
 extratrees.block.planks.olive.desc=Древесина, как и плоды оливы имеют привлекательный зелёный цвет.|Лесоруб
 extratrees.block.planks.sweetgum.desc=Ещё одна средняя древесина, но имеет определенные особенности.|Лесоруб
 extratrees.block.planks.rosewood.desc=Используется для шахматных фигур, из-за сильных оттенков дерева.|Лесоруб
-extratrees.block.planks.gingko.desc=Подобно Самшиту, древесина Гингко очень бледна.|Лесоруб
+extratrees.block.planks.ginkgo.desc=Подобно Самшиту, древесина Гингко очень бледна.|Лесоруб
 extratrees.block.planks.pinkivory.desc=Что я могу сказать, она очень розовая.|Лесоруб
 
 extratrees.block.tooltip.twoColors=%s и %s
@@ -249,7 +249,7 @@ extratrees.species.logwood.name=Кампешевое дерево
 extratrees.species.rosewood.name=Розовое дерево
 extratrees.species.purpleheart.name=Амарант
 extratrees.species.iroko.name=Ироко
-extratrees.species.gingko.name=Гинкго двулопастный
+extratrees.species.ginkgo.name=Гинкго двулопастный
 extratrees.species.brazilnut.name=Бразильский орех
 extratrees.species.rosegum.name=Эвкалипт гигантский
 extratrees.species.swampgum.name=Эвкалипт болотный
@@ -354,7 +354,7 @@ 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.ginkgonut=Семена Гинкго
 for.extratrees.item.food.coffee=Кофейные зёрна
 # ПРОДУКТЫ САДОВОДСТВА
 for.extratrees.item.food.osangeosange=Плод маклюра

src/main/resources/assets/extratrees/lang/zh_CN.lang

@@ -70,7 +70,7 @@ extratrees.block.planks.holly=冬青
 extratrees.block.planks.olive=橄榄树
 extratrees.block.planks.sweetgum=枫香树
 extratrees.block.planks.rosewood=蔷薇木
-extratrees.block.planks.gingko=银杏
+extratrees.block.planks.ginkgo=银杏
 extratrees.block.planks.pinkivory=象牙粉红木
 extratrees.block.planks.cherry=樱树
 extratrees.block.planks.banana=香蕉
@@ -149,7 +149,7 @@ extratrees.block.planks.holly.desc=这是最白的木材，记得不要让有尖
 extratrees.block.planks.olive.desc=那引人注目的柔和的绿色也正是其果实的色彩。|伐木工
 extratrees.block.planks.sweetgum.desc=又是一种质地均匀的木材，但它有一些用途。|伐木工
 extratrees.block.planks.rosewood.desc=这又是一种颜色颇深的木材，用于制作国际象棋棋子。|伐木工
-extratrees.block.planks.gingko.desc=和黄杨类似，银杏木颜色很淡。|伐木工
+extratrees.block.planks.ginkgo.desc=和黄杨类似，银杏木颜色很淡。|伐木工
 extratrees.block.planks.pinkivory.desc=我能说些什么呢.它的粉色太浓厚了。|伐木工
 
 extratrees.block.tooltip.twoColors=%s - %s
@@ -252,7 +252,7 @@ extratrees.species.logwood.name=墨水树
 extratrees.species.rosewood.name=蔷薇木
 extratrees.species.purpleheart.name=紫心檀木
 extratrees.species.iroko.name=大绿柄桑木
-extratrees.species.gingko.name=银杏
+extratrees.species.ginkgo.name=银杏
 extratrees.species.brazilnut.name=巴西栗
 extratrees.species.rosegum.name=大桉
 extratrees.species.swampgum.name= 沼泽桉
@@ -357,7 +357,7 @@ 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.ginkgonut=白果
 for.extratrees.item.food.coffee=咖啡
 for.extratrees.item.food.osangeosange=桑橙
 for.extratrees.item.food.osangeorange=桑橙