Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts: core/localization/GuiText.java core/sync/AppEngPacketHandlerBase.java
2014-05-03 14:12:19 -05:00
parent f21bf3e9bc b9ef599e13
commit 3c510b6925
50 changed files with 1652 additions and 148 deletions
@@ -1595,4 +1595,54 @@ public class Platform
 		}
 	}

+	public static ItemStack extractItemsByRecipe(IEnergySource energySrc, BaseActionSource mySrc, IMEMonitor<IAEItemStack> src, World w, IRecipe r,
+			ItemStack output, InventoryCrafting ci, ItemStack providedTemplate, int slot, IItemList<IAEItemStack> aitems)
+	{
+		if ( energySrc.extractAEPower( 1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0.9 )
+		{
+			if ( providedTemplate == null )
+				return null;
+
+			AEItemStack ae_req = AEItemStack.create( providedTemplate );
+			ae_req.setStackSize( 1 );
+
+			IAEItemStack ae_ext = src.extractItems( ae_req, Actionable.MODULATE, mySrc );
+			if ( ae_ext != null )
+			{
+				ItemStack extracted = ae_ext.getItemStack();
+				if ( extracted != null )
+				{
+					energySrc.extractAEPower( 1, Actionable.MODULATE, PowerMultiplier.CONFIG );
+					return extracted;
+				}
+			}
+
+			if ( aitems != null && (ae_req.isOre() || providedTemplate.hasTagCompound() || providedTemplate.isItemStackDamageable()) )
+			{
+				for (IAEItemStack x : aitems)
+				{
+					ItemStack sh = x.getItemStack();
+					if ( (Platform.isSameItemType( providedTemplate, sh ) || ae_req.sameOre( x )) && !Platform.isSameItem( sh, output ) )
+					{ // Platform.isSameItemType( sh, providedTemplate )
+						ItemStack cp = Platform.cloneItemStack( sh );
+						cp.stackSize = 1;
+						ci.setInventorySlotContents( slot, cp );
+						if ( r.matches( ci, w ) && Platform.isSameItem( r.getCraftingResult( ci ), output ) )
+						{
+							IAEItemStack ex = src.extractItems( AEItemStack.create( cp ), Actionable.MODULATE, mySrc );
+							if ( ex != null )
+							{
+								energySrc.extractAEPower( 1, Actionable.MODULATE, PowerMultiplier.CONFIG );
+								return ex.getItemStack();
+							}
+						}
+						ci.setInventorySlotContents( slot, providedTemplate );
+					}
+				}
+			}
+
+		}
+		return null;
+	}
+
 }