mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-17 02:55:13 +00:00
Rename "Gingko" to "Ginkgo" (#105)
This commit is contained in:
1 parent
6582ea3e56
commit
f253dfc5dc
15 files changed
+29
-29
No files matched your search
@@ -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),
|
||||
|
||||
@@ -67,7 +67,7 @@ public class PlankType {
|
||||
Olive(0xb0ad88),
|
||||
Sweetgum(0xd59658),
|
||||
Rosewood(0x761500),
|
||||
Gingko(0xf4e7ba),
|
||||
Ginkgo(0xf4e7ba),
|
||||
PinkIvory(0xec8ca0);
|
||||
|
||||
/**
|
||||
|
||||
@@ -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.GingkoNut.setFamily(familyNuts);
|
||||
ExtraTreeFruitGene.GinkgoNut.addProduct(Food.GinkgoNut.get(1), 1.0f);
|
||||
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);
|
||||
|
||||
@@ -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.Gingko, ExtraTreeSpecies.Chilli, 10);
|
||||
new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Ginkgo, ExtraTreeSpecies.Candlenut, 10);
|
||||
new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Ginkgo, ExtraTreeSpecies.Chilli, 10);
|
||||
new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Alder, ExtraTreeSpecies.DwarfHazel, 10);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user