mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 11:59:11 +00:00
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
This commit is contained in:
commit
f993d0571d
40 files changed
+239
-271
No files matched your search
@@ -10,8 +10,6 @@ import binnie.botany.api.IFlower;
|
||||
import binnie.botany.api.IFlowerType;
|
||||
import binnie.botany.core.BotanyCore;
|
||||
import binnie.botany.genetics.Flower;
|
||||
import binnie.botany.genetics.FlowerDefinition;
|
||||
import binnie.botany.genetics.FlowerGenome;
|
||||
import binnie.core.BinnieCore;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
@@ -163,9 +161,6 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
|
||||
return null;
|
||||
}
|
||||
IAlleleFlowerSpecies flowerSpecies = flower.getGenome().getPrimary();
|
||||
if (flowerSpecies == null) {
|
||||
flowerSpecies = FlowerDefinition.Dandelion.getSpecies();
|
||||
}
|
||||
IFlowerType flowerType = flowerSpecies.getType();
|
||||
return flowerSpecies.getFlowerModel(type, flower.hasFlowered(), flowerType.getSections() - 1);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user