+ Added Staballoy Mixer recipe.

$ Fixed another ExtraBees ModLoaded() check.

4 files changed, 22 insertions, 1 deletions

diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 0760bd12c8..48ddde3f0b 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -2,6 +2,7 @@ package miscutil.core.item;
 import static miscutil.core.creative.AddToCreativeTab.tabMachines;
 import static miscutil.core.creative.AddToCreativeTab.tabMisc;
 import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT;
+import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.item.base.CoreItem;
 import miscutil.core.item.effects.RarityUncommon;
@@ -282,8 +283,10 @@ Gold Tool: 22*/
 		//Battery Alloy For cheap Niggers
 		itemIngotBatteryAlloy = new Item().setUnlocalizedName("itemIngotBatteryAlloy").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemIngotBatteryAlloy");
 		GameRegistry.registerItem(itemIngotBatteryAlloy, "itemIngotBatteryAlloy");
+		GT_OreDictUnificator.registerOre("ingotBatteryAlloy", UtilsItems.getItemStack(CORE.MODID+":itemIngotBatteryAlloy", 1));
 		itemPlateBatteryAlloy = new Item().setUnlocalizedName("itemPlateBatteryAlloy").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemPlateBatteryAlloy");
 		GameRegistry.registerItem(itemPlateBatteryAlloy, "itemPlateBatteryAlloy");
+		GT_OreDictUnificator.registerOre("plateBatteryAlloy", UtilsItems.getItemStack(CORE.MODID+":itemPlateBatteryAlloy", 1));
 
 		itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
 		//GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob");
diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
index 300b66fa88..80c7a7f2ba 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
@@ -6,6 +6,9 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
+
+import java.util.Arrays;
+
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.util.fluid.FluidUtils;
@@ -23,6 +26,7 @@ public class RECIPES_GREGTECH {
 		matterFabRecipes();
 		assemblerRecipes();
 		distilleryRecipes();
+		mixerRecipes();
 		addFuels();
 	}
 
@@ -127,6 +131,13 @@ public class RECIPES_GREGTECH {
 		//System.exit(1);
 	}
 	
+	private static void mixerRecipes(){
+		for (OrePrefixes tPrefix : Arrays.asList(new OrePrefixes[]{OrePrefixes.dust, OrePrefixes.dustSmall, OrePrefixes.dustTiny})) {
+			GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(tPrefix, Materials.Uranium, 8L), GT_OreDictUnificator.get(tPrefix, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(RECIPES_Shapeless.dustStaballoy.getItem(), (int) (9L * tPrefix.mMaterialAmount)), (int) (900L * tPrefix.mMaterialAmount / 3628800L), 8);
+			}
+		
+	}
+	
 	private static void registerSkookumChoocher(){
 		//GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), tBits, new Object[]{"fX", Character.valueOf('X'), OrePrefixes.toolHeadShovel.get(aMaterial)});
 	}
diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/miscutil/core/util/item/UtilsItems.java
index a3157e56ab..d7661756ae 100644
--- a/src/Java/miscutil/core/util/item/UtilsItems.java
+++ b/src/Java/miscutil/core/util/item/UtilsItems.java
@@ -38,8 +38,12 @@ public class UtilsItems {
 	}
 
 	public static ItemStack getSimpleStack(Item x){
+		return getSimpleStack(x, 1);
+	}
+	
+	public static ItemStack getSimpleStack(Item x, int i){
 		try {
-			ItemStack r = new ItemStack(x, 1);
+			ItemStack r = new ItemStack(x, i);
 			return r;
 		} catch(Throwable e){
 			return null;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
index 6fc95f5afa..d707eb89ef 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
+++ b/src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
@@ -1,5 +1,6 @@
 package miscutil.core.xmod.forestry.bees.recipe;
 
+import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
 import miscutil.core.xmod.forestry.bees.items.FR_ItemRegistry;
@@ -47,6 +48,7 @@ public class FR_Gregtech_Recipes {
 				rod_Uranium, rod_Uranium, rod_Uranium,
 				hiveFrameMutagenic);
 		
+		if (!LoadedMods.ExtraBees){
 		//Extra Bee Like Frames
 		UtilsRecipe.recipeBuilder(
 				null, itemCocoaBeans, null,
@@ -71,6 +73,7 @@ public class FR_Gregtech_Recipes {
 				itemClayDust, hiveFrameImpregnated, itemClayDust,
 				null, itemClayDust, null,
 				hiveFrameClay);
+		}