api/cellar/yeast,cellar: Register yeast items

Yeast can be registered, but has no biome mapping, this along with a small
change to the Yeast Jar's produce logic allows the multiplication of hard to
get yeast types (Origin and Bayanus).

I may consider wrapping the Yeast entries in an actual class to keep things organized, but lists and maps work fine for now.

Author: IceDragon200

src/java/growthcraft/api/cellar/yeast/IYeastRegistry.java

@@ -33,7 +33,26 @@
 
 public interface IYeastRegistry extends ILoggable
 {
+	/**
+	 * Adds the given ItemStack as a possible yeast item
+	 *
+	 * @param yeast - an item
+	 */
+	void addYeast(ItemStack yeast);
+
+	boolean isYeast(ItemStack yeast);
+
+	/**
+	 * Maps the given yeast item to the given biome type, when a Yeast Jar
+	 * is placed into a biome of that type, it MAY produce the yeast item.
+	 * NOTE. This method SHOULD use addYeast to add the given yeast item to the
+	 *       known list.
+	 *
+	 * @param yeast - an item
+	 * @param type - the biome type to add
+	 */
 	void addYeastToBiomeType(ItemStack yeast, BiomeDictionary.Type type);
+
 	List<ItemStack> getYeastListForBiomeType(BiomeDictionary.Type type);
 	List<BiomeDictionary.Type> getBiomeTypesForYeast(ItemStack yeast);
 	boolean canYeastFormInBiome(ItemStack yeast, BiomeGenBase biome);

src/java/growthcraft/api/cellar/yeast/YeastRegistry.java

@@ -27,6 +27,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
 import javax.annotation.Nonnull;
 
 import growthcraft.api.core.log.ILogger;
@@ -39,6 +41,7 @@
 
 public class YeastRegistry implements IYeastRegistry
 {
+	private Set<ItemKey> yeastList = new HashSet<ItemKey>();
 	private Map<BiomeDictionary.Type, List<ItemStack>> biomeToYeast = new HashMap<BiomeDictionary.Type, List<ItemStack>>();
 	private Map<ItemKey, List<BiomeDictionary.Type>> yeastToBiome = new HashMap<ItemKey, List<BiomeDictionary.Type>>();
 	private ILogger logger = NullLogger.INSTANCE;
@@ -54,9 +57,24 @@ private ItemKey stackToKey(@Nonnull ItemStack stack)
 		return new ItemKey(stack);
 	}
 
+	@Override
+	public void addYeast(@Nonnull ItemStack yeast)
+	{
+		yeastList.add(stackToKey(yeast));
+	}
+
+	@Override
+	public boolean isYeast(ItemStack yeast)
+	{
+		if (yeast == null) return false;
+		if (yeast.getItem() == null) return false;
+		return yeastList.contains(stackToKey(yeast));
+	}
+
 	@Override
 	public void addYeastToBiomeType(@Nonnull ItemStack yeast, BiomeDictionary.Type type)
 	{
+		addYeast(yeast);
 		if (!biomeToYeast.containsKey(type))
 		{
 			biomeToYeast.put(type, new ArrayList<ItemStack>());

src/java/growthcraft/cellar/GrowthCraftCellar.java

@@ -41,6 +41,7 @@
 import growthcraft.cellar.stats.GrcCellarAchievements;
 import growthcraft.cellar.util.CellarBoozeBuilderFactory;
 import growthcraft.cellar.util.GrcCellarUserApis;
+import growthcraft.cellar.util.YeastType;
 import growthcraft.core.common.definition.BlockDefinition;
 import growthcraft.core.common.definition.ItemDefinition;
 import growthcraft.core.integration.NEI;
@@ -287,10 +288,20 @@ private void registerOres()
 		OreDictionary.registerOre("materialYeast", yeast.getItem());
 	}
 
+	private void registerYeast()
+	{
+		CellarRegistry.instance().yeast().addYeast(YeastType.BREWERS.asStack());
+		CellarRegistry.instance().yeast().addYeast(YeastType.LAGER.asStack());
+		CellarRegistry.instance().yeast().addYeast(YeastType.BAYANUS.asStack());
+		CellarRegistry.instance().yeast().addYeast(YeastType.ETHEREAL.asStack());
+		CellarRegistry.instance().yeast().addYeast(YeastType.ORIGIN.asStack());
+	}
+
 	@EventHandler
 	public void load(FMLInitializationEvent event)
 	{
 		registerOres();
+		registerYeast();
 
 		packetPipeline.initialise();
 		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandlerCellar());

src/java/growthcraft/cellar/common/tileentity/device/YeastGenerator.java

@@ -96,7 +96,7 @@ public void produceYeast()
 		else
 		{
 			final ItemStack contents = getInventory().getStackInSlot(invSlot);
-			if (CellarRegistry.instance().yeast().canYeastFormInBiome(contents, getCurrentBiome()))
+			if (CellarRegistry.instance().yeast().isYeast(contents))
 			{
 				getInventory().setInventorySlotContents(invSlot, ItemUtils.increaseStack(contents));
 				consumeFluid();