mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 19:49:54 +00:00
Fix trees growing with wrong wood. relates to #344
This commit is contained in:
1 parent
3884fecf77
commit
c17a6af267
1 file changed
+72
-31
@@ -732,28 +732,69 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
IFruitFamily jungle = new FruitFamily("jungle", "Tropicus");
|
||||
IFruitFamily nux = new FruitFamily("nuts", "Nux");
|
||||
|
||||
/* Logs */
|
||||
final ItemStack oakLog = new ItemStack(Blocks.log, 1, 0);
|
||||
final ItemStack spruceLog = new ItemStack(Blocks.log, 1, 1);
|
||||
final ItemStack birchLog = new ItemStack(Blocks.log, 1, 2);
|
||||
final ItemStack jungleLog = new ItemStack(Blocks.log, 1, 3);
|
||||
|
||||
final ItemStack acaciaLog = new ItemStack(Blocks.log2, 1, 0);
|
||||
final ItemStack darkOakLog = new ItemStack(Blocks.log2, 1, 1);
|
||||
|
||||
final ItemStack larchLog = ForestryBlock.log1.getItemStack(1, 0);
|
||||
final ItemStack teakLog = ForestryBlock.log1.getItemStack(1, 1);
|
||||
final ItemStack desertAcaciaLog = ForestryBlock.log1.getItemStack(1, 2);
|
||||
final ItemStack limeLog = ForestryBlock.log1.getItemStack(1, 3);
|
||||
|
||||
final ItemStack chestnutLog = ForestryBlock.log2.getItemStack(1, 0);
|
||||
final ItemStack wengeLog = ForestryBlock.log2.getItemStack(1, 1);
|
||||
final ItemStack baobabLog = ForestryBlock.log2.getItemStack(1, 2);
|
||||
final ItemStack sequioaLog = ForestryBlock.log2.getItemStack(1, 3);
|
||||
|
||||
final ItemStack kapokLog = ForestryBlock.log3.getItemStack(1, 0);
|
||||
final ItemStack ebonyLog = ForestryBlock.log3.getItemStack(1, 1);
|
||||
final ItemStack mahoganyLog = ForestryBlock.log3.getItemStack(1, 2);
|
||||
final ItemStack balsaLog = ForestryBlock.log3.getItemStack(1, 3);
|
||||
|
||||
final ItemStack willowLog = ForestryBlock.log4.getItemStack(1, 0);
|
||||
final ItemStack walnutLog = ForestryBlock.log4.getItemStack(1, 1);
|
||||
final ItemStack sipiriLog = ForestryBlock.log4.getItemStack(1, 2);
|
||||
final ItemStack cherryLog = ForestryBlock.log4.getItemStack(1, 3);
|
||||
|
||||
final ItemStack mahoeLog = ForestryBlock.log5.getItemStack(1, 0);
|
||||
final ItemStack poplarLog = ForestryBlock.log5.getItemStack(1, 1);
|
||||
final ItemStack dateLog = ForestryBlock.log5.getItemStack(1, 2);
|
||||
final ItemStack papayaLog = ForestryBlock.log5.getItemStack(1, 3);
|
||||
|
||||
final ItemStack pineLog = ForestryBlock.log6.getItemStack(1, 0);
|
||||
final ItemStack plumLog = ForestryBlock.log6.getItemStack(1, 1);
|
||||
final ItemStack mapleLog = ForestryBlock.log6.getItemStack(1, 2);
|
||||
final ItemStack lemonLog = ForestryBlock.log6.getItemStack(1, 3);
|
||||
|
||||
final ItemStack giganteumLog = ForestryBlock.log7.getItemStack(1, 0);
|
||||
|
||||
// Deciduous
|
||||
Allele.treeOak = new AlleleTreeSpecies("treeOak", false, "appleOak", quercus, "robur",
|
||||
proxy.getFoliageColorBasic(), WorldGenOak.class, new ItemStack(Blocks.log, 1, 0)).addFruitFamily(pomes)
|
||||
proxy.getFoliageColorBasic(), WorldGenOak.class, oakLog).addFruitFamily(pomes)
|
||||
.setVanillaMap(0);
|
||||
|
||||
Allele.treeDarkOak = new AlleleTreeSpecies("treeDarkOak", false, "darkOak", quercus, "velutina",
|
||||
proxy.getFoliageColorBasic(), WorldGenDarkOak.class, new ItemStack(Blocks.log2, 1, 1)).addFruitFamily(pomes)
|
||||
proxy.getFoliageColorBasic(), WorldGenDarkOak.class, darkOakLog).addFruitFamily(pomes)
|
||||
.setVanillaMap(5);
|
||||
|
||||
Allele.treeBirch = new AlleleTreeSpecies("treeBirch", false, "silverBirch", betula,
|
||||
"pendula", proxy.getFoliageColorBirch(), 0xb0c648, WorldGenBirch.class, new ItemStack(Blocks.log, 1, 2))
|
||||
"pendula", proxy.getFoliageColorBirch(), 0xb0c648, WorldGenBirch.class, birchLog)
|
||||
.setVanillaMap(2);
|
||||
Allele.treeLime = new AlleleTreeSpecies("treeLime", true, "silverLime", tilia,
|
||||
"tomentosa", 0x5ea107, WorldGenLime.class, ForestryBlock.log1.getItemStack(1, 3)).addFruitFamily(nux)
|
||||
"tomentosa", 0x5ea107, WorldGenLime.class, limeLog).addFruitFamily(nux)
|
||||
.addFruitFamily(prunes).addFruitFamily(pomes);
|
||||
|
||||
// Nucifera
|
||||
Allele.treeWalnut = new AlleleTreeSpecies("treeWalnut", true, "commonWalnut", juglans,
|
||||
"regia", 0x798c55, 0xb0c648, WorldGenWalnut.class, ForestryBlock.log4.getItemStack(1, 1)).addFruitFamily(nux)
|
||||
"regia", 0x798c55, 0xb0c648, WorldGenWalnut.class, walnutLog).addFruitFamily(nux)
|
||||
.addFruitFamily(prunes).addFruitFamily(pomes).setGirth(2);
|
||||
Allele.treeChestnut = new AlleleTreeSpecies("treeChestnut", true, "sweetChestnut",
|
||||
castanea, "sativa", 0x5ea107, 0xb0c648, WorldGenChestnut.class, ForestryBlock.log2.getItemStack(1, 0)).addFruitFamily(nux)
|
||||
castanea, "sativa", 0x5ea107, 0xb0c648, WorldGenChestnut.class, chestnutLog).addFruitFamily(nux)
|
||||
.addFruitFamily(prunes).addFruitFamily(pomes).setGirth(2);
|
||||
|
||||
// Prunus & Citrus
|
||||
@@ -761,50 +802,50 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
// bearing fruit year round, bearing fruit twice a year, bearing golden
|
||||
// fruit
|
||||
Allele.treeCherry = new AlleleTreeSpecies("treeCherry", true, "hillCherry", prunus,
|
||||
"serrulata", 0xe691da, 0xe63e59, WorldGenCherry.class, ForestryBlock.log4.getItemStack(1, 3)).addFruitFamily(prunes)
|
||||
"serrulata", 0xe691da, 0xe63e59, WorldGenCherry.class, cherryLog).addFruitFamily(prunes)
|
||||
.addFruitFamily(pomes);
|
||||
Allele.treeLemon = new AlleleTreeSpecies("treeLemon", true, "lemon", citrus, "limon",
|
||||
0x88af54, 0xa3b850, WorldGenLemon.class, ForestryBlock.log6.getItemStack(1, 3)).addFruitFamily(pomes).addFruitFamily(
|
||||
0x88af54, 0xa3b850, WorldGenLemon.class, lemonLog).addFruitFamily(pomes).addFruitFamily(
|
||||
prunes);
|
||||
Allele.treePlum = new AlleleTreeSpecies("treePlum", true, "plum", prunus, "domestica",
|
||||
0x589246, 0xa3b850, WorldGenPlum.class, ForestryBlock.log6.getItemStack(1, 1)).addFruitFamily(pomes)
|
||||
0x589246, 0xa3b850, WorldGenPlum.class, plumLog).addFruitFamily(pomes)
|
||||
.addFruitFamily(prunes);
|
||||
|
||||
// Maples
|
||||
Allele.treeMaple = new AlleleTreeSpecies("treeMaple", true, "sugarMaple", acer,
|
||||
"saccharum", 0xd4f425, 0x619a3c, WorldGenMaple.class, ForestryBlock.log6.getItemStack(1, 2)).addFruitFamily(prunes)
|
||||
"saccharum", 0xd4f425, 0x619a3c, WorldGenMaple.class, mapleLog).addFruitFamily(prunes)
|
||||
.addFruitFamily(pomes).setLeafIndices("maple");
|
||||
|
||||
// Conifers
|
||||
Allele.treeSpruce = new AlleleTreeSpecies("treeSpruce", false, "redSpruce", picea,
|
||||
"abies", proxy.getFoliageColorPine(), 0x539d12, WorldGenSpruce.class, new ItemStack(Blocks.log, 1, 1))
|
||||
"abies", proxy.getFoliageColorPine(), 0x539d12, WorldGenSpruce.class, spruceLog)
|
||||
.setLeafIndices("conifers").setVanillaMap(1);
|
||||
Allele.treeLarch = new AlleleTreeSpecies("treeLarch", true, "mundaneLarch", larix,
|
||||
"decidua", 0x698f90, 0x569896, WorldGenLarch.class, ForestryBlock.log1.getItemStack(1, 0)).setLeafIndices("conifers");
|
||||
"decidua", 0x698f90, 0x569896, WorldGenLarch.class, larchLog).setLeafIndices("conifers");
|
||||
Allele.treePine = new AlleleTreeSpecies("treePine", true, "bullPine", pinus, "sabiniana",
|
||||
0xfeff8f, 0xffd98f, WorldGenPine.class, ForestryBlock.log6.getItemStack(1, 0)).setLeafIndices("conifers");
|
||||
0xfeff8f, 0xffd98f, WorldGenPine.class, pineLog).setLeafIndices("conifers");
|
||||
|
||||
Allele.treeSequioa = new AlleleTreeSpecies("treeSequioa", false, "coastSequoia", sequoia,
|
||||
"sempervirens", 0x418e71, 0x569896, WorldGenSequoia.class, ForestryBlock.log2.getItemStack(1, 3)).setLeafIndices(
|
||||
"sempervirens", 0x418e71, 0x569896, WorldGenSequoia.class, sequioaLog).setLeafIndices(
|
||||
"conifers").setGirth(3);
|
||||
Allele.treeGiganteum = new AlleleTreeSpecies("treeGigant", false, "giantSequoia",
|
||||
sequoiadendron, "giganteum", 0x738434, WorldGenGiganteum.class, ForestryBlock.log2.getItemStack(1, 3)).setLeafIndices(
|
||||
sequoiadendron, "giganteum", 0x738434, WorldGenGiganteum.class, giganteumLog).setLeafIndices(
|
||||
"conifers").setGirth(4);
|
||||
|
||||
// Jungle
|
||||
Allele.treeJungle = new AlleleTreeSpecies("treeJungle", false, "jungle", tropical,
|
||||
"tectona", proxy.getFoliageColorBasic(), 0x539d12, WorldGenJungle.class, new ItemStack(Blocks.log, 1, 3))
|
||||
"tectona", proxy.getFoliageColorBasic(), 0x539d12, WorldGenJungle.class, jungleLog)
|
||||
.addFruitFamily(jungle).setLeafIndices("jungle").setVanillaMap(3);
|
||||
Allele.treeTeak = new AlleleTreeSpecies("treeTeak", true, "teak", tectona, "grandis",
|
||||
0xfeff8f, 0xffd98f, WorldGenTeak.class, ForestryBlock.log1.getItemStack(1, 1)).addFruitFamily(jungle).setLeafIndices(
|
||||
0xfeff8f, 0xffd98f, WorldGenTeak.class, teakLog).addFruitFamily(jungle).setLeafIndices(
|
||||
"jungle");
|
||||
Allele.treeKapok = new AlleleTreeSpecies("treeKapok", true, "kapok", ceiba, "pentandra",
|
||||
0x89987b, 0x89aa9e, WorldGenKapok.class, ForestryBlock.log3.getItemStack(1, 0)).addFruitFamily(jungle)
|
||||
0x89987b, 0x89aa9e, WorldGenKapok.class, kapokLog).addFruitFamily(jungle)
|
||||
.addFruitFamily(prunes).setLeafIndices("jungle");
|
||||
|
||||
// Ebony
|
||||
Allele.treeEbony = new AlleleTreeSpecies("treeEbony", true, "myrtleEbony", diospyros,
|
||||
"pentamera", 0xa2d24a, 0xc4d24a, WorldGenEbony.class, ForestryBlock.log3.getItemStack(1, 1)).addFruitFamily(jungle)
|
||||
"pentamera", 0xa2d24a, 0xc4d24a, WorldGenEbony.class, ebonyLog).addFruitFamily(jungle)
|
||||
.addFruitFamily(prunes).setGirth(3).setLeafIndices("jungle");
|
||||
|
||||
// Diospyros mespiliformis, the Jackalberry (also known as African Ebony
|
||||
@@ -820,7 +861,7 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
// " locally it is known as temburini or by its Hindi name tendu. In Orissa and Jharkhand it known as kendu."
|
||||
// Mahogany
|
||||
Allele.treeMahogany = new AlleleTreeSpecies("treeMahogony", true, "yellowMeranti", shorea,
|
||||
"gibbosa", 0x8ab154, 0xa9b154, WorldGenMahogany.class, ForestryBlock.log3.getItemStack(1, 2)).addFruitFamily(jungle)
|
||||
"gibbosa", 0x8ab154, 0xa9b154, WorldGenMahogany.class, mahoganyLog).addFruitFamily(jungle)
|
||||
.setGirth(2).setLeafIndices("jungle");
|
||||
|
||||
// 80+ meters tall:
|
||||
@@ -830,43 +871,43 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
// Shorea superba
|
||||
// Malva
|
||||
Allele.treeAcacia = new AlleleTreeSpecies("treeAcaciaVanilla", true, "acacia", acacia,
|
||||
"aneura", 0x616101, 0xb3b302, WorldGenAcaciaVanilla.class, new ItemStack(Blocks.log2, 1, 0)).addFruitFamily(jungle)
|
||||
"aneura", 0x616101, 0xb3b302, WorldGenAcaciaVanilla.class, acaciaLog).addFruitFamily(jungle)
|
||||
.addFruitFamily(nux).setVanillaMap(4);
|
||||
|
||||
Allele.treeDesertAcacia = new AlleleTreeSpecies("treeAcacia", true, "desertAcacia", acacia,
|
||||
"erioloba", 0x748C1C, 0xb3b302, WorldGenAcacia.class, ForestryBlock.log1.getItemStack(1, 2)).addFruitFamily(jungle)
|
||||
"erioloba", 0x748C1C, 0xb3b302, WorldGenAcacia.class, desertAcaciaLog).addFruitFamily(jungle)
|
||||
.addFruitFamily(nux);
|
||||
Allele.treeBalsa = new AlleleTreeSpecies("treeBalsa", true, "balsa", ochroma, "pyramidale",
|
||||
0x59ac00, 0xfeff8f, WorldGenBalsa.class, ForestryBlock.log3.getItemStack(1, 3)).addFruitFamily(jungle).addFruitFamily(nux);
|
||||
0x59ac00, 0xfeff8f, WorldGenBalsa.class, balsaLog).addFruitFamily(jungle).addFruitFamily(nux);
|
||||
Allele.treeWenge = new AlleleTreeSpecies("treeWenge", true, "wenge", millettia,
|
||||
"laurentii", 0xada157, 0xad8a57, WorldGenWenge.class, ForestryBlock.log2.getItemStack(1, 1)).addFruitFamily(jungle)
|
||||
"laurentii", 0xada157, 0xad8a57, WorldGenWenge.class, wengeLog).addFruitFamily(jungle)
|
||||
.addFruitFamily(nux).setGirth(2);
|
||||
Allele.treeBaobab = new AlleleTreeSpecies("treeBaobab", true, "grandidierBaobab",
|
||||
adansonia, "digitata", 0xfeff8f, 0xffd98f, WorldGenBaobab.class, ForestryBlock.log2.getItemStack(1, 2))
|
||||
adansonia, "digitata", 0xfeff8f, 0xffd98f, WorldGenBaobab.class, baobabLog)
|
||||
.addFruitFamily(jungle).addFruitFamily(nux).setGirth(3);
|
||||
Allele.treeMahoe = new AlleleTreeSpecies("treeMahoe", true, "blueMahoe", talipariti,
|
||||
"elatum", 0xa0ba1b, 0x79a175, WorldGenMahoe.class, ForestryBlock.log5.getItemStack(1, 0)).addFruitFamily(jungle)
|
||||
"elatum", 0xa0ba1b, 0x79a175, WorldGenMahoe.class, mahoeLog).addFruitFamily(jungle)
|
||||
.addFruitFamily(pomes).addFruitFamily(prunes);
|
||||
|
||||
// Willows
|
||||
Allele.treeWillow = new AlleleTreeSpecies("treeWillow", true, "whiteWillow", salix,
|
||||
"alba", 0xa3b8a5, 0xa3b850, WorldGenWillow.class, ForestryBlock.log4.getItemStack(1, 0)).addFruitFamily(nux)
|
||||
"alba", 0xa3b8a5, 0xa3b850, WorldGenWillow.class, willowLog).addFruitFamily(nux)
|
||||
.addFruitFamily(prunes).addFruitFamily(pomes).setLeafIndices("willow");
|
||||
|
||||
// Lauraceae
|
||||
Allele.treeSipiri = new AlleleTreeSpecies("treeSipiri", true, "sipiri", chlorocardium,
|
||||
"rodiei", 0x678911, 0x79a175, WorldGenGreenheart.class, ForestryBlock.log3.getItemStack(1, 2)).addFruitFamily(jungle);
|
||||
"rodiei", 0x678911, 0x79a175, WorldGenGreenheart.class, sipiriLog).addFruitFamily(jungle);
|
||||
|
||||
// Unclassified
|
||||
Allele.treePapaya = new AlleleTreeSpecies("treePapaya", true, "papaya", carica, "papaya",
|
||||
0x6d9f58, 0x9ee67f, WorldGenPapaya.class, ForestryBlock.log5.getItemStack(1, 3)).addFruitFamily(jungle)
|
||||
0x6d9f58, 0x9ee67f, WorldGenPapaya.class, papayaLog).addFruitFamily(jungle)
|
||||
.addFruitFamily(nux).setLeafIndices("palm");
|
||||
Allele.treeDate = new AlleleTreeSpecies("treeDate", true, "datePalm", null, "dactylifera",
|
||||
0xcbcd79, 0xf0f38f, WorldGenDate.class, ForestryBlock.log4.getItemStack(1, 2)).addFruitFamily(jungle).addFruitFamily(nux)
|
||||
0xcbcd79, 0xf0f38f, WorldGenDate.class, dateLog).addFruitFamily(jungle).addFruitFamily(nux)
|
||||
.setLeafIndices("palm");
|
||||
|
||||
Allele.treePoplar = new AlleleTreeSpecies("treePoplar", true, "whitePoplar", populus,
|
||||
"alba", 0xa3b8a5, 0x539d12, WorldGenPoplar.class, ForestryBlock.log5.getItemStack(1, 1)).addFruitFamily(pomes)
|
||||
"alba", 0xa3b8a5, 0x539d12, WorldGenPoplar.class, poplarLog).addFruitFamily(pomes)
|
||||
.addFruitFamily(prunes);
|
||||
|
||||
// FRUITS
|
||||
|
||||
Reference in new issue
Block a user