From 8d5c0c6f8bdd55d4a8ec936d297c4d7a04ea3f66 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 22 Aug 2017 22:37:35 -0700 Subject: [PATCH] Fix #1806 Allow sapling's products to work as hint items in escritoire --- .../forestry/api/arboriculture/ITreeRoot.java | 3 ++ .../arboriculture/genetics/TreeRoot.java | 19 +++++++++++ .../genetics/alleles/AlleleTreeSpecies.java | 34 +++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/src/main/java/forestry/api/arboriculture/ITreeRoot.java b/src/main/java/forestry/api/arboriculture/ITreeRoot.java index 99483aae9..8bcb3b64d 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeRoot.java +++ b/src/main/java/forestry/api/arboriculture/ITreeRoot.java @@ -12,6 +12,7 @@ import java.util.List; import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; +import forestry.api.genetics.IFruitFamily; import forestry.api.genetics.ISpeciesRootPollinatable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -101,4 +102,6 @@ public interface ITreeRoot extends ISpeciesRootPollinatable { /* MUTATIONS */ @Override List getMutations(boolean shuffle); + + Collection getFruitProvidersForFruitFamily(IFruitFamily fruitFamily); } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java index e484b6c78..831125703 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java @@ -14,9 +14,11 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Map.Entry; import com.google.common.base.Preconditions; @@ -26,6 +28,7 @@ import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IArboristTracker; +import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ILeafTickHandler; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; @@ -38,6 +41,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlyzerPlugin; import forestry.api.genetics.ICheckPollinatable; import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IFruitFamily; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.IPollinatable; @@ -75,6 +79,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { private static ITreekeepingMode activeTreekeepingMode; public static final List treeTemplates = new ArrayList<>(); + private final Map> providersForFamilies = new HashMap<>(); private final List treekeepingModes = new ArrayList<>(); public TreeRoot() { @@ -439,4 +444,18 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { } } + @Override + public Collection getFruitProvidersForFruitFamily(IFruitFamily fruitFamily) { + if (providersForFamilies.isEmpty()) { + @SuppressWarnings("unchecked") + Collection fruitAlleles = (Collection) (Object) AlleleManager.alleleRegistry.getRegisteredAlleles(EnumTreeChromosome.FRUITS); + for (IAlleleFruit alleleFruit : fruitAlleles) { + IFruitProvider fruitProvider = alleleFruit.getProvider(); + Collection fruitProviders = providersForFamilies.computeIfAbsent(fruitProvider.getFamily(), k -> new ArrayList<>()); + fruitProviders.add(fruitProvider); + } + } + + return providersForFamilies.computeIfAbsent(fruitFamily, k -> new ArrayList<>()); + } } diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java index 9f0c69e49..4aaad74f6 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java @@ -11,12 +11,16 @@ package forestry.arboriculture.genetics.alleles; import java.util.ArrayList; +import java.util.Collection; import java.util.List; +import java.util.Map; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder; +import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.IGermlingModelProvider; import forestry.api.arboriculture.IGrowthProvider; import forestry.api.arboriculture.ILeafProvider; @@ -27,6 +31,7 @@ import forestry.api.arboriculture.IWoodProvider; import forestry.api.arboriculture.TreeManager; import forestry.api.core.IModelManager; import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.genetics.ClimateGrowthProvider; @@ -34,6 +39,7 @@ import forestry.arboriculture.genetics.LeafProvider; import forestry.core.genetics.alleles.AlleleSpecies; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -196,6 +202,34 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci return modID; } + @Override + public float getResearchSuitability(ItemStack itemstack) { + if (itemstack.isEmpty()) { + return 0f; + } + + List suitableFruit = getSuitableFruit(); + for (IFruitFamily fruitFamily : suitableFruit) { + Collection fruitProviders = TreeManager.treeRoot.getFruitProvidersForFruitFamily(fruitFamily); + for (IFruitProvider fruitProvider : fruitProviders) { + Map products = fruitProvider.getProducts(); + for (ItemStack stack : products.keySet()) { + if (stack.isItemEqual(itemstack)) { + return 1.0f; + } + } + Map specialtyChances = fruitProvider.getSpecialty(); + for (ItemStack stack : specialtyChances.keySet()) { + if (stack.isItemEqual(itemstack)) { + return 1.0f; + } + } + } + } + + return super.getResearchSuitability(itemstack); + } + @Override public int compareTo(IAlleleTreeSpecies o) { return 0;